[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 afad1052d1e975fd67f50abd7393ad6ba0018a55..e1a33e279d58aa6f32a9f89249292d5488c274a8 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -3,13 +3,13 @@
        <modelVersion>4.0.0</modelVersion>
        <groupId>org.argeo.commons</groupId>
        <artifactId>argeo-commons</artifactId>
-       <version>2.1.79</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.79</version.argeo-commons>
-               <version.argeo-tp>2.1.24</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>
                <!-- CMS E4 -->
                <module>org.argeo.cms.e4</module>
                <module>org.argeo.cms.e4.rap</module>
-               <!-- CMS Workbench -->
-               <module>org.argeo.cms.ui.workbench</module>
-               <module>org.argeo.cms.ui.workbench.rap</module>
                <!-- Third Parties Extensions -->
                <module>org.argeo.ext.jackrabbit</module>
                <module>org.argeo.ext.equinox.jetty</module>
-               <module>org.argeo.ext.rap.ui.workbench</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>argeo-commons-2.1.79</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,30 +150,15 @@ 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>
-                               <plugin>
-                                       <artifactId>maven-source-plugin</artifactId>
-                                       <version>2.4</version>
-                                       <executions>
-                                               <execution>
-                                                       <id>attach-sources</id>
-                                                       <phase>package</phase>
-                                                       <goals>
-                                                               <goal>jar</goal>
-                                                       </goals>
-                                               </execution>
-                                       </executions>
-                                       <configuration>
-                                               <excludes>
-                                                       <!-- Prevents source jars to contain misleading data -->
-                                                       <exclude>plugin.xml</exclude>
-                                                       <exclude>META-INF/MANIFEST.MF</exclude>
-                                               </excludes>
-                                       </configuration>
-                               </plugin>
                                <plugin>
                                        <artifactId>maven-clean-plugin</artifactId>
                                        <version>2.6.1</version>
@@ -205,6 +186,18 @@ limitations under the License.
                                                </archive>
                                        </configuration>
                                </plugin>
+                               <plugin>
+                                       <artifactId>maven-source-plugin</artifactId>
+                                       <version>3.1.0</version>
+                                       <configuration>
+                                               <excludes>
+                                                       <exclude>**/*.class</exclude>
+                                                       <!-- Prevents source jars to contain misleading data -->
+                                                       <exclude>plugin.xml</exclude>
+                                                       <exclude>META-INF/MANIFEST.MF</exclude>
+                                               </excludes>
+                                       </configuration>
+                               </plugin>
                                <plugin>
                                        <artifactId>maven-antrun-plugin</artifactId>
                                        <version>1.8</version>
@@ -246,7 +239,7 @@ limitations under the License.
                                <plugin>
                                        <groupId>org.apache.felix</groupId>
                                        <artifactId>maven-bundle-plugin</artifactId>
-                                       <version>3.0.1</version>
+                                       <version>4.2.1</version>
                                        <extensions>true</extensions>
                                        <configuration>
                                                <manifestLocation>META-INF</manifestLocation>
@@ -254,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>
@@ -343,6 +336,19 @@ limitations under the License.
                                        <skip>false</skip>
                                </configuration>
                        </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-source-plugin</artifactId>
+                               <executions>
+                                       <execution>
+                                               <id>attach-sources</id>
+                                               <phase>package</phase>
+                                               <goals>
+                                                       <goal>jar</goal>
+                                               </goals>
+                                       </execution>
+                               </executions>
+                       </plugin>
                        <plugin>
                                <artifactId>maven-release-plugin</artifactId>
                                <configuration>
@@ -367,6 +373,15 @@ limitations under the License.
                                        <groupId>org.argeo.tp.apache</groupId>
                                        <artifactId>org.apache.xerces</artifactId>
                                </exclusion>
+                               <!-- Avoid slf4j implementations lurking in the classpath. -->
+                               <exclusion>
+                                       <groupId>org.argeo.tp.sdk</groupId>
+                                       <artifactId>biz.aQute.bndlib</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.misc</groupId>
+                                       <artifactId>slf4j.osgi</artifactId>
+                               </exclusion>
                        </exclusions>
                </dependency>
        </dependencies>
@@ -394,9 +409,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>
+               </repository>
+               <repository>
+                       <id>argeo-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>
                </repository>
        </repositories>
        <pluginRepositories>
@@ -405,11 +435,42 @@ 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>
+               <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>
@@ -477,17 +538,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>