Remove non-working configuration of SNAPSHOT repositories via

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

diff --git a/pom.xml b/pom.xml
index db9576c5a6c06e2ca61043d002d8cc752bdddfd9..59f2792bbc978d97e48877a414fe21a3a9656293 100644 (file)
--- 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-SNAPSHOT</version>
+       <version>2.1.82-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.80</version.argeo-commons>
-               <version.argeo-tp>2.1.24</version.argeo-tp>
+               <version.argeo-commons>2.1.82-SNAPSHOT</version.argeo-commons>
+               <version.argeo-tp>2.1.25</version.argeo-tp>
                <!-- RPM -->
                <argeo.rpm.release>7</argeo.rpm.release>
                <argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2/el7</argeo.rpm.stagingRepository>
@@ -36,13 +38,11 @@
                <!-- 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>
+               <!-- Legacy -->
+               <module>legacy</module>
                <!-- Distribution -->
                <module>maven</module>
                <module>dep</module>
@@ -238,7 +238,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>
@@ -372,6 +372,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>
@@ -402,6 +411,25 @@ limitations under the License.
                                <updatePolicy>daily</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>
+                       <releases>
+                               <enabled>false</enabled>
+                               <updatePolicy>daily</updatePolicy>
+                               <checksumPolicy>warn</checksumPolicy>
+                       </releases>
+                       <snapshots>
+                               <enabled>true</enabled>
+                               <updatePolicy>daily</updatePolicy>
+                               <checksumPolicy>warn</checksumPolicy>
+                       </snapshots>
                </repository>
        </repositories>
        <pluginRepositories>
@@ -415,6 +443,22 @@ limitations under the License.
                        </releases>
                </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>
@@ -482,17 +526,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>
@@ -508,8 +541,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>
@@ -534,8 +569,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>