Merge remote-tracking branch 'origin/unstable' into testing
authorMathieu Baudier <mbaudier@argeo.org>
Wed, 24 Nov 2021 06:41:29 +0000 (07:41 +0100)
committerMathieu Baudier <mbaudier@argeo.org>
Wed, 24 Nov 2021 06:41:29 +0000 (07:41 +0100)
13 files changed:
1  2 
cnf/testing.bnd
dep/org.argeo.dep.cms.client/pom.xml
dep/org.argeo.dep.cms.e4.rap/pom.xml
dep/org.argeo.dep.cms.ext/pom.xml
dep/org.argeo.dep.cms.node/pom.xml
dep/org.argeo.dep.cms.ui.rap/pom.xml
dep/pom.xml
dist/argeo-cli/pom.xml
dist/argeo-node/pom.xml
dist/osgi-boot/pom.xml
dist/pom.xml
pom.xml
sdk/pom.xml

diff --cc cnf/testing.bnd
index d638826d025887b7d836014c9d59a55019d50f57,0000000000000000000000000000000000000000..0a43c20de19f1e5954bd48898852b45bd55a864f
mode 100644,000000..100644
--- /dev/null
@@@ -1,6 -1,0 +1,8 @@@
- category=org.argeo.commons
 +version.released=2.1.103
++qualifier=.next
++
++category=org.argeo.commons
 +Bundle-RequiredExecutionEnvironment=JavaSE-11
 +
 +argeo.rpm.stagingRepository=/srv/rpmfactory/testing/argeo-osgi-2/argeo
 +argeo.rpm.suffix=
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc dep/pom.xml
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc dist/pom.xml
Simple merge
diff --cc pom.xml
index c063132e1c5ce6fdf0c780c12e9630ac02cd058d,143a3ea5a449d360d24180871673dae761580401..fb1bedf58c490e66eb7f632c5bcd090146f4d8da
+++ b/pom.xml
@@@ -13,9 -13,8 +13,8 @@@
        <packaging>pom</packaging>
        <url>http://www.argeo.org/</url>
        <properties>
 -              <version.context>unstable</version.context>
 +              <version.context>testing</version.context>
                <version.argeo-tp>2.1.27</version.argeo-tp>
-               <project.scm.id>code.argeo.org</project.scm.id>
        </properties>
        <modules>
                <!-- Base -->
diff --cc sdk/pom.xml
Simple merge