Merge remote-tracking branch 'origin/unstable' into testing
authorMathieu Baudier <mbaudier@argeo.org>
Wed, 24 Nov 2021 09:03:34 +0000 (10:03 +0100)
committerMathieu Baudier <mbaudier@argeo.org>
Wed, 24 Nov 2021 09:03:34 +0000 (10:03 +0100)
1  2 
pom.xml

diff --combined pom.xml
index fb1bedf58c490e66eb7f632c5bcd090146f4d8da,d6f35ab9c1c1339892e20910f3ffa68ad2c63a09..08dec90e2d899417308fa27fe014054e9cfc88f7
+++ b/pom.xml
@@@ -4,16 -4,16 +4,16 @@@
        <parent>
                <groupId>org.argeo.maven</groupId>
                <artifactId>argeo-osgi-parent</artifactId>
-               <version>2.1.6</version>
+               <version>2.1.7</version>
        </parent>
        <groupId>org.argeo.commons</groupId>
        <artifactId>argeo-commons</artifactId>
 -      <version>2.3-SNAPSHOT</version>
 +      <version>2.1-SNAPSHOT</version>
        <name>Argeo Commons</name>
        <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>
        </properties>
        <modules>
        <distributionManagement>
                <repository>
                        <id>staging</id>
 -                      <url>dav:https://forge.argeo.org/data/java/argeo-2.3</url>
 +                      <url>dav:https://forge.argeo.org/data/java/argeo-2.1</url>
                        <uniqueVersion>false</uniqueVersion>
                </repository>
                <site>
                        <id>staging</id>
 -                      <url>file:///srv/docfactory/argeo-2.3/site/argeo-commons/</url>
 +                      <url>file:///srv/docfactory/argeo-2.1/site/argeo-commons/</url>
                </site>
        </distributionManagement>
        <repositories>
                                <enabled>false</enabled>
                        </snapshots>
                </repository>
 -              <repository>
 -                      <id>argeo-unstable</id>
 -                      <url>http://forge.argeo.org/data/java/argeo-2.3/</url>
 -                      <releases>
 -                              <enabled>true</enabled>
 -                              <updatePolicy>never</updatePolicy>
 -                              <checksumPolicy>warn</checksumPolicy>
 -                      </releases>
 -                      <snapshots>
 -                              <enabled>false</enabled>
 -                      </snapshots>
 -              </repository>
                <!-- Disable Maven default repository -->
                <repository>
                        <id>central</id>