Improve JCR utilities.

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

diff --git a/pom.xml b/pom.xml
index 7785258953523c452ee98f8e1e5736a83ab86eef..a2a8e7e643a97f9ddb748888a09f1b5934077913 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.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.81-SNAPSHOT</version.argeo-commons>
-               <version.argeo-tp>2.1.25-SNAPSHOT</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>
@@ -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,21 @@ limitations under the License.
                                <updatePolicy>daily</updatePolicy>
                                <checksumPolicy>warn</checksumPolicy>
                        </releases>
+                       <snapshots>
+                               <enabled>false</enabled>
+                       </snapshots>
+               </repository>
+               <repository>
+                       <id>argeo-snapshots</id>
+                       <url>file:///srv/javafactory/argeo-2.1</url>
+                       <releases>
+                               <enabled>false</enabled>
+                       </releases>
+                       <snapshots>
+                               <enabled>true</enabled>
+                               <updatePolicy>never</updatePolicy>
+                               <checksumPolicy>warn</checksumPolicy>
+                       </snapshots>
                </repository>
        </repositories>
        <pluginRepositories>
@@ -413,8 +437,39 @@ limitations under the License.
                                <updatePolicy>daily</updatePolicy>
                                <checksumPolicy>warn</checksumPolicy>
                        </releases>
+                       <snapshots>
+                               <enabled>false</enabled>
+                       </snapshots>
+               </pluginRepository>
+               <pluginRepository>
+                       <id>argeo-maven-plugins-snapshots</id>
+                       <url>file:///srv/javafactory/argeo-2.1</url>
+                       <releases>
+                               <enabled>false</enabled>
+                       </releases>
+                       <snapshots>
+                               <enabled>true</enabled>
+                               <updatePolicy>never</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>
@@ -482,17 +537,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>