From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 3 Feb 2021 15:03:31 +0000 (+0100)
Subject: Disable SNAPSHOTs repository and use forge instead of repo.
X-Git-Tag: argeo-suite-2.1.18~2
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=e44e31082aabbcd32739a7a406a11b3ce9a392d7

Disable SNAPSHOTs repository and use forge instead of repo.
---

diff --git a/lib/pom.xml b/lib/pom.xml
index f00af85..6a94b71 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.argeo.maven</groupId>
 		<artifactId>argeo-osgi-parent</artifactId>
-		<version>2.1.2</version>
+		<version>2.1.3</version>
 	</parent>
 	<groupId>org.argeo.suite</groupId>
 	<artifactId>argeo-suite-lib</artifactId>
@@ -17,7 +17,7 @@
 		<version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
 		<version.argeo-commons>2.1.92-SNAPSHOT</version.argeo-commons>
 
-		<argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-gpl/el7</argeo.rpm.stagingRepository>
+		<argeo.rpm.stagingRepository>/srv/rpmfactory/testing/argeo</argeo.rpm.stagingRepository>
 		<git.rw />
 	</properties>
 	<dependencies>
@@ -76,33 +76,20 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
-			<dependency>
-				<groupId>org.argeo.tp.extras</groupId>
-				<artifactId>argeo-tp-extras</artifactId>
-				<version>${version.argeo-tp-extras}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
 		</dependencies>
 	</dependencyManagement>
 	<repositories>
 		<repository>
 			<id>argeo</id>
-			<url>http://repo.argeo.org/data/java/argeo-2.1</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>daily</updatePolicy>
-				<checksumPolicy>warn</checksumPolicy>
-			</releases>
-		</repository>
-		<repository>
-			<id>argeo-extras</id>
-			<url>http://repo.argeo.org/data/java/argeo-extras-2.1</url>
+			<url>http://forge.argeo.org/data/java/argeo-2.1</url>
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>
 				<checksumPolicy>warn</checksumPolicy>
 			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
 		</repository>
 	</repositories>
 	<reporting>
diff --git a/pom.xml b/pom.xml
index a156860..bf20d50 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.argeo.maven</groupId>
 		<artifactId>argeo-osgi-parent</artifactId>
-		<version>2.1.2</version>
+		<version>2.1.3</version>
 	</parent>
 	<groupId>org.argeo.suite</groupId>
 	<artifactId>argeo-suite</artifactId>
@@ -17,7 +17,7 @@
 		<version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
 		<version.argeo-commons>2.1.92-SNAPSHOT</version.argeo-commons>
 
-		<argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
+		<argeo.rpm.stagingRepository>/srv/rpmfactory/testing/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
 		<git.rw />
 	</properties>
 	<modules>
@@ -46,7 +46,7 @@
 	<inceptionYear>2014</inceptionYear>
 	<licenses>
 		<license>
-			<name> 	GPL-3.0-or-later</name>
+			<name>GPL-3.0-or-later</name>
 			<url>http://www.gnu.org/licenses/gpl-3.0.txt</url>
 			<distribution>repo</distribution>
 		</license>
@@ -90,33 +90,20 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
-			<dependency>
-				<groupId>org.argeo.tp.extras</groupId>
-				<artifactId>argeo-tp-extras</artifactId>
-				<version>${version.argeo-tp-extras}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
 		</dependencies>
 	</dependencyManagement>
 	<repositories>
 		<repository>
 			<id>argeo</id>
-			<url>http://repo.argeo.org/data/java/argeo-2.1</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>daily</updatePolicy>
-				<checksumPolicy>warn</checksumPolicy>
-			</releases>
-		</repository>
-		<repository>
-			<id>argeo-extras</id>
-			<url>http://repo.argeo.org/data/java/argeo-extras-2.1</url>
+			<url>http://forge.argeo.org/data/java/argeo-2.1/</url>
 			<releases>
 				<enabled>true</enabled>
 				<updatePolicy>daily</updatePolicy>
 				<checksumPolicy>warn</checksumPolicy>
 			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
 		</repository>
 	</repositories>
 	<reporting>