[maven-release-plugin] prepare release argeo-commons-2.1.85

[lgpl/argeo-commons.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 59f2792bbc978d97e48877a414fe21a3a9656293..e1a33e279d58aa6f32a9f89249292d5488c274a8 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,17 +1,15 @@
 <?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.82-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.82-SNAPSHOT</version.argeo-commons>
-               <version.argeo-tp>2.1.25</version.argeo-tp>
+               <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>
                <argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2/el7</argeo.rpm.stagingRepository>
@@ -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>
@@ -139,13 +134,14 @@ 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>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>
@@ -154,7 +150,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>
@@ -246,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>
@@ -408,26 +409,22 @@ 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>
                                <enabled>false</enabled>
-                               <updatePolicy>daily</updatePolicy>
-                               <checksumPolicy>warn</checksumPolicy>
                        </snapshots>
                </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>
-                               <updatePolicy>daily</updatePolicy>
-                               <checksumPolicy>warn</checksumPolicy>
                        </releases>
                        <snapshots>
                                <enabled>true</enabled>
-                               <updatePolicy>daily</updatePolicy>
+                               <updatePolicy>always</updatePolicy>
                                <checksumPolicy>warn</checksumPolicy>
                        </snapshots>
                </repository>
@@ -438,9 +435,24 @@ 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>
+                               <enabled>false</enabled>
+                       </snapshots>
+               </pluginRepository>
+               <pluginRepository>
+                       <id>argeo-maven-plugins-snapshots</id>
+                       <url>http://snapshots.argeo.org/data/java/argeo-2.1/</url>
+                       <releases>
+                               <enabled>false</enabled>
+                       </releases>
+                       <snapshots>
+                               <enabled>true</enabled>
+                               <updatePolicy>always</updatePolicy>
+                               <checksumPolicy>warn</checksumPolicy>
+                       </snapshots>
                </pluginRepository>
        </pluginRepositories>
        <distributionManagement>
@@ -541,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>
@@ -569,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>