X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=dep%2Forg.argeo.dep.cms.node%2Fpom.xml;h=747b700b9245c323f01b7a5751db667bae8e3608;hb=dfcc0a6154d21674e8b1d8a1ccb4eefbc8f8caa5;hp=286beb7e17ea78c8d00b3e6e2663a11d523b3f9e;hpb=50e8c32c6bfcf903b2e123c8751143bdbc615afc;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 286beb7e1..747b700b9 100644
--- a/dep/org.argeo.dep.cms.node/pom.xml
+++ b/dep/org.argeo.dep.cms.node/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.commons</groupId>
-		<version>2.1.76-SNAPSHOT</version>
+		<version>2.1.91</version>
 		<artifactId>dep</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
@@ -15,120 +15,64 @@
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.dep.cms.client</artifactId>
-			<version>2.1.76-SNAPSHOT</version>
+			<version>2.1.91</version>
 			<type>pom</type>
 		</dependency>
 
 		<!-- Argeo Commons -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.node.api</artifactId>
-			<version>2.1.76-SNAPSHOT</version>
+			<artifactId>org.argeo.api</artifactId>
+			<version>2.1.91</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.cms</artifactId>
-			<version>2.1.76-SNAPSHOT</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.cms.ui</artifactId>
-			<version>2.1.76-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.cms.ui.theme</artifactId>
-			<version>2.1.76-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.enterprise</artifactId>
-			<version>2.1.76-SNAPSHOT</version>
+			<version>2.1.91</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.ext.jackrabbit</artifactId>
-			<version>2.1.76-SNAPSHOT</version>
-		</dependency>
-
-		<!-- Argeo Commons UI -->
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.eclipse.ui</artifactId>
-			<version>2.1.76-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.eclipse.ui.rap</artifactId>
-			<version>2.1.76-SNAPSHOT</version>
+			<artifactId>org.argeo.maintenance</artifactId>
+			<version>2.1.91</version>
 		</dependency>
 
 		<!-- CMS Dependencies -->
-		<!-- TODO: not bitronix dependent -->
-		<dependency>
-			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>bitronix.tm</artifactId>
-		</dependency>
-		<!-- <dependency> -->
-		<!-- <groupId>org.argeo.tp.misc</groupId> -->
-		<!-- <artifactId>org.joda.time</artifactId> -->
-		<!-- </dependency> -->
-
-		<!-- Javax -->
-		<dependency>
-			<groupId>org.argeo.tp.javax</groupId>
-			<artifactId>javax.annotation</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.javax</groupId>
-			<artifactId>javax.inject</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>
-		</dependency>
-		<!-- Third Parties -->
 		<!-- <dependency> -->
 		<!-- <groupId>org.argeo.tp.misc</groupId> -->
-		<!-- <artifactId>org.w3c.css.sac</artifactId> -->
+		<!-- <artifactId>bitronix.tm</artifactId> -->
 		<!-- </dependency> -->
 		<!-- <dependency> -->
 		<!-- <groupId>org.argeo.tp.misc</groupId> -->
-		<!-- <artifactId>com.steadystate.css</artifactId> -->
+		<!-- <artifactId>org.joda.time</artifactId> -->
 		<!-- </dependency> -->
+
+		<!-- Misc -->
 		<dependency>
-			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>com.google.gson</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.apache</groupId>
-			<artifactId>org.apache.xmlgraphics.commons</artifactId>
+			<groupId>org.argeo.tp.bouncycastle</groupId>
+			<artifactId>bcprov</artifactId>
 		</dependency>
+
+		<!-- Apache Commons -->
 		<dependency>
-			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>org.w3c.dom.svg</artifactId>
+			<groupId>org.argeo.tp.apache.commons</groupId>
+			<artifactId>org.apache.commons.dbcp</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.apache</groupId>
-			<artifactId>org.apache.batik.i18n</artifactId>
+			<groupId>org.argeo.tp.apache.commons</groupId>
+			<artifactId>org.apache.commons.pool</artifactId>
 		</dependency>
+
+		<!-- Javax -->
 		<dependency>
-			<groupId>org.argeo.tp.apache</groupId>
-			<artifactId>org.apache.batik.util</artifactId>
+			<groupId>org.argeo.tp.javax</groupId>
+			<artifactId>javax.annotation</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.apache</groupId>
-			<artifactId>org.apache.batik.css</artifactId>
+			<groupId>org.argeo.tp.javax</groupId>
+			<artifactId>javax.inject</artifactId>
 		</dependency>
 
