projects / lgpl / argeo-commons.git / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Introduce Jcr singleton, making using Jcr less verbose.
[lgpl/argeo-commons.git] / pom.xml
diff --git a/pom.xml b/pom.xml
index a049101544945f908d96a418d5f9f6daf245cd03..8209bc7010af0547ac3064370e3a12bb823cb915 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.76-SNAPSHOT</version>
+       <version>2.1.80-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.76-SNAPSHOT</version.argeo-commons>
-               <version.argeo-tp>2.1.21-SNAPSHOT</version.argeo-tp>
+               <version.argeo-commons>2.1.80-SNAPSHOT</version.argeo-commons>
+               <version.argeo-tp>2.1.24</version.argeo-tp>
                <!-- RPM -->
                <argeo.rpm.release>7</argeo.rpm.release>
                <argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2/el7</argeo.rpm.stagingRepository>
@@ -23,6 +25,7 @@
                <module>org.argeo.enterprise</module>
                <module>org.argeo.jcr</module>
                <module>org.argeo.osgi.boot</module>
+               <module>org.argeo.core</module>
                <!-- Eclipse -->
                <module>org.argeo.eclipse.ui</module>
                <module>org.argeo.eclipse.ui.rap</module>
@@ -40,6 +43,7 @@
                <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>
@@ -156,26 +160,6 @@ limitations under the License.
                                                </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>
@@ -203,6 +187,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>
@@ -229,6 +225,11 @@ limitations under the License.
                                                <encoding>UTF-8</encoding>
                                        </configuration>
                                </plugin>
+                               <plugin>
+                                       <groupId>pl.project13.maven</groupId>
+                                       <artifactId>git-commit-id-plugin</artifactId>
+                                       <version>3.0.0</version>
+                               </plugin>
                                <plugin>
                                        <artifactId>maven-release-plugin</artifactId>
                                        <version>2.5.1</version>
@@ -251,6 +252,10 @@ limitations under the License.
                                                        <_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>
+                                                       <!-- Git metadata -->
+                                                       <!-- <SLC-Git-Commit-Id>${git.commit.id}</SLC-Git-Commit-Id> -->
+                                                       <!-- <SLC-Git-Commit-Describe>${git.commit.id.describe}</SLC-Git-Commit-Describe> -->
+                                                       <!-- <SLC-Git-Commit-Count>${git.closest.tag.commit.count}</SLC-Git-Commit-Count> -->
                                                </instructions>
                                        </configuration>
                                        <executions>
@@ -287,8 +292,8 @@ limitations under the License.
                                <!-- Argeo -->
                                <plugin>
                                        <groupId>org.argeo.maven.plugins</groupId>
-                                       <artifactId>maven-argeo-osgi-plugin</artifactId>
-                                       <version>1.1.6</version>
+                                       <artifactId>argeo-osgi-plugin</artifactId>
+                                       <version>2.1.1</version>
                                </plugin>
                        </plugins>
                </pluginManagement>
@@ -306,6 +311,19 @@ limitations under the License.
                                        </filesets>
                                </configuration>
                        </plugin>
+                       <!-- <plugin> -->
+                       <!-- <groupId>pl.project13.maven</groupId> -->
+                       <!-- <artifactId>git-commit-id-plugin</artifactId> -->
+                       <!-- <executions> -->
+                       <!-- <execution> -->
+                       <!-- <id>get-the-git-infos</id> -->
+                       <!-- <goals> -->
+                       <!-- <goal>revision</goal> -->
+                       <!-- </goals> -->
+                       <!-- <phase>initialize</phase> -->
+                       <!-- </execution> -->
+                       <!-- </executions> -->
+                       <!-- </plugin> -->
                        <plugin>
                                <artifactId>maven-resources-plugin</artifactId>
                                <configuration>
@@ -319,6 +337,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>
@@ -338,6 +369,12 @@ limitations under the License.
                        <artifactId>argeo-tp</artifactId>
                        <version>${version.argeo-tp}</version>
                        <scope>provided</scope>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.apache</groupId>
+                                       <artifactId>org.apache.xerces</artifactId>
+                               </exclusion>
+                       </exclusions>
                </dependency>
        </dependencies>
        <dependencyManagement>
@@ -473,8 +510,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>
@@ -499,8 +538,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>
Argeo Commons - Lightweight integration framework in pure Java/OSGi