X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=e1a33e279d58aa6f32a9f89249292d5488c274a8;hb=4ae93488abaa2617f7a0eb46d05e37914e80068d;hp=c9364789bd05440ce30e06731c2580f3daab4b0b;hpb=709f28c604a56e219807309a07ff7155776397c2;p=lgpl%2Fargeo-commons.git

diff --git a/pom.xml b/pom.xml
index c9364789b..e1a33e279 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,16 +1,14 @@
 <?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.83-SNAPSHOT</version>
+	<version>2.1.85</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.83</version.argeo-commons>
+		<version.argeo-commons>2.1.85</version.argeo-commons>
 		<version.argeo-tp>2.1.27</version.argeo-tp>
 		<!-- RPM -->
 		<argeo.rpm.release>7</argeo.rpm.release>
@@ -41,21 +39,18 @@
 		<!-- Third Parties Extensions -->
 		<module>org.argeo.ext.jackrabbit</module>
 		<module>org.argeo.ext.equinox.jetty</module>
-		<!-- Legacy -->
-		<module>legacy</module>
 		<!-- Distribution -->
 		<module>maven</module>
 		<module>dep</module>
 		<module>demo</module>
 		<module>doc</module>
 		<module>dist</module>
-		<module>rcp</module>
 	</modules>
 	<scm>
 		<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>HEAD</tag>
+		<tag>argeo-commons-2.1.85</tag>
 	</scm>
 	<inceptionYear>2007</inceptionYear>
 	<licenses>
@@ -141,12 +136,12 @@ limitations under the License.
 					<artifactId>maven-compiler-plugin</artifactId>
 					<version>3.8.1</version>
 					<configuration>
-						<source>1.8</source>
-						<!-- <source>11</source> -->
+						<!-- <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 -->
-						<optimize>true</optimize>
+						<!-- <optimize>true</optimize> -->
 						<!-- Hack to work around issues with generated annotations : -->
 						<generatedSourcesDirectory>target/classes</generatedSourcesDirectory>
 						<generatedTestSourcesDirectory>target/test-classes</generatedTestSourcesDirectory>
@@ -252,7 +247,7 @@ limitations under the License.
 							<_include>bnd.bnd</_include>
 							<Bundle-Version>${project.version}-r${tstamp}</Bundle-Version>
 							<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-							<Bundle-RequiredExecutionEnvironment>JavaSE-1.8</Bundle-RequiredExecutionEnvironment>
+							<Bundle-RequiredExecutionEnvironment>JavaSE-11,JavaSE-1.8</Bundle-RequiredExecutionEnvironment>
 							<_removeheaders>Bnd-LastModified,Build-Jdk,Built-By,Tool,Created-By</_removeheaders>
 							<Automatic-Module-Name>${project.artifactId}</Automatic-Module-Name>
 							<SLC-Category>${project.groupId}</SLC-Category>
@@ -414,7 +409,7 @@ limitations under the License.
 			<url>http://repo.argeo.org/data/java/argeo-2.1/</url>
 			<releases>
 				<enabled>true</enabled>
-				<updatePolicy>daily</updatePolicy>
+				<updatePolicy>never</updatePolicy>
 				<checksumPolicy>warn</checksumPolicy>
 			</releases>
 			<snapshots>
@@ -423,13 +418,13 @@ limitations under the License.
 		</repository>
 		<repository>
 			<id>argeo-snapshots</id>
-			<url>file:///srv/javafactory/argeo-2.1</url>
+			<url>http://snapshots.argeo.org/data/java/argeo-2.1/</url>
 			<releases>
 				<enabled>false</enabled>
 			</releases>
 			<snapshots>
 				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
+				<updatePolicy>always</updatePolicy>
 				<checksumPolicy>warn</checksumPolicy>
 			</snapshots>
 		</repository>
@@ -440,7 +435,7 @@ limitations under the License.
 			<url>http://repo.argeo.org/data/java/argeo-2.1</url>
 			<releases>
 				<enabled>true</enabled>
-				<updatePolicy>daily</updatePolicy>
+				<updatePolicy>never</updatePolicy>
 				<checksumPolicy>warn</checksumPolicy>
 			</releases>
 			<snapshots>
@@ -449,13 +444,13 @@ limitations under the License.
 		</pluginRepository>
 		<pluginRepository>
 			<id>argeo-maven-plugins-snapshots</id>
-			<url>file:///srv/javafactory/argeo-2.1</url>
+			<url>http://snapshots.argeo.org/data/java/argeo-2.1/</url>
 			<releases>
 				<enabled>false</enabled>
 			</releases>
 			<snapshots>
 				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
+				<updatePolicy>always</updatePolicy>
 				<checksumPolicy>warn</checksumPolicy>
 			</snapshots>
 		</pluginRepository>
@@ -558,10 +553,8 @@ 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>
@@ -586,10 +579,8 @@ 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>