-		<!-- Jackrabbit -->
+		<!-- Jackrabbit Repository -->
 		<dependency>
 			<groupId>org.argeo.tp.apache.jackrabbit</groupId>
 			<artifactId>org.apache.jackrabbit.data</artifactId>
@@ -162,76 +106,46 @@
 			<artifactId>org.apache.lucene</artifactId>
 		</dependency>
 
-		<!-- UI -->
-		<dependency>
-			<groupId>org.argeo.tp.rap.e4</groupId>
-			<artifactId>org.eclipse.rap.rwt</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.rap.e4</groupId>
-			<artifactId>org.eclipse.core.commands</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.rap.e4</groupId>
-			<artifactId>org.eclipse.rap.jface</artifactId>
-		</dependency>
+		<!-- Required by Jackrabbit 2.12 -->
 		<dependency>
-			<groupId>org.argeo.tp.rap.e4</groupId>
-			<artifactId>org.eclipse.rap.filedialog</artifactId>
+			<groupId>org.argeo.tp.misc</groupId>
+			<artifactId>com.google.guava</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.rap.e4</groupId>
-			<artifactId>org.eclipse.rap.fileupload</artifactId>
+			<groupId>org.argeo.tp.misc</groupId>
+			<artifactId>com.google.guava.failureaccess</artifactId>
 		</dependency>
 
-		<!-- TODO: remove Spring dependency -->
-		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.beans</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.javax</groupId>
-			<artifactId>javax.el</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.gemini</groupId>
-			<artifactId>org.eclipse.gemini.blueprint.core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.gemini</groupId>
-			<artifactId>org.eclipse.gemini.blueprint.extender</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.gemini</groupId>
-			<artifactId>org.eclipse.gemini.blueprint.io</artifactId>
-		</dependency>
+		<!-- Database drivers -->
 		<dependency>
 			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>org.aspectj.weaver</artifactId>
+			<artifactId>org.h2</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>org.aopalliance</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.aop</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.context</artifactId>
+			<artifactId>org.postgresql.jdbc42</artifactId>
 		</dependency>
+
+		<!-- Third Parties -->
 		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.expression</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> -->
+
+		<!-- Servlet -->
 		<dependency>
-			<groupId>org.argeo.tp.spring</groupId>
-			<artifactId>org.springframework.instrument</artifactId>
+			<groupId>org.argeo.tp.javax</groupId>
+			<artifactId>javax.servlet</artifactId>
 		</dependency>
 
 		<!-- HTTP Server -->
@@ -245,10 +159,10 @@
 		</dependency>
 
 		<!-- Jetty -->
-		<!-- <dependency> -->
-		<!-- <groupId>org.argeo.tp.jetty</groupId> -->
-		<!-- <artifactId>org.eclipse.jetty.client</artifactId> -->
-		<!-- </dependency> -->
+		<dependency>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.client</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.jetty</groupId>
 			<artifactId>org.eclipse.jetty.continuation</artifactId>
@@ -261,10 +175,10 @@
 			<groupId>org.argeo.tp.jetty</groupId>
 			<artifactId>org.eclipse.jetty.io</artifactId>
 		</dependency>
-		<!-- <dependency> -->
-		<!-- <groupId>org.argeo.tp.jetty</groupId> -->
-		<!-- <artifactId>org.eclipse.jetty.jmx</artifactId> -->
-		<!-- </dependency> -->
+		<dependency>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.jmx</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.jetty</groupId>
 			<artifactId>org.eclipse.jetty.security</artifactId>
@@ -277,14 +191,19 @@
 			<groupId>org.argeo.tp.jetty</groupId>
 			<artifactId>org.eclipse.jetty.servlet</artifactId>
 		</dependency>
-		<!-- <dependency> -->
-		<!-- <groupId>org.argeo.tp.jetty</groupId> -->
-		<!-- <artifactId>org.eclipse.jetty.servlets</artifactId> -->
-		<!-- </dependency> -->
+		<dependency>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.servlets</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.jetty</groupId>
 			<artifactId>org.eclipse.jetty.util</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.jetty</groupId>
+			<artifactId>org.eclipse.jetty.xml</artifactId>
+		</dependency>
+
 
 	</dependencies>
 
@@ -310,30 +229,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>
@@ -362,13 +257,6 @@
 												</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>
@@ -402,28 +290,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>
@@ -437,6 +303,7 @@
 								<configuration>
 									<name>argeo-cms-node-tp</name>
 									<projversion>${version.argeo-tp}</projversion>
+									<release>${maven.build.timestamp}</release>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi</directory>