From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 24 Nov 2021 09:06:29 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/unstable' into testing
X-Git-Tag: v2.1.24~5
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=c285180bece610b2c2921d44fe14b6dde2123efa;hp=-c

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

c285180bece610b2c2921d44fe14b6dde2123efa
diff --combined lib/pom.xml
index 5611ecf,96f8b17..bdda5d1
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@@ -3,20 -3,19 +3,19 @@@
  	<parent>
  		<groupId>org.argeo.maven</groupId>
  		<artifactId>argeo-osgi-parent</artifactId>
- 		<version>2.1.3</version>
+ 		<version>2.1.7</version>
  	</parent>
  	<groupId>org.argeo.suite</groupId>
  	<artifactId>argeo-suite-lib</artifactId>
  	<packaging>pom</packaging>
  	<name>Parent POM for Argeo Suite Extensions</name>
  	<description />
 -	<version>2.3-SNAPSHOT</version>
 +	<version>2.1-SNAPSHOT</version>
  	<properties>
  		<!-- Dependencies -->
  		<version.argeo-tp>2.1.27</version.argeo-tp>
- 		<version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
 -		<version.argeo-commons>2.3-SNAPSHOT</version.argeo-commons>
 -		<version.argeo-suite-icons>2.3.1</version.argeo-suite-icons>
 +		<version.argeo-commons>2.1-SNAPSHOT</version.argeo-commons>
 +		<version.argeo-suite-icons>2.1.1</version.argeo-suite-icons>
  		<git.rw />
  	</properties>
  	<dependencies>
@@@ -28,7 -27,7 +27,7 @@@
  		<dependency>
  			<groupId>org.argeo.suite</groupId>
  			<artifactId>org.argeo.suite.dep.ui.rap</artifactId>
 -			<version>2.3-SNAPSHOT</version>
 +			<version>2.1-SNAPSHOT</version>
  			<scope>provided</scope>
  			<exclusions>
  				<!-- Avoid slf4j implementations lurking in the classpath. -->
@@@ -80,6 -79,18 +79,6 @@@
  			<releases>
  				<enabled>true</enabled>
  				<updatePolicy>daily</updatePolicy>
 -				<checksumPolicy>warn</checksumPolicy>
 -			</releases>
 -			<snapshots>
 -				<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>
diff --combined pom.xml
index b6dd237,17c898a..6a5c822
--- a/pom.xml
+++ b/pom.xml
@@@ -3,21 -3,21 +3,21 @@@
  	<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.suite</groupId>
  	<artifactId>argeo-suite</artifactId>
 -	<version>2.3-SNAPSHOT</version>
 +	<version>2.1-SNAPSHOT</version>
  	<name>Argeo Suite</name>
  	<packaging>pom</packaging>
  	<url>http://www.argeo.org/</url>
  	<properties>
 -		<version.context>unstable</version.context>
 +		<version.context>testing</version.context>
  		<!-- Dependencies -->
  		<version.argeo-tp>2.1.27</version.argeo-tp>
 -		<version.argeo-commons>2.3-SNAPSHOT</version.argeo-commons>
 -		<version.argeo-suite-icons>2.3.1</version.argeo-suite-icons>
 -		<!-- <version.argeo-rcp>2.3-SNAPSHOT</version.argeo-rcp> -->
 +		<version.argeo-commons>2.1-SNAPSHOT</version.argeo-commons>
 +		<version.argeo-suite-icons>2.1.1</version.argeo-suite-icons>
 +		<!-- <version.argeo-rcp>2.1-SNAPSHOT</version.argeo-rcp> -->
  		<git.rw />
  	</properties>
  	<modules>
@@@ -117,6 -117,18 +117,6 @@@
  				<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>
  	</repositories>
  	<reporting>
  		<plugins>
@@@ -188,12 -200,12 +188,12 @@@
  	<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-suite/</url>
 +			<url>file:///srv/docfactory/argeo-2.1/site/argeo-suite/</url>
  		</site>
  	</distributionManagement>
  </project>