X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dep%2Forg.argeo.slc.dep.backend%2Fpom.xml;h=4f9af22ab5d61cba3ee431804c9f2269421fb206;hb=8d1f46ed8783aa1985fac1acf6ef6ef6cdad1314;hp=e1b960d47b828eecebd79372561a037320f9f67e;hpb=48d2f99304ea02eaeb5772521a1a77687023af75;p=gpl%2Fargeo-slc.git

diff --git a/dep/org.argeo.slc.dep.backend/pom.xml b/dep/org.argeo.slc.dep.backend/pom.xml
index e1b960d47..4f9af22ab 100644
--- a/dep/org.argeo.slc.dep.backend/pom.xml
+++ b/dep/org.argeo.slc.dep.backend/pom.xml
@@ -3,12 +3,11 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>dep</artifactId>
-		<version>1.1.15</version>
+		<version>2.1.2-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.slc.dep.backend</artifactId>
-	<name>SLC Backend Dependencies</name>
-	<description>Shared by RAP and pure server</description>
+	<name>SLC Backend</name>
 	<build>
 		<plugins>
 			<plugin>
@@ -36,118 +35,181 @@
 		</plugins>
 	</build>
 	<dependencies>
-		<!-- Base -->
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.dep.minimal</artifactId>
-			<version>1.1.15</version>
-			<type>pom</type>
+			<version>2.1.2-SNAPSHOT</version>
 		</dependency>
 
 		<!-- SLC Libs -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.slc</groupId> -->
-<!-- 			<artifactId>org.argeo.slc.lib.repo</artifactId> -->
-<!-- 			<version>1.1.14-SNAPSHOT</version> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.slc</groupId> -->
-<!-- 			<artifactId>org.argeo.slc.lib.jcr</artifactId> -->
-<!-- 			<version>1.1.14-SNAPSHOT</version> -->
-<!-- 		</dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.slc</groupId> -->
+		<!-- <artifactId>org.argeo.slc.lib.repo</artifactId> -->
+		<!-- <version>1.1.14-SNAPSHOT</version> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.slc</groupId> -->
+		<!-- <artifactId>org.argeo.slc.lib.jcr</artifactId> -->
+		<!-- <version>1.1.14-SNAPSHOT</version> -->
+		<!-- </dependency> -->
 
 		<!-- Extensions -->
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.support.simple</artifactId>
-			<version>1.1.15</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.support.ant</artifactId>
-			<version>1.1.15</version>
+			<artifactId>org.argeo.slc.support</artifactId>
+			<version>2.1.2-SNAPSHOT</version>
 		</dependency>
 
 		<!-- SLC Repo -->
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.repo</artifactId>
-			<version>1.1.15</version>
+			<version>2.1.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.rpmfactory</artifactId>
-			<version>1.1.15</version>
+			<artifactId>org.argeo.slc.factory</artifactId>
+			<version>2.1.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.server.repo</artifactId>
-			<version>1.1.15</version>
+			<version>2.1.2-SNAPSHOT</version>
+		</dependency>
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.slc</groupId> -->
+		<!-- <artifactId>org.argeo.slc.server.repo.webapp</artifactId> -->
+		<!-- <version>2.1.1-SNAPSHOT</version> -->
+		<!-- </dependency> -->
+
+		<!-- Node -->
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.dep.cms.sdk</artifactId>
+			<version>${version.argeo-commons}</version>
 		</dependency>
+
+		<!-- UI -->
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.server.repo.webapp</artifactId>
-			<version>1.1.15</version>
+			<artifactId>org.argeo.slc.client.ui</artifactId>
+			<version>2.1.2-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.client.ui.dist</artifactId>
+			<version>2.1.2-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.client.rap</artifactId>
+			<version>2.1.2-SNAPSHOT</version>
 		</dependency>
 
-		<!-- Node -->
+		<!-- For target platform generation -->
 		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.dep.node</artifactId>
-			<version>${version.argeo-commons}</version>
-			<type>pom</type>
-			<exclusions>
-				<exclusion>
-					<!-- Workaround for bug where catalina start add non slf4j logging to 
-						dependencies -->
-					<groupId>org.argeo.tp</groupId>
-					<artifactId>org.apache.commons.logging</artifactId>
-				</exclusion>
-			</exclusions>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.unit</artifactId>
+			<version>2.1.2-SNAPSHOT</version>
+			<scope>test</scope>
+		</dependency>
+
+		<!-- Third parties (extras) -->
+		<dependency>
+			<groupId>org.argeo.tp.misc</groupId>
+			<artifactId>biz.aQute.bnd</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.misc</groupId>
+			<artifactId>org.junit</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.argeo.tp.extras</groupId>
+			<artifactId>net.sf.jxl</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.extras</groupId>
+			<artifactId>org.postgresql.postgresql</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.extras</groupId>
+			<artifactId>org.dbunit</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.extras.eclipse</groupId>
+			<artifactId>org.eclipse.aether.api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.extras.eclipse</groupId>
+			<artifactId>org.eclipse.aether.spi</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.extras.eclipse</groupId>
+			<artifactId>org.eclipse.aether.util</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.extras.eclipse</groupId>
+			<artifactId>org.eclipse.aether.impl</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.extras.eclipse</groupId>
+			<artifactId>org.eclipse.aether.connector.basic</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.extras.eclipse</groupId>
+			<artifactId>org.eclipse.aether.transport.classpath</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.extras.eclipse</groupId>
+			<artifactId>org.eclipse.aether.transport.file</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.extras</groupId>
+			<artifactId>org.redline-rpm</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.extras</groupId>
+			<artifactId>org.tmatesoft.svnkit</artifactId>
 		</dependency>
 	</dependencies>
 	<profiles>
 		<profile>
