[maven-release-plugin] prepare release argeo-commons-2.1.91

[lgpl/argeo-commons.git] / dep / org.argeo.dep.cms.client / pom.xml

diff --git a/dep/org.argeo.dep.cms.client/pom.xml b/dep/org.argeo.dep.cms.client/pom.xml
index ff6ca2a578c3caa7fa2ec2b9d1de90f419fb0ed0..d1375110c95fdfa3b46053ac913c419c10de8f02 100644 (file)
--- a/dep/org.argeo.dep.cms.client/pom.xml
+++ b/dep/org.argeo.dep.cms.client/pom.xml
@@ -3,7 +3,7 @@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
-               <version>2.1.57-SNAPSHOT</version>
+               <version>2.1.91</version>
                <artifactId>dep</artifactId>
                <relativePath>..</relativePath>
        </parent>
@@ -14,13 +14,18 @@
                <!-- Argeo Commons -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.util</artifactId>
-                       <version>2.1.57-SNAPSHOT</version>
+                       <artifactId>org.argeo.enterprise</artifactId>
+                       <version>2.1.91</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.jcr</artifactId>
-                       <version>2.1.57-SNAPSHOT</version>
+                       <version>2.1.91</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons</groupId>
+                       <artifactId>org.argeo.core</artifactId>
+                       <version>2.1.91</version>
                </dependency>
 
                <!-- Third Parties -->
@@ -30,15 +35,24 @@
                </dependency>
                <dependency>
                        <groupId>org.argeo.tp.javax</groupId>
-                       <artifactId>javax.transaction</artifactId>
+                       <artifactId>javax.el-api</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.tp.apache</groupId>
-                       <artifactId>org.apache.log4j</artifactId>
+                       <groupId>org.argeo.tp.javax</groupId>
+                       <artifactId>javax.interceptor-api</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.tp.misc</groupId>
-                       <artifactId>com.jcraft.jsch</artifactId>
+                       <groupId>org.argeo.tp.javax</groupId>
+                       <artifactId>javax.enterprise.cdi-api</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.javax</groupId>
+                       <artifactId>javax.transaction-api</artifactId>
+               </dependency>
+               
+               <dependency>
+                       <groupId>org.argeo.tp.apache</groupId>
+                       <artifactId>org.apache.log4j</artifactId>
                </dependency>
                <dependency>
                        <groupId>org.argeo.tp.misc</groupId>
@@ -52,13 +66,38 @@
                        <groupId>org.argeo.tp.misc</groupId>
                        <artifactId>org.slf4j.commons.logging</artifactId>
                </dependency>
+
+               <!-- OSGi annotations -->
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.tp.sdk</groupId> -->
+<!--                   <artifactId>osgi.annotation</artifactId> -->
+<!--           </dependency> -->
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.tp.sdk</groupId> -->
+<!--                   <artifactId>org.osgi.service.metatype.annotations</artifactId> -->
+<!--           </dependency> -->
+<!--           <dependency> -->
+<!--                   <groupId>org.argeo.tp.sdk</groupId> -->
+<!--                   <artifactId>org.osgi.service.component.annotations</artifactId> -->
+<!--           </dependency> -->
+
+
                <dependency>
                        <groupId>org.argeo.tp.bouncycastle</groupId>
-                       <artifactId>bcprov</artifactId>
+                       <artifactId>bcpkix</artifactId>
                </dependency>
                <dependency>
                        <groupId>org.argeo.tp.bouncycastle</groupId>
-                       <artifactId>bcpkix</artifactId>
+                       <artifactId>bcpg</artifactId>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.argeo.tp.apache</groupId>
+                       <artifactId>org.apache.httpcomponents.httpcore</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.apache</groupId>
+                       <artifactId>org.apache.httpcomponents.httpclient</artifactId>
                </dependency>
                <dependency>
                        <groupId>org.argeo.tp.apache.commons</groupId>
@@ -74,11 +113,11 @@
                </dependency>
                <dependency>
                        <groupId>org.argeo.tp.apache.commons</groupId>
