Merge remote-tracking branch 'origin/unstable' into merge-to-testing

diff --git a/.gitmodules b/.gitmodules
index 07b10cacb00393eff6d61e695fefe2acf9ab0577..3a6302180302c3deb3753de09925c488a4fad945 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "sdk/argeo-build"]
        path = sdk/argeo-build
-       url = http://git.argeo.org/cc0/argeo-build.git
-       branch = unstable
+       url = https://code.argeo.org/git/cc0/argeo-build.git
+       branch = merge-to-testing

diff --git a/.project b/.project
index 77cae2222f17331606b49399aca003ca2e4ecc43..4106bf47e4b1a1afb0ce94cd9d171d7a07467204 100644 (file)
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-       <name>argeo-suite-unstable</name>
+       <name>argeo-suite</name>
        <comment></comment>
        <projects>
        </projects>

diff --git a/branch.mk b/branch.mk
index afde0f838e8e39e2e2b5abe863169d7891a97131..dbecaaa4bb30c9a334af654716d6bb4acc1dfbf0 100644 (file)
--- a/branch.mk
+++ b/branch.mk
@@ -1 +1 @@
-BRANCH=unstable
\ No newline at end of file
+BRANCH=testing
\ No newline at end of file

diff --git a/sdk/argeo-build b/sdk/argeo-build
index 011962b1bb63d375622dbe79a50c45f16374b0a1..5029b67ae930b82e822407b64d740173fe2d34c0 160000 (submodule)
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit 011962b1bb63d375622dbe79a50c45f16374b0a1
+Subproject commit 5029b67ae930b82e822407b64d740173fe2d34c0

diff --git a/sdk/branches/testing.bnd b/sdk/branches/testing.bnd
new file mode 100644 (file)
index 0000000..22ef9a8
--- /dev/null
+++ b/sdk/branches/testing.bnd
@@ -0,0 +1,4 @@
+major=2
+minor=1
+micro=25
+qualifier=.next
\ No newline at end of file

diff --git a/sdk/output-cms-rap.target b/sdk/output-cms-rap.target
index 760b2eb842f7f612c8ec155691f74e15824f7988..b6f30363cf53921b1c9da171c11a93a1f4a74295 100644 (file)
--- a/sdk/output-cms-rap.target
+++ b/sdk/output-cms-rap.target
@@ -2,18 +2,17 @@
 <?pde version="3.8"?>
 <target name="(output) CMS RAP">
        <locations>
-               <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.eclipse.rwt" type="Directory"/>
-               <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.eclipse.rap" type="Directory"/>
-               <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.cms.eclipse.rap" type="Directory"/>
-               <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.cms" type="Directory"/>
-               <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.apache" type="Directory"/>
-               <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.eclipse.equinox" type="Directory"/>
-               <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.jetty" type="Directory"/>
-               <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
-               <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
-               <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp" type="Directory"/>
-               <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.formats" type="Directory"/>
-               <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.poi" type="Directory"/>
-               <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.gis" type="Directory"/>
+               <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.cms" type="Directory"/>
+               <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.cms.eclipse.rap" type="Directory"/>
+               <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.apache" type="Directory"/>
+               <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.eclipse.equinox" type="Directory"/>
+               <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.eclipse.rap" type="Directory"/>
+               <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.jetty" type="Directory"/>
+               <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
+               <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
+               <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp" type="Directory"/>
+               <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.formats" type="Directory"/>
+               <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.poi" type="Directory"/>
+               <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.gis" type="Directory"/>
        </locations>
 </target>
\ No newline at end of file

diff --git a/sdk/output-cms-rcp.target b/sdk/output-cms-rcp.target
index 33551c8f3c3b041fe419b4d1f9a5a84cce57d583..9e818714e9a327e8bddfc3ff993e272f0143e7b4 100644 (file)
--- a/sdk/output-cms-rcp.target
+++ b/sdk/output-cms-rcp.target
@@ -2,18 +2,17 @@
 <?pde version="3.8"?>
 <target name="(output) CMS RCP">
        <locations>
-               <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.eclipse.swt" type="Directory"/>
-               <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.eclipse.rcp" type="Directory"/>
-               <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.cms.eclipse.rcp" type="Directory"/>
-               <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.cms" type="Directory"/>
-               <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.apache" type="Directory"/>
-               <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.eclipse.equinox" type="Directory"/>
-               <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.jetty" type="Directory"/>
-               <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
-               <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
-               <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp" type="Directory"/>
-               <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.formats" type="Directory"/>
-               <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.poi" type="Directory"/>
-               <location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.gis" type="Directory"/>
+               <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.cms" type="Directory"/>
+               <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.cms.eclipse.rcp" type="Directory"/>
+               <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.apache" type="Directory"/>
+               <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.eclipse.equinox" type="Directory"/>
+               <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.eclipse.rcp" type="Directory"/>
+               <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.jetty" type="Directory"/>
+               <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
+               <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
+               <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp" type="Directory"/>
+               <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.formats" type="Directory"/>
+               <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.poi" type="Directory"/>
+               <location path="${project_loc:argeo-suite}/../output/a2/org.argeo.tp.gis" type="Directory"/>
        </locations>
 </target>
\ No newline at end of file