X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dep%2Forg.argeo.dep.cms.node%2Fpom.xml;h=21537c4771ccd5147445c1664589e69f8649c7b8;hb=df4a440cdb135fa2be339537c259ba273a6938c3;hp=b79903200151740060ee1dd1d8ec2eadb8804301;hpb=b732ba743f3b2149655938c1fa4c02d67ea1754e;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 b79903200..21537c477 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.49</version>
+		<version>2.1.73-SNAPSHOT</version>
 		<artifactId>dep</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
@@ -11,49 +11,51 @@
 	<name>CMS Node</name>
 	<dependencies>
 
-		<!-- Argeo Commons -->
+		<!-- Parent dependencies -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.dep.cms.client</artifactId>
-			<version>2.1.49</version>
-			<type>pom</type>
+			<version>2.1.73-SNAPSHOT</version>
 		</dependency>
+
+		<!-- Argeo Commons -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.node.api</artifactId>
-			<version>2.1.49</version>
+			<version>2.1.73-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.cms</artifactId>
-			<version>2.1.49</version>
+			<version>2.1.73-SNAPSHOT</version>
 		</dependency>
+
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.cms.ui</artifactId>
-			<version>2.1.49</version>
+			<version>2.1.73-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.enterprise</artifactId>
-			<version>2.1.49</version>
+			<version>2.1.73-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.ext.jackrabbit</artifactId>
-			<version>2.1.49</version>
+			<version>2.1.73-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Argeo Commons UI -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.eclipse.ui</artifactId>
-			<version>2.1.49</version>
+			<version>2.1.73-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.eclipse.ui.rap</artifactId>
-			<version>2.1.49</version>
+			<version>2.1.73-SNAPSHOT</version>
 		</dependency>
 
 		<!-- CMS Dependencies -->
@@ -66,27 +68,62 @@
 			<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.misc</groupId>
-			<artifactId>org.joda.time</artifactId>
+			<groupId>org.argeo.tp.javax</groupId>
+			<artifactId>javax.inject</artifactId>
 		</dependency>
 
-		<!-- Third Parties -->
+		<!-- Database drivers -->
 		<dependency>
 			<groupId>org.argeo.tp.misc</groupId>
 			<artifactId>org.h2</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>org.w3c.css.sac</artifactId>
+			<artifactId>org.postgresql.jdbc42</artifactId>
 		</dependency>
+		<!-- Third Parties -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.misc</groupId> -->
+		<!-- <artifactId>org.w3c.css.sac</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.misc</groupId> -->
+		<!-- <artifactId>com.steadystate.css</artifactId> -->
+		<!-- </dependency> -->
 		<dependency>
 			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>com.steadystate.css</artifactId>
+			<artifactId>com.google.gson</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.apache</groupId>
+			<artifactId>org.apache.xmlgraphics.commons</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>com.google.gson</artifactId>
+			<artifactId>org.w3c.dom.svg</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.apache</groupId>
+			<artifactId>org.apache.batik.i18n</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.apache</groupId>
+			<artifactId>org.apache.batik.util</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.apache</groupId>
+			<artifactId>org.apache.batik.css</artifactId>
 		</dependency>
 
 		<!-- Jackrabbit -->
@@ -121,23 +158,23 @@
 
 		<!-- UI -->
 		<dependency>
-			<groupId>org.argeo.tp.rap.platform</groupId>
+			<groupId>org.argeo.tp.rap.e4</groupId>
 			<artifactId>org.eclipse.rap.rwt</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.rap.platform</groupId>
+			<groupId>org.argeo.tp.rap.e4</groupId>
 			<artifactId>org.eclipse.core.commands</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.rap.platform</groupId>
+			<groupId>org.argeo.tp.rap.e4</groupId>
 			<artifactId>org.eclipse.rap.jface</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.rap.platform</groupId>
+			<groupId>org.argeo.tp.rap.e4</groupId>
 			<artifactId>org.eclipse.rap.filedialog</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.rap.platform</groupId>
+			<groupId>org.argeo.tp.rap.e4</groupId>
 			<artifactId>org.eclipse.rap.fileupload</artifactId>
 		</dependency>
 
@@ -154,10 +191,6 @@
 			<groupId>org.argeo.tp.javax</groupId>
 			<artifactId>javax.el</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.javax</groupId>
-			<artifactId>javax.inject</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp.gemini</groupId>
 			<artifactId>org.eclipse.gemini.blueprint.core</artifactId>
@@ -210,10 +243,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>
@@ -226,10 +259,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>
@@ -242,10 +275,10 @@
 			<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>
@@ -273,22 +306,7 @@
 									<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>
+									<excludeArtifactIds>org.argeo.dep.cms.client</excludeArtifactIds>
 									<includeTypes>jar</includeTypes>
 									<includeScope>runtime</includeScope>
 									<useRepositoryLayout>true</useRepositoryLayout>
@@ -347,6 +365,28 @@
 			<id>rpmbuild-tp</id>
 			<build>
 				<plugins>
+					<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>
@@ -359,7 +399,7 @@
 								</goals>
 								<configuration>
 									<name>argeo-cms-node-tp</name>
-									<projversion>${version.argeo-distribution}</projversion>
+									<projversion>${version.argeo-tp}</projversion>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi</directory>