X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=dep%2Forg.argeo.dep.cms.node%2Fpom.xml;h=917b01c58cec745d6da1ab3e386545bd3633dec3;hb=8f0b18f9d5acc3a901a0795061355f3feea15cd1;hp=f4402a81e1cbd43c2f773b8c1f571ea0ce5f6041;hpb=776df8fdd46c18532b399f7b9696b87559ffccc9;p=lgpl%2Fargeo-commons.git

diff --git a/dep/org.argeo.dep.cms.node/pom.xml b/dep/org.argeo.dep.cms.node/pom.xml
index f4402a81e..917b01c58 100644
--- a/dep/org.argeo.dep.cms.node/pom.xml
+++ b/dep/org.argeo.dep.cms.node/pom.xml
@@ -3,48 +3,39 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.commons</groupId>
-		<version>2.1.85-SNAPSHOT</version>
+		<version>2.3.5</version>
 		<artifactId>dep</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.dep.cms.node</artifactId>
 	<name>CMS Node</name>
+
 	<dependencies>
 
 		<!-- Parent dependencies -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.dep.cms.client</artifactId>
-			<version>2.1.85-SNAPSHOT</version>
+			<artifactId>org.argeo.dep.cms.base</artifactId>
+			<version>2.3.5</version>
 			<type>pom</type>
 		</dependency>
 
 		<!-- Argeo Commons -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.node.api</artifactId>
-			<version>2.1.85-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.cms</artifactId>
-			<version>2.1.85-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.maintenance</artifactId>
-			<version>2.1.85-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.ext.jackrabbit</artifactId>
-			<version>2.1.85-SNAPSHOT</version>
+			<artifactId>org.argeo.cms.servlet</artifactId>
+			<version>2.3.5</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.ext.equinox.jetty</artifactId>
-			<version>2.1.85-SNAPSHOT</version>
+			<artifactId>org.argeo.cms.jcr</artifactId>
+			<version>2.3.5</version>
 		</dependency>
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.commons</groupId> -->
+		<!-- <artifactId>org.argeo.maintenance</artifactId> -->
+		<!-- <version>2.3-SNAPSHOT</version> -->
+		<!-- </dependency> -->
 
 		<!-- CMS Dependencies -->
 		<!-- <dependency> -->
@@ -56,161 +47,170 @@
 		<!-- <artifactId>org.joda.time</artifactId> -->
 		<!-- </dependency> -->
 
-		<!-- Javax -->
+		<!-- Apache Commons -->
 		<dependency>
-			<groupId>org.argeo.tp.javax</groupId>
-			<artifactId>javax.annotation</artifactId>
+			<groupId>org.argeo.tp.apache.commons</groupId>
+			<artifactId>org.apache.commons.dbcp</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.javax</groupId>
-			<artifactId>javax.inject</artifactId>
+			<groupId>org.argeo.tp.apache.commons</groupId>
+			<artifactId>org.apache.commons.pool</artifactId>
 		</dependency>
 
-		<!-- Database drivers -->
+		<!-- Javax -->
 		<dependency>
-			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>org.postgresql.jdbc42</artifactId>
+			<groupId>org.argeo.tp.javax</groupId>
+			<artifactId>javax.jcr</artifactId>
 		</dependency>
-
-		<!-- Third Parties -->
 		<dependency>
-			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>com.google.gson</artifactId>
+			<groupId>org.argeo.tp.javax</groupId>
+			<artifactId>javax.el-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.javax</groupId>
+			<artifactId>javax.interceptor-api</artifactId>
 		</dependency>
-
-		<!-- Aries -->
-		<!-- <dependency> -->
-		<!-- <groupId>org.argeo.tp.apache</groupId> -->
-		<!-- <artifactId>org.apache.aries.util</artifactId> -->
-		<!-- </dependency> -->
-		<!-- <dependency> -->
-		<!-- <groupId>org.argeo.tp.apache</groupId> -->
-		<!-- <artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId> -->
-		<!-- </dependency> -->
-
-		<!-- HTTP Server -->
 		<dependency>