-			<id>check-osgi</id>
+			<id>rpmbuild</id>
 			<build>
 				<plugins>
 					<plugin>
-						<groupId>org.argeo.maven.plugins</groupId>
-						<artifactId>maven-argeo-osgi-plugin</artifactId>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-dependency-plugin</artifactId>
 						<executions>
 							<execution>
-								<id>check-osgi</id>
-								<phase>test</phase>
+								<id>copy-argeo</id>
+								<phase>package</phase>
 								<goals>
-									<goal>equinox</goal>
+									<goal>copy-dependencies</goal>
 								</goals>
 								<configuration>
-									<onlyCheck>true</onlyCheck>
+									<includeTypes>jar</includeTypes>
+									<outputDirectory>${project.build.directory}/lib-argeo</outputDirectory>
+									<includeGroupIds>org.argeo.slc</includeGroupIds>
+									<excludeTransitive>true</excludeTransitive>
+									<includeTypes>jar</includeTypes>
+									<includeScope>runtime</includeScope>
 								</configuration>
 							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-		<profile>
-			<id>rpmbuild</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-dependency-plugin</artifactId>
-						<executions>
 							<execution>
-								<id>copy-dependencies</id>
-								<phase>process-resources</phase>
+								<id>copy-tp</id>
+								<phase>package</phase>
 								<goals>
 									<goal>copy-dependencies</goal>
 								</goals>
 								<configuration>
 									<includeTypes>jar</includeTypes>
-									<includeGroupIds>org.argeo.slc</includeGroupIds>
-									<outputDirectory>${project.build.directory}/slc</outputDirectory>
+									<outputDirectory>${project.build.directory}/lib-tp</outputDirectory>
+									<excludeGroupIds>org.argeo.slc</excludeGroupIds>
+									<excludeTransitive>true</excludeTransitive>
+									<includeTypes>jar</includeTypes>
+									<includeScope>runtime</includeScope>
 								</configuration>
 							</execution>
 						</executions>
@@ -157,13 +219,13 @@
 						<artifactId>rpm-maven-plugin</artifactId>
 						<executions>
 							<execution>
-								<id>rpm-slc</id>
+								<id>rpm-argeo</id>
 								<phase>package</phase>
 								<goals>
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>slc-libs</name>
+									<name>slc-platform</name>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi</directory>
@@ -173,14 +235,18 @@
 											<directoryIncluded>false</directoryIncluded>
 											<sources>
 												<source>
-													<location>${project.build.directory}/slc</location>
+													<location>${project.build.directory}/lib-argeo</location>
+													<includes>
+														<include>*.jar</include>
+													</includes>
 												</source>
 											</sources>
 										</mapping>
 									</mappings>
 									<requires>
-										<require>slc-tp</require>
-										<require>argeo-node</require>
+										<require>argeo-cms-platform</require>
+										<require>slc-agent</require>
+										<require>slc-platform-tp</require>
 									</requires>
 								</configuration>
 							</execution>
@@ -204,7 +270,7 @@
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>slc-tp</name>
+									<name>slc-platform-tp</name>
 									<projversion>${version.argeo-distribution}</projversion>
 									<mappings>
 										<mapping>
@@ -213,30 +279,18 @@
 											<groupname>root</groupname>
 											<filemode>644</filemode>
 											<directoryIncluded>false</directoryIncluded>
-											<dependency>
-												<includes>
-													<!-- Core -->
-													<include>org.argeo.tp:org.aspectj.runtime</include>
-													<include>org.argeo.tp:org.aspectj.weaver</include>
-													<include>org.argeo.tp:net.sf.cglib</include>
-													<!-- Simple -->
-													<include>org.argeo.tp:org.tmatesoft.svn</include>
-													<include>org.argeo.tp:org.redline_rpm</include>
-													<!-- Ant -->
-													<include>org.argeo.tp:org.apache.tools.ant</include>
-													<include>org.argeo.tp:org.apache.tools.ant.launch</include>
-													<include>org.argeo.tp:org.apache.oro</include>
-													<include>org.argeo.tp:org.apache.bsf</include>
-													<!-- Maven -->
-													<include>org.argeo.tp:org.sonatype.aether</include>
-													<!-- Misc -->
-													<include>org.argeo.tp:biz.aQute.bndlib</include>
-												</includes>
-											</dependency>
+											<sources>
+												<source>
+													<location>${project.build.directory}/lib-tp</location>
+													<includes>
+														<include>*.jar</include>
+													</includes>
+												</source>
+											</sources>
 										</mapping>
 									</mappings>
 									<requires>
-										<require>argeo-node-tp</require>
+										<require>argeo-cms-sdk-tp</require>
 									</requires>
 								</configuration>
 							</execution>