X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=dep%2Forg.argeo.dep.cms.node%2Fpom.xml;h=4afc1f41a7a54331dd74a5bec3923f6e3f2a3067;hb=c53fec78daddb69c489686844188036b04e1615a;hp=59bf27dc5d4502001c2e27998cfbbfeac47c3b6a;hpb=c67731d23d7bd33653821e889a491f460d48acaf;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 59bf27dc5..4afc1f41a 100644
--- a/dep/org.argeo.dep.cms.node/pom.xml
+++ b/dep/org.argeo.dep.cms.node/pom.xml
@@ -1,52 +1,47 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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>
 	<parent>
 		<groupId>org.argeo.commons</groupId>
-		<version>2.1.86-SNAPSHOT</version>
+		<version>2.3-SNAPSHOT</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.86-SNAPSHOT</version>
+			<version>2.3-SNAPSHOT</version>
 			<type>pom</type>
 		</dependency>
 
 		<!-- Argeo Commons -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.node.api</artifactId>
-			<version>2.1.86-SNAPSHOT</version>
+			<artifactId>org.argeo.api</artifactId>
+			<version>2.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
+		
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.cms</artifactId>
-			<version>2.1.86-SNAPSHOT</version>
+			<version>2.3-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.maintenance</artifactId>
-			<version>2.1.86-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.ext.jackrabbit</artifactId>
-			<version>2.1.86-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.ext.equinox.jetty</artifactId>
-			<version>2.1.86-SNAPSHOT</version>
-		</dependency>
+			<artifactId>org.argeo.cms.jcr</artifactId>
+			<version>2.3-SNAPSHOT</version>
+		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.commons</groupId> -->
+<!-- 			<artifactId>org.argeo.maintenance</artifactId> -->
+<!-- 			<version>2.3-SNAPSHOT</version> -->
+<!-- 		</dependency> -->
 
 		<!-- CMS Dependencies -->
 		<!-- <dependency> -->
@@ -58,6 +53,22 @@
 		<!-- <artifactId>org.joda.time</artifactId> -->
 		<!-- </dependency> -->
 
+		<!-- Misc -->
+		<dependency>
+			<groupId>org.argeo.tp.bouncycastle</groupId>
+			<artifactId>bcprov</artifactId>
+		</dependency>
+
+		<!-- Apache Commons -->
+		<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>
+
 		<!-- Javax -->
 		<dependency>
 			<groupId>org.argeo.tp.javax</groupId>
@@ -68,7 +79,55 @@
 			<artifactId>javax.inject</artifactId>
 		</dependency>
 
+		<!-- Jackrabbit Repository -->
+		<dependency>
+			<groupId>org.argeo.tp.apache.jackrabbit</groupId>
+			<artifactId>org.apache.jackrabbit.data</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.apache.jackrabbit</groupId>
+			<artifactId>org.apache.jackrabbit.core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.apache.jackrabbit</groupId>
+			<artifactId>org.apache.jackrabbit.server</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.misc</groupId>
+			<artifactId>EDU.oswego.cs.dl.util.concurrent</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.apache.commons</groupId>
+			<artifactId>org.apache.commons.fileupload</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.apache</groupId>
+			<artifactId>org.apache.tika.core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.apache</groupId>
+			<artifactId>org.apache.tika.parsers</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.apache</groupId>
+			<artifactId>org.apache.lucene</artifactId>
+		</dependency>
+
+		<!-- Required by Jackrabbit 2.12 -->
+		<dependency>
+			<groupId>org.argeo.tp.misc</groupId>
+			<artifactId>com.google.guava</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.misc</groupId>
+			<artifactId>com.google.guava.failureaccess</artifactId>
+		</dependency>
+
 		<!-- Database drivers -->
+		<dependency>
+			<groupId>org.argeo.tp.misc</groupId>
+			<artifactId>org.h2</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.misc</groupId>
 			<artifactId>org.postgresql.jdbc42</artifactId>
@@ -90,6 +149,12 @@
 		<!-- <artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId> -->
 		<!-- </dependency> -->
 
+		<!-- Servlet -->
+		<dependency>
+			<groupId>org.argeo.tp.javax</groupId>
+			<artifactId>javax.servlet</artifactId>
+		</dependency>
+
 		<!-- HTTP Server -->
 		<dependency>
 			<groupId>org.argeo.tp.equinox</groupId>
@@ -146,73 +211,7 @@
 			<artifactId>org.eclipse.jetty.xml</artifactId>
 		</dependency>
 
-		<!-- HTTP2 -->
-		<dependency>
-			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.alpn.api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.alpn.client</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.alpn.server</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.http2.common</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.http2.client</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.http2.client.http</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.http2.server</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.http2.hpack</artifactId>
-		</dependency>
 
-		<!-- Async -->
-		<dependency>
-			<groupId>org.argeo.tp.javax</groupId>
-			<artifactId>javax.websocket</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.websocket.api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.websocket.common</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.websocket.client</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.websocket.server</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.websocket.servlet</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.websocket.javax.websocket</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.jetty</groupId>
-			<artifactId>org.eclipse.jetty.websocket.javax.websocket.server</artifactId>
-		</dependency>
 	</dependencies>
 
 	<profiles>
@@ -248,7 +247,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>
@@ -267,8 +266,8 @@
 										</mapping>
 									</mappings>
 									<requires>
-										<require>argeo-cms-client</require>
-										<require>argeo-cms-node-tp</require>
+										<require>argeo-cms-client${argeo.rpm.suffix}</require>
+										<require>argeo-cms-node-tp${argeo.rpm.suffix}</require>
 									</requires>
 								</configuration>
 							</execution>
@@ -309,8 +308,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>
@@ -329,7 +329,7 @@
 										</mapping>
 									</mappings>
 									<requires>
-										<require>argeo-cms-client-tp</require>
+										<require>argeo-cms-client-tp${argeo.rpm.suffix}</require>
 									</requires>
 								</configuration>
 							</execution>