-                       <artifactId>org.apache.commons.httpclient</artifactId>
+                       <artifactId>org.apache.commons.cli</artifactId>
                </dependency>
                <dependency>
                        <groupId>org.argeo.tp.apache.commons</groupId>
-                       <artifactId>org.apache.commons.vfs</artifactId>
+                       <artifactId>org.apache.commons.httpclient</artifactId>
                </dependency>
                <dependency>
                        <groupId>org.argeo.tp.apache.commons</groupId>
@@ -88,22 +127,12 @@
                        <groupId>org.argeo.tp.apache.commons</groupId>
                        <artifactId>org.apache.commons.collections</artifactId>
                </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.apache.commons</groupId>
-                       <artifactId>org.apache.commons.dbcp</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.apache.commons</groupId>
-                       <artifactId>org.apache.commons.pool</artifactId>
-               </dependency>
                <dependency>
                        <groupId>org.argeo.tp.apache.commons</groupId>
                        <artifactId>org.apache.commons.compress</artifactId>
                </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.javax</groupId>
-                       <artifactId>javax.servlet</artifactId>
-               </dependency>
+
+               <!-- Equinox -->
                <dependency>
                        <groupId>org.argeo.tp.equinox</groupId>
                        <artifactId>org.eclipse.osgi.util</artifactId>
@@ -132,10 +161,6 @@
                        <groupId>org.argeo.tp.equinox</groupId>
                        <artifactId>org.eclipse.equinox.common</artifactId>
                </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.equinox</groupId>
-                       <artifactId>org.eclipse.equinox.console</artifactId>
-               </dependency>
                <dependency>
                        <groupId>org.argeo.tp.equinox</groupId>
                        <artifactId>org.eclipse.equinox.event</artifactId>
@@ -152,6 +177,12 @@
                        <groupId>org.argeo.tp.equinox</groupId>
                        <artifactId>org.eclipse.equinox.metatype</artifactId>
                </dependency>
+
+               <!-- Console -->
+               <dependency>
+                       <groupId>org.argeo.tp.apache.felix</groupId>
+                       <artifactId>org.apache.felix.scr</artifactId>
+               </dependency>
                <dependency>
                        <groupId>org.argeo.tp.apache.felix</groupId>
                        <artifactId>org.apache.felix.gogo.runtime</artifactId>
@@ -160,6 +191,12 @@
                        <groupId>org.argeo.tp.apache.felix</groupId>
                        <artifactId>org.apache.felix.gogo.shell</artifactId>
                </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.equinox</groupId>
+                       <artifactId>org.eclipse.equinox.console</artifactId>
+               </dependency>
+
+               <!-- Jackrabbit client -->
                <dependency>
                        <groupId>org.argeo.tp.apache.jackrabbit</groupId>
                        <artifactId>org.apache.jackrabbit.api</artifactId>
@@ -193,17 +230,11 @@
                        <artifactId>org.apache.jackrabbit.jcr2spi</artifactId>
                </dependency>
 
-               <!-- Required by Jackrabbit 2.12 -->
-               <dependency>
-                       <groupId>org.argeo.tp.misc</groupId>
-                       <artifactId>com.google.guava</artifactId>
-               </dependency>
-
                <!-- Test only -->
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.osgi.boot</artifactId>
-                       <version>2.1.57-SNAPSHOT</version>
+                       <version>2.1.91</version>
                        <scope>test</scope>
                </dependency>
        </dependencies>
@@ -214,39 +245,18 @@
                        <build>
                                <plugins>
                                        <plugin>
-                                               <groupId>org.apache.maven.plugins</groupId>
-                                               <artifactId>maven-dependency-plugin</artifactId>
+                                               <artifactId>maven-assembly-plugin</artifactId>
                                                <executions>
                                                        <execution>
-                                                               <id>copy-argeo</id>
+                                                               <id>prepare-source</id>
                                                                <phase>package</phase>
                                                                <goals>
-                                                                       <goal>copy-dependencies</goal>
+                                                                       <goal>single</goal>
                                                                </goals>
                                                                <configuration>