-			<groupId>org.argeo.tp.equinox</groupId>
-			<artifactId>org.eclipse.equinox.http.servlet</artifactId>
+			<groupId>org.argeo.tp.javax</groupId>
+			<artifactId>javax.enterprise.cdi-api</artifactId>
 		</dependency>
+		<!-- JTA is still indirectly required by Jackrabbit -->
 		<dependency>
-			<groupId>org.argeo.tp.equinox</groupId>
-			<artifactId>org.eclipse.equinox.http.jetty</artifactId>
+			<groupId>org.argeo.tp.javax</groupId>
+			<artifactId>javax.transaction-api</artifactId>
 		</dependency>
-
-		<!-- Jetty -->
 		<dependency>
-			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.client</artifactId>
+			<groupId>org.argeo.tp.javax</groupId>
+			<artifactId>javax.annotation</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.continuation</artifactId>
+			<groupId>org.argeo.tp.javax</groupId>
+			<artifactId>javax.inject</artifactId>
 		</dependency>
+		
 		<dependency>
-			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.http</artifactId>
+			<groupId>org.argeo.tp.apache.commons</groupId>
+			<artifactId>org.apache.commons.net</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.io</artifactId>
+			<groupId>org.argeo.tp.apache.commons</groupId>
+			<artifactId>org.apache.commons.collections</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.jmx</artifactId>
+			<groupId>org.argeo.tp.apache.commons</groupId>
+			<artifactId>org.apache.commons.compress</artifactId>
 		</dependency>
+
+		<!-- Jackrabbit Dependencies -->
 		<dependency>
-			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.security</artifactId>
+			<groupId>org.argeo.tp.apache</groupId>
+			<artifactId>org.apache.httpcomponents.httpcore</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.server</artifactId>
+			<groupId>org.argeo.tp.apache</groupId>
+			<artifactId>org.apache.httpcomponents.httpclient</artifactId>
 		</dependency>
+
+		<!-- Jackrabbit client -->
 		<dependency>
-			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.servlet</artifactId>
+			<groupId>org.argeo.tp.apache.jackrabbit</groupId>
+			<artifactId>org.apache.jackrabbit.api</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.servlets</artifactId>
+			<groupId>org.argeo.tp.apache.jackrabbit</groupId>
+			<artifactId>org.apache.jackrabbit.jcr.commons</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.util</artifactId>
+			<groupId>org.argeo.tp.apache.jackrabbit</groupId>
+			<artifactId>org.apache.jackrabbit.spi</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.xml</artifactId>
+			<groupId>org.argeo.tp.apache.jackrabbit</groupId>
+			<artifactId>org.apache.jackrabbit.spi.commons</artifactId>
 		</dependency>
-
-		<!-- HTTP2 -->
 		<dependency>
-			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.alpn.api</artifactId>
+			<groupId>org.argeo.tp.apache.jackrabbit</groupId>
+			<artifactId>org.apache.jackrabbit.webdav</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.alpn.client</artifactId>
+			<groupId>org.argeo.tp.apache.jackrabbit</groupId>
+			<artifactId>org.apache.jackrabbit.spi2dav</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.alpn.server</artifactId>
+			<groupId>org.argeo.tp.apache.jackrabbit</groupId>
+			<artifactId>org.apache.jackrabbit.jcr2dav</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.http2.common</artifactId>
+			<groupId>org.argeo.tp.apache.jackrabbit</groupId>
+			<artifactId>org.apache.jackrabbit.jcr2spi</artifactId>
 		</dependency>
+
+		<!-- Jackrabbit Repository -->
 		<dependency>
