Prepare release.

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

diff --git a/pom.xml b/pom.xml
index 59f2792bbc978d97e48877a414fe21a3a9656293..3129e0fa8647c93268c4281d760b19b2ebd11382 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -5,13 +5,13 @@
        <modelVersion>4.0.0</modelVersion>
        <groupId>org.argeo.commons</groupId>
        <artifactId>argeo-commons</artifactId>
-       <version>2.1.82-SNAPSHOT</version>
+       <version>2.1.85-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.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,15 +41,12 @@
                <!-- 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>
@@ -139,13 +136,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 +152,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 +249,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 +411,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 +437,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>