-                                                                       <includeTypes>jar</includeTypes>
-                                                                       <outputDirectory>${project.build.directory}/lib-argeo</outputDirectory>
-                                                                       <includeGroupIds>org.argeo.commons</includeGroupIds>
-                                                                       <excludeTransitive>true</excludeTransitive>
-                                                                       <includeTypes>jar</includeTypes>
-                                                                       <includeScope>runtime</includeScope>
-                                                                       <useRepositoryLayout>true</useRepositoryLayout>
-                                                               </configuration>
-                                                       </execution>
-                                                       <execution>
-                                                               <id>copy-tp</id>
-                                                               <phase>package</phase>
-                                                               <goals>
-                                                                       <goal>copy-dependencies</goal>
-                                                               </goals>
-                                                               <configuration>
-                                                                       <includeTypes>jar</includeTypes>
-                                                                       <outputDirectory>${project.build.directory}/lib-tp</outputDirectory>
-                                                                       <excludeGroupIds>org.argeo.commons</excludeGroupIds>
-                                                                       <excludeTransitive>true</excludeTransitive>
-                                                                       <includeTypes>jar</includeTypes>
-                                                                       <includeScope>runtime</includeScope>
-                                                                       <useRepositoryLayout>true</useRepositoryLayout>
+                                                                       <descriptorRefs>
+                                                                               <descriptorRef>a2-source</descriptorRef>
+                                                                       </descriptorRefs>
                                                                </configuration>
                                                        </execution>
                                                </executions>
@@ -272,24 +282,17 @@
                                                                                        <directoryIncluded>false</directoryIncluded>
                                                                                        <sources>
                                                                                                <source>
-                                                                                                       <location>${project.build.directory}/lib-argeo</location>
+                                                                                                       <location>${project.build.directory}/${project.artifactId}-${project.version}-a2-source</location>
                                                                                                        <includes>
                                                                                                                <include>**/*.jar</include>
                                                                                                        </includes>
                                                                                                </source>
                                                                                        </sources>
                                                                                </mapping>
-                                                                               <mapping>
-                                                                                       <directory>/usr/share/osgi/org/argeo/commons/${project.artifactId}/${project.version}</directory>
-                                                                                       <username>root</username>
-                                                                                       <groupname>root</groupname>
-                                                                                       <directoryIncluded>false</directoryIncluded>
-                                                                                       <artifact />
-                                                                               </mapping>
                                                                        </mappings>
                                                                        <requires>
                                                                                <require>argeo-cms-client-tp</require>
-                                                                               <require>osgi-boot</require>
+                                                                               <require>argeo-osgi-boot</require>
                                                                        </requires>
                                                                </configuration>
                                                        </execution>
@@ -302,6 +305,23 @@
                        <id>rpmbuild-tp</id>
                        <build>
                                <plugins>
+                                       <plugin>
+                                               <artifactId>maven-assembly-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>prepare-source-tp</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>single</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <descriptorRefs>
+                                                                               <descriptorRef>a2-source-tp</descriptorRef>
+                                                                       </descriptorRefs>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
                                        <plugin>
                                                <groupId>org.codehaus.mojo</groupId>
                                                <artifactId>rpm-maven-plugin</artifactId>
@@ -314,7 +334,8 @@
                                                                </goals>
                                                                <configuration>
                                                                        <name>argeo-cms-client-tp</name>
-                                                                       <projversion>${version.argeo-distribution}</projversion>
+                                                                       <projversion>${version.argeo-tp}</projversion>
+                                                                       <release>${maven.build.timestamp}</release>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>
@@ -324,7 +345,7 @@
                                                                                        <directoryIncluded>false</directoryIncluded>
                                                                                        <sources>
                                                                                                <source>
-                                                                                                       <location>${project.build.directory}/lib-tp</location>
+                                                                                                       <location>${project.build.directory}/${project.artifactId}-${project.version}-a2-source-tp</location>
                                                                                                        <includes>
                                                                                                                <include>**/*.jar</include>
                                                                                                        </includes>