-			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.http2.client</artifactId>
+			<groupId>org.argeo.tp.apache.jackrabbit</groupId>
+			<artifactId>org.apache.jackrabbit.data</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.http2.client.http</artifactId>
+			<groupId>org.argeo.tp.apache.jackrabbit</groupId>
+			<artifactId>org.apache.jackrabbit.core</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.http2.server</artifactId>
+			<groupId>org.argeo.tp.apache.jackrabbit</groupId>
+			<artifactId>org.apache.jackrabbit.server</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.http2.hpack</artifactId>
+			<groupId>org.argeo.tp.misc</groupId>
+			<artifactId>EDU.oswego.cs.dl.util.concurrent</artifactId>
 		</dependency>
-
-		<!-- Async -->
 		<dependency>
-			<groupId>org.argeo.tp.javax</groupId>
-			<artifactId>javax.websocket</artifactId>
+			<groupId>org.argeo.tp.apache.commons</groupId>
+			<artifactId>org.apache.commons.fileupload</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.websocket.api</artifactId>
+			<groupId>org.argeo.tp.apache</groupId>
+			<artifactId>org.apache.tika.core</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.websocket.common</artifactId>
+			<groupId>org.argeo.tp.apache</groupId>
+			<artifactId>org.apache.tika.parsers</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.websocket.client</artifactId>
+			<groupId>org.argeo.tp.apache</groupId>
+			<artifactId>org.apache.lucene</artifactId>
 		</dependency>
+
+		<!-- Required by Jackrabbit 2.12 -->
 		<dependency>
-			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.websocket.server</artifactId>
+			<groupId>org.argeo.tp.misc</groupId>
+			<artifactId>com.google.guava</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.websocket.servlet</artifactId>
+			<groupId>org.argeo.tp.misc</groupId>
+			<artifactId>com.google.guava.failureaccess</artifactId>
 		</dependency>
+
+		<!-- Database drivers -->
 		<dependency>
-			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.websocket.javax.websocket</artifactId>
+			<groupId>org.argeo.tp.misc</groupId>
+			<artifactId>org.h2</artifactId>
 		</dependency>
+
+		<!-- Third Parties -->
 		<dependency>
-			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.websocket.javax.websocket.server</artifactId>
+			<groupId>org.argeo.tp.misc</groupId>
+			<artifactId>com.google.gson</artifactId>
 		</dependency>
+
+		<!-- Aries -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.apache</groupId> -->
+		<!-- <artifactId>org.apache.aries.util</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.apache</groupId> -->
+		<!-- <artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId> -->
+		<!-- </dependency> -->
+
 	</dependencies>
 
 	<profiles>
@@ -235,30 +235,6 @@
 							</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> -->
-					<!-- <excludeArtifactIds>org.argeo.dep.cms.client</excludeArtifactIds> -->
-					<!-- <includeTypes>jar</includeTypes> -->
-					<!-- <includeScope>runtime</includeScope> -->
-					<!-- <useRepositoryLayout>true</useRepositoryLayout> -->
-					<!-- </configuration> -->
-					<!-- </execution> -->
-					<!-- </executions> -->
-					<!-- </plugin> -->
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>rpm-maven-plugin</artifactId>
@@ -270,7 +246,7 @@
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>argeo-cms-node</name>
+									<name>argeo-cms-node${argeo.rpm.suffix}</name>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi</directory>
@@ -287,17 +263,10 @@
 												</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</require>
-										<require>argeo-cms-node-tp</require>
+										<require>argeo-cms-base{argeo.rpm.suffix}</require>
+										<require>argeo-cms-node-tp${argeo.rpm.suffix}</require>
 									</requires>
 								</configuration>
 							</execution>
@@ -327,28 +296,6 @@
 							</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>
@@ -360,8 +307,9 @@
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>argeo-cms-node-tp</name>
+									<name>argeo-cms-node-tp${argeo.rpm.suffix}</name>
 									<projversion>${version.argeo-tp}</projversion>
+									<release>${argeo.rpm.release.tp}</release>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi</directory>
@@ -380,7 +328,7 @@
 										</mapping>
 									</mappings>
 									<requires>
-										<require>argeo-cms-client-tp</require>
+										<require>argeo-cms-base-tp${argeo.rpm.suffix}</require>
 									</requires>
 								</configuration>
 							</execution>