projects / lgpl / argeo-commons.git / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
[maven-release-plugin] prepare release argeo-commons-2.1.75
[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 57366b05630edaacbc2e8e5e4b84b0ce1c208124..85b8769b421b77c1048c2f5da6d5014696b4b15c 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.35</version>
+               <version>2.1.75</version>
                <artifactId>dep</artifactId>
                <relativePath>..</relativePath>
        </parent>
@@ -15,12 +15,12 @@
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.util</artifactId>
-                       <version>2.1.35</version>
+                       <version>2.1.75</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.server.jcr</artifactId>
-                       <version>2.1.35</version>
+                       <artifactId>org.argeo.jcr</artifactId>
+                       <version>2.1.75</version>
                </dependency>
 
                <!-- Third Parties -->
@@ -60,6 +60,14 @@
                        <groupId>org.argeo.tp.bouncycastle</groupId>
                        <artifactId>bcpkix</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>
                        <artifactId>org.apache.commons.io</artifactId>
@@ -108,10 +116,6 @@
                        <groupId>org.argeo.tp.equinox</groupId>
                        <artifactId>org.eclipse.osgi.util</artifactId>
                </dependency>
-               <dependency>
-                       <groupId>org.argeo.tp.equinox</groupId>
-                       <artifactId>org.eclipse.osgi</artifactId>
-               </dependency>
                <dependency>
                        <groupId>org.argeo.tp.equinox</groupId>
                        <artifactId>org.eclipse.equinox.util</artifactId>
@@ -138,15 +142,35 @@
                </dependency>
                <dependency>
                        <groupId>org.argeo.tp.equinox</groupId>
-                       <artifactId>org.eclipse.equinox.console</artifactId>
+                       <artifactId>org.eclipse.equinox.event</artifactId>
                </dependency>
                <dependency>
                        <groupId>org.argeo.tp.equinox</groupId>
-                       <artifactId>org.eclipse.equinox.event</artifactId>
+                       <artifactId>org.eclipse.equinox.app</artifactId>
                </dependency>
                <dependency>
                        <groupId>org.argeo.tp.equinox</groupId>
-                       <artifactId>org.eclipse.equinox.app</artifactId>
+                       <artifactId>org.eclipse.equinox.ds</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.equinox</groupId>
+                       <artifactId>org.eclipse.equinox.metatype</artifactId>
+               </dependency>
+
+               <!-- SSH -->
+               <dependency>
+                       <groupId>org.argeo.tp.apache</groupId>
+                       <artifactId>org.apache.mina.core</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.tp.apache</groupId>
+                       <artifactId>org.apache.sshd.core</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>
@@ -156,6 +180,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>
@@ -189,11 +219,17 @@
                        <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.35</version>
+                       <version>2.1.75</version>
                        <scope>test</scope>
                </dependency>
        </dependencies>
@@ -204,41 +240,44 @@
                        <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>
-                                                               </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>
+                                                                       <descriptorRefs>
+                                                                               <descriptorRef>a2-source</descriptorRef>
+                                                                       </descriptorRefs>
                                                                </configuration>
                                                        </execution>
                                                </executions>
                                        </plugin>
+<!--                                   <plugin> -->
+<!--                                           <groupId>org.apache.maven.plugins</groupId> -->
+<!--                                           <artifactId>maven-dependency-plugin</artifactId> -->
+<!--                                           <executions> -->
+<!--                                                   <execution> -->
+<!--                                                           <id>copy-argeo</id> -->
+<!--                                                           <phase>package</phase> -->
+<!--                                                           <goals> -->
+<!--                                                                   <goal>copy-dependencies</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> -->
+<!--                                           </executions> -->
+<!--                                   </plugin> -->
                                        <plugin>
                                                <groupId>org.codehaus.mojo</groupId>
                                                <artifactId>rpm-maven-plugin</artifactId>
@@ -260,13 +299,20 @@
                                                                                        <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>
+                                                                                                               <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>
@@ -283,6 +329,45 @@
                        <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.apache.maven.plugins</groupId> -->
+<!--                                           <artifactId>maven-dependency-plugin</artifactId> -->
+<!--                                           <executions> -->
+<!--                                                   <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> -->
+<!--                                                           </configuration> -->
+<!--                                                   </execution> -->
+<!--                                           </executions> -->
+<!--                                   </plugin> -->
                                        <plugin>
                                                <groupId>org.codehaus.mojo</groupId>
                                                <artifactId>rpm-maven-plugin</artifactId>
@@ -295,7 +380,7 @@
                                                                </goals>
                                                                <configuration>
                                                                        <name>argeo-cms-client-tp</name>
-                                                                       <projversion>${version.argeo-distribution}</projversion>
+                                                                       <projversion>${version.argeo-tp}</projversion>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi</directory>
@@ -305,9 +390,9 @@
                                                                                        <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>
+                                                                                                               <include>**/*.jar</include>
                                                                                                        </includes>
                                                                                                </source>
                                                                                        </sources>
Argeo Commons - Lightweight integration framework in pure Java/OSGi