X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=320a886db696ef6bf083ba20fabd8e701463e555;hb=b111cb5474fd611ad64b1239fa59e5340e36a8b2;hp=42b3b553e69f3b5a01bc18501a07e41ce9e5f11d;hpb=6948bb3e4cf6694637a0ed4a3ba538e1483dcefd;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index 42b3b553e..320a886db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.argeo.commons</groupId>
 	<artifactId>argeo-commons</artifactId>
-	<version>2.1.81</version>
+	<version>2.1.83-SNAPSHOT</version>
 	<name>Argeo Commons</name>
 	<packaging>pom</packaging>
 	<!-- <url>http://repo.argeo.org/data/docs/argeo-2.1/site/argeo-commons/</url> -->
 	<properties>
-		<version.argeo-commons>2.1.81</version.argeo-commons>
-		<version.argeo-tp>2.1.25</version.argeo-tp>
+		<version.argeo-commons>2.1.83-SNAPSHOT</version.argeo-commons>
+		<version.argeo-tp>2.1.27</version.argeo-tp>
 		<!-- RPM -->
 		<argeo.rpm.release>7</argeo.rpm.release>
 		<argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2/el7</argeo.rpm.stagingRepository>
@@ -53,7 +55,7 @@
 		<connection>scm:git:http://git.argeo.org/apache2/argeo-commons.git</connection>
 		<url>http://git.argeo.org/?p=apache2/argeo-commons.git;a=summary</url>
 		<developerConnection>scm:git:https://code.argeo.org/git/apache2/argeo-commons.git</developerConnection>
-		<tag>argeo-commons-2.1.81</tag>
+		<tag>HEAD</tag>
 	</scm>
 	<inceptionYear>2007</inceptionYear>
 	<licenses>
@@ -137,9 +139,10 @@ limitations under the License.
 				<!-- Maven -->
 				<plugin>
 					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.3</version>
+					<version>3.8.1</version>
 					<configuration>
 						<source>1.8</source>
+						<!-- <source>11</source> -->
 						<target>1.8</target>
 						<compilerId>eclipse</compilerId>
 						<!-- Required for compliance level, see http://jira.codehaus.org/browse/PLXCOMP-231 -->
@@ -152,7 +155,12 @@ limitations under the License.
 						<dependency>
 							<groupId>org.codehaus.plexus</groupId>
 							<artifactId>plexus-compiler-eclipse</artifactId>
-							<version>2.6</version>
+							<version>2.8.5</version>
+						</dependency>
+						<dependency>
+							<groupId>org.eclipse.jdt</groupId>
+							<artifactId>ecj</artifactId>
+							<version>3.19.0</version>
 						</dependency>
 					</dependencies>
 				</plugin>
@@ -409,6 +417,21 @@ limitations under the License.
 				<updatePolicy>daily</updatePolicy>
 				<checksumPolicy>warn</checksumPolicy>
 			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>argeo-snapshots</id>
+			<url>file:///srv/javafactory/argeo-2.1</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+				<checksumPolicy>warn</checksumPolicy>
+			</snapshots>
 		</repository>
 	</repositories>
 	<pluginRepositories>
@@ -420,8 +443,39 @@ limitations under the License.
 				<updatePolicy>daily</updatePolicy>
 				<checksumPolicy>warn</checksumPolicy>
 			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</pluginRepository>
+		<pluginRepository>
+			<id>argeo-maven-plugins-snapshots</id>
+			<url>file:///srv/javafactory/argeo-2.1</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+				<checksumPolicy>warn</checksumPolicy>
+			</snapshots>
 		</pluginRepository>
 	</pluginRepositories>
+	<distributionManagement>
+		<repository>
+			<id>staging</id>
+			<url>dav:https://forge.argeo.org/data/java/argeo-2.1/</url>
+			<uniqueVersion>false</uniqueVersion>
+		</repository>
+		<snapshotRepository>
+			<id>staging</id>
+			<url>file:///srv/javafactory/argeo-2.1</url>
+			<uniqueVersion>true</uniqueVersion>
+		</snapshotRepository>
+		<site>
+			<id>staging</id>
+			<url>file:///srv/docfactory/argeo-2.1/site/argeo-commons/</url>
+		</site>
+	</distributionManagement>
 	<reporting>
 		<plugins>
 			<plugin>
@@ -489,17 +543,6 @@ limitations under the License.
 			</plugin>
 		</plugins>
 	</reporting>
-	<distributionManagement>
-		<repository>
-			<id>staging</id>
-			<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.1/site/argeo-commons/</url>
-		</site>
-	</distributionManagement>
 	<profiles>
 		<profile>
 			<id>rpmbuild</id>
@@ -515,8 +558,10 @@ limitations under the License.
 								</goals>
 								<configuration>
 									<target>
-										<copy todir="${argeo.rpm.stagingRepository}" quiet="true" failonerror="false">
-											<fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
+										<copy todir="${argeo.rpm.stagingRepository}" quiet="true"
+											failonerror="false">
+											<fileset dir="${project.build.directory}/rpm"
+												includes="*/RPMS/**/*.rpm" />
 											<flattenmapper />
 										</copy>
 									</target>
@@ -541,8 +586,10 @@ limitations under the License.
 								</goals>
 								<configuration>
 									<target>
-										<copy todir="${argeo.rpm.stagingRepository}" quiet="true" failonerror="false">
-											<fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
+										<copy todir="${argeo.rpm.stagingRepository}" quiet="true"
+											failonerror="false">
+											<fileset dir="${project.build.directory}/rpm"
+												includes="*/RPMS/**/*.rpm" />
 											<flattenmapper />
 										</copy>
 									</target>