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

Conflicts:
	sdk/output-cms-rap.target
	sdk/output-cms-rcp.target

diff --git a/.gitmodules b/.gitmodules
index 07b10cacb00393eff6d61e695fefe2acf9ab0577..d7283346ae7927fcd3fe8c032c443556a3fd661a 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
+       branch = testing

diff --git a/.project b/.project
index 3fcd2fd54a7d1ed9902e9eac326fe6d0a2d25231..ff418936f2de03c4250f3d5a808862b33bc3faf5 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 a6f848887ccc40bb5bdd3db46d37140d94f544eb..936a67569f072bfad1eeb935aca211a0e0530e86 100644 (file)
--- a/branch.mk
+++ b/branch.mk
@@ -1 +1 @@
-include $(SDK_SRC_BASE)/cnf/unstable.bnd
+include $(SDK_SRC_BASE)/cnf/testing.bnd

diff --git a/cnf/build.bnd b/cnf/build.bnd
index f6e8be27226265627e5d7817893fdd08eb4d901e..a464edc1fa01eafdc3a058a9630ed2a1de22b625 100644 (file)
--- a/cnf/build.bnd
+++ b/cnf/build.bnd
@@ -1,3 +1,3 @@
 -include: \
-${workspace}/cnf/unstable.bnd, \
+${workspace}/cnf/testing.bnd, \
 ${workspace}/sdk/argeo-build/argeo.bnd, \

diff --git a/cnf/testing.bnd b/cnf/testing.bnd
new file mode 100644 (file)
index 0000000..ea2797d
--- /dev/null
+++ b/cnf/testing.bnd
@@ -0,0 +1,10 @@
+MAJOR=2
+MINOR=1
+MICRO=24
+qualifier=.next
+
+category=org.argeo.suite
+Bundle-RequiredExecutionEnvironment=JavaSE-11
+
+argeo.rpm.stagingRepository=/srv/rpmfactory/testing/argeo-osgi-2/argeo
+argeo.rpm.suffix=

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

diff --git a/sdk/output-cms-rap.target b/sdk/output-cms-rap.target
index 820cb3267b42b4a966f0fd7d93464b57ff22da68..b6f30363cf53921b1c9da171c11a93a1f4a74295 100644 (file)
--- a/sdk/output-cms-rap.target
+++ b/sdk/output-cms-rap.target
@@ -2,17 +2,17 @@
 <?pde version="3.8"?>
 <target name="(output) CMS RAP">
        <locations>
-               <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.cms.eclipse.rap" 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.eclipse.rap" 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 ce7bc50992f1ff681f2770ad09f09ef7f4d2bbfd..9e818714e9a327e8bddfc3ff993e272f0143e7b4 100644 (file)
--- a/sdk/output-cms-rcp.target
+++ b/sdk/output-cms-rcp.target
@@ -2,17 +2,17 @@
 <?pde version="3.8"?>
 <target name="(output) CMS RCP">
        <locations>
-               <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.cms.eclipse.rcp" 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.eclipse.rcp" 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