X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=dep%2Forg.argeo.dep.cms.node%2Fpom.xml;h=887d6ac0ff5c0fbde102d1d121cd4cf8a9171409;hb=ff9c437317754629a3fd745fc0452ae86c25c905;hp=ec47cdb8a2a546c84dd36f8c28f1b331a75927a0;hpb=a5b49032fbf094cdc192516b9f8957b6ce39b3ad;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 ec47cdb8a..887d6ac0f 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.32-SNAPSHOT</version>
+		<version>2.1.70-SNAPSHOT</version>
 		<artifactId>dep</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
@@ -15,29 +15,45 @@
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.dep.cms.client</artifactId>
-			<version>${version.argeo-commons}</version>
+			<version>2.1.70-SNAPSHOT</version>
+			<type>pom</type>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.node.api</artifactId>
+			<version>2.1.70-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.cms</artifactId>
-			<version>${version.argeo-commons}</version>
+			<version>2.1.70-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.cms.ui</artifactId>
+			<version>2.1.70-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.enterprise</artifactId>
+			<version>2.1.70-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.security.jackrabbit</artifactId>
-			<version>${version.argeo-commons}</version>
+			<artifactId>org.argeo.ext.jackrabbit</artifactId>
+			<version>2.1.70-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Argeo Commons UI -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.eclipse.ui</artifactId>
-			<version>${version.argeo-commons}</version>
+			<version>2.1.70-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.eclipse.ui.rap</artifactId>
-			<version>${version.argeo-commons}</version>
+			<version>2.1.70-SNAPSHOT</version>
 		</dependency>
 
 		<!-- CMS Dependencies -->
@@ -50,31 +66,52 @@
 			<groupId>org.argeo.tp.misc</groupId>
 			<artifactId>bitronix.tm</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.misc</groupId>
-			<artifactId>org.joda.time</artifactId>
-		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.argeo.tp.misc</groupId> -->
+<!-- 			<artifactId>org.joda.time</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.misc</groupId>
-			<artifactId>com.google.guava</artifactId>
+			<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,12 +158,12 @@
 			<artifactId>org.eclipse.rap.jface</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.rap</groupId>
-			<artifactId>org.eclipse.rap.addons.filedialog</artifactId>
+			<groupId>org.argeo.tp.rap.platform</groupId>
+			<artifactId>org.eclipse.rap.filedialog</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.rap</groupId>
-			<artifactId>org.eclipse.rap.addons.fileupload</artifactId>
+			<groupId>org.argeo.tp.rap.platform</groupId>
+			<artifactId>org.eclipse.rap.fileupload</artifactId>
 		</dependency>
 
 		<!-- TODO: remove Spring dependency -->
@@ -263,6 +300,7 @@
 									<excludeTransitive>true</excludeTransitive>
 									<includeTypes>jar</includeTypes>
 									<includeScope>runtime</includeScope>
+									<useRepositoryLayout>true</useRepositoryLayout>
 								</configuration>
 							</execution>
 							<execution>
@@ -278,6 +316,7 @@
 									<excludeTransitive>true</excludeTransitive>
 									<includeTypes>jar</includeTypes>
 									<includeScope>runtime</includeScope>
+									<useRepositoryLayout>true</useRepositoryLayout>
 								</configuration>
 							</execution>
 						</executions>
@@ -305,11 +344,18 @@
 												<source>
 													<location>${project.build.directory}/lib-argeo</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</require>
@@ -350,7 +396,7 @@
 												<source>
 													<location>${project.build.directory}/lib-tp</location>
 													<includes>
-														<include>*.jar</include>
+														<include>**/*.jar</include>
 													</includes>
 												</source>
 											</sources>