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

Conflicts:
	cms/org.argeo.cms.integration/pom.xml
	cms/org.argeo.ext.equinox.jetty/pom.xml
	cms/pom.xml
	cnf/build.bnd
	dep/org.argeo.slc.dep.e4.rap/pom.xml
	dep/org.argeo.slc.dep.minimal/pom.xml
	dep/pom.xml
	ide/features/pom.xml
	ide/plugins/pom.xml
	ide/pom.xml
	legacy/argeo-commons/pom.xml
	legacy/dep/org.argeo.slc.dep.backend/pom.xml
	legacy/dep/org.argeo.slc.dep.spring/pom.xml
	legacy/dep/pom.xml
	legacy/lib/pom.xml
	legacy/org.argeo.legacy.fake.java8/pom.xml
	legacy/org.argeo.slc.agent.jcr/pom.xml
	legacy/org.argeo.slc.agent/pom.xml
	legacy/org.argeo.slc.client.rap/pom.xml
	legacy/org.argeo.slc.client.ui.dist/pom.xml
	legacy/org.argeo.slc.client.ui/pom.xml
	legacy/org.argeo.slc.demo.ant/pom.xml
	legacy/org.argeo.slc.demo.basic/pom.xml
	legacy/org.argeo.slc.demo.minimal/pom.xml
	legacy/org.argeo.slc.launcher/pom.xml
	legacy/org.argeo.slc.server.repo/pom.xml
	legacy/org.argeo.slc.spring/pom.xml
	legacy/org.argeo.slc.support/pom.xml
	legacy/pom.xml
	org.argeo.slc.api/pom.xml
	org.argeo.slc.factory/pom.xml
	org.argeo.slc.jcr/pom.xml
	org.argeo.slc.repo/pom.xml
	org.argeo.slc.runtime/pom.xml
	pom.xml

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 390a315f5301f46fbe363df3f515286299fc0fa5..6d9ac59083f65c6b87bdb6a9ac05d9d3f09f9f22 100644 (file)
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-       <name>argeo-slc-unstable</name>
+       <name>argeo-slc</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/argeo.bnd b/cnf/argeo.bnd
deleted file mode 100644 (file)
index db505a1..0000000
--- a/cnf/argeo.bnd
+++ /dev/null
@@ -1,14 +0,0 @@
-# Common
-Bundle-Version: ${version.released}${qualifier}
-Private-Package: *.internal.*
-Export-Package: !*.internal.*, *
-#-consumer-policy : ${range;[==,=+)}
--contract: !JavaServlet,*
--savemanifest : META-INF/MANIFEST.MF
--includeresource.default : OSGI-INF/=-OSGI-INF/,e4xmi/=-e4xmi/,icons/=-icons/,img/=-img/
--compression STORE
--source true
--removeheaders = Bnd-LastModified,Build-Jdk,Built-By,Tool,Created-By
-Automatic-Module-Name: ${bsn}
-SLC-Category=${category}
--groupid=${category}

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/maven.bnd b/cnf/maven.bnd
deleted file mode 100644 (file)
index f3a6e83..0000000
--- a/cnf/maven.bnd
+++ /dev/null
@@ -1,3 +0,0 @@
--include: \
-../cnf/argeo.bnd, \
-../cnf/unstable.bnd

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

diff --git a/sdk/output-argeo-tp-rap.target b/sdk/output-argeo-tp-rap.target
index d5f313450f5a5e2b0e1c24c1d5613dabcb764c08..552c8a4ef9b6365b924de6b2815258251f373304 100644 (file)
--- a/sdk/output-argeo-tp-rap.target
+++ b/sdk/output-argeo-tp-rap.target
@@ -2,12 +2,12 @@
 <?pde version="3.8"?>
 <target name="(output) argeo-tp-rap">
        <locations>
-               <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.apache" type="Directory"/>
-               <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.eclipse.equinox" type="Directory"/>
-               <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.eclipse.rap" type="Directory"/>
-               <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.jetty" type="Directory"/>
-               <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
-               <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
-               <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp" type="Directory"/>
+               <location path="${project_loc:argeo-slc}/../output/a2/org.argeo.tp.apache" type="Directory"/>
+               <location path="${project_loc:argeo-slc}/../output/a2/org.argeo.tp.eclipse.equinox" type="Directory"/>
+               <location path="${project_loc:argeo-slc}/../output/a2/org.argeo.tp.eclipse.rap" type="Directory"/>
+               <location path="${project_loc:argeo-slc}/../output/a2/org.argeo.tp.jetty" type="Directory"/>
+               <location path="${project_loc:argeo-slc}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
+               <location path="${project_loc:argeo-slc}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
+               <location path="${project_loc:argeo-slc}/../output/a2/org.argeo.tp" type="Directory"/>
        </locations>
 </target>
\ No newline at end of file

diff --git a/sdk/output-argeo-tp-rcp.target b/sdk/output-argeo-tp-rcp.target
index 77466926c581489ff5ee716a9f2a865325dbb2c8..1b88949d2e46d8cc34104ec01cc2fa4add6d2fe1 100644 (file)
--- a/sdk/output-argeo-tp-rcp.target
+++ b/sdk/output-argeo-tp-rcp.target
@@ -2,12 +2,12 @@
 <?pde version="3.8"?>
 <target name="(output) argeo-tp-rcp">
        <locations>
-               <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.apache" type="Directory"/>
-               <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.eclipse.equinox" type="Directory"/>
-               <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.eclipse.rcp" type="Directory"/>
-               <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.jetty" type="Directory"/>
-               <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
-               <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
-               <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp" type="Directory"/>
+               <location path="${project_loc:argeo-slc}/../output/a2/org.argeo.tp.apache" type="Directory"/>
+               <location path="${project_loc:argeo-slc}/../output/a2/org.argeo.tp.eclipse.equinox" type="Directory"/>
+               <location path="${project_loc:argeo-slc}/../output/a2/org.argeo.tp.eclipse.rcp" type="Directory"/>
+               <location path="${project_loc:argeo-slc}/../output/a2/org.argeo.tp.jetty" type="Directory"/>
+               <location path="${project_loc:argeo-slc}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
+               <location path="${project_loc:argeo-slc}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
+               <location path="${project_loc:argeo-slc}/../output/a2/org.argeo.tp" type="Directory"/>
        </locations>
 </target>
\ No newline at end of file