X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dep%2Forg.argeo.slc.dep.backend%2Fpom.xml;h=4f9af22ab5d61cba3ee431804c9f2269421fb206;hb=8d1f46ed8783aa1985fac1acf6ef6ef6cdad1314;hp=6aaa71d47726631b1dca485838db12661bfed793;hpb=3fd2b381d803e52fa88b6ec75dfecd39c7d1b01f;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 6aaa71d47..4f9af22ab 100644
--- a/dep/org.argeo.slc.dep.backend/pom.xml
+++ b/dep/org.argeo.slc.dep.backend/pom.xml
@@ -1,19 +1,24 @@
-<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.slc</groupId>
 		<artifactId>dep</artifactId>
-		<version>0.13.1-SNAPSHOT</version>
+		<version>2.1.2-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
-
-	<groupId>org.argeo.slc.dep</groupId>
 	<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>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<configuration>
+					<instructions>
+						<SLC-ModularDistribution>default</SLC-ModularDistribution>
+					</instructions>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.argeo.maven.plugins</groupId>
 				<artifactId>maven-argeo-osgi-plugin</artifactId>
@@ -25,118 +30,147 @@
 						</goals>
 						<phase>generate-resources</phase>
 					</execution>
-					<execution>
-						<id>check-osgi</id>
-						<phase>test</phase>
-						<goals>
-							<goal>equinox</goal>
-						</goals>
-						<configuration>
-							<onlyCheck>true</onlyCheck>
-							<argsToAppend>
-								<arg>-clean</arg>
-							</argsToAppend>
-						</configuration>
-					</execution>
 				</executions>
 			</plugin>
 		</plugins>
 	</build>
 	<dependencies>
-		<!-- HACK because of dependencies pb with Maven: version 2.4.0 is required 
-			by Spring-LDAP while Apache Directory takes 2.1.0 -->
+		<dependency>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.dep.minimal</artifactId>
+			<version>2.1.2-SNAPSHOT</version>
+		</dependency>
+
+		<!-- SLC Libs -->
 		<!-- <dependency> -->
-		<!-- <groupId>org.apache.commons</groupId> -->
-		<!-- <artifactId>com.springsource.org.apache.commons.lang</artifactId> -->
-		<!-- <version>2.4.0</version> -->
+		<!-- <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> -->
 
-		<!-- SLC Agent -->
+		<!-- Extensions -->
 		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.core</artifactId>
-			<version>0.13.1-SNAPSHOT</version>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.support</artifactId>
+			<version>2.1.2-SNAPSHOT</version>
 		</dependency>
+
+		<!-- SLC Repo -->
 		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.simple</artifactId>
-			<version>0.13.1-SNAPSHOT</version>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.repo</artifactId>
+			<version>2.1.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.ant</artifactId>
-			<version>0.13.1-SNAPSHOT</version>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.factory</artifactId>
+			<version>2.1.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.jcr</artifactId>
-			<version>0.13.1-SNAPSHOT</version>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.server.repo</artifactId>
+			<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.runtime</groupId>
-			<artifactId>org.argeo.slc.support.activemq</artifactId>
-			<version>0.13.1-SNAPSHOT</version>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.client.ui</artifactId>
+			<version>2.1.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.server</artifactId>
-			<version>0.13.1-SNAPSHOT</version>
+			<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.runtime</groupId>
-			<artifactId>org.argeo.slc.support.equinox</artifactId>
-			<version>0.13.1-SNAPSHOT</version>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.client.rap</artifactId>
+			<version>2.1.2-SNAPSHOT</version>
 		</dependency>
 
-		<!-- SLC Agent Modules -->
+		<!-- For target platform generation -->
 		<dependency>
-			<groupId>org.argeo.slc.modules</groupId>
-			<artifactId>org.argeo.slc.agent</artifactId>
-			<version>${version.slc}</version>
+			<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.slc.modules</groupId>
-			<artifactId>org.argeo.slc.agent.jcr</artifactId>
-			<version>${version.slc}</version>
+			<groupId>org.argeo.tp.misc</groupId>
+			<artifactId>biz.aQute.bnd</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.slc.modules</groupId>
-			<artifactId>org.argeo.slc.node.jackrabbit</artifactId>
-			<version>${version.slc}</version>
+			<groupId>org.argeo.tp.misc</groupId>
+			<artifactId>org.junit</artifactId>
 		</dependency>
 
-		<!-- SLC Repo -->
 		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.repo</artifactId>
-			<version>0.13.1-SNAPSHOT</version>
+			<groupId>org.argeo.tp.extras</groupId>
+			<artifactId>net.sf.jxl</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.slc.modules</groupId>
-			<artifactId>org.argeo.slc.server.repo</artifactId>
-			<version>${version.slc}</version>
+			<groupId>org.argeo.tp.extras</groupId>
+			<artifactId>org.postgresql.postgresql</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.slc.modules</groupId>
-			<artifactId>org.argeo.slc.server.repo.webapp</artifactId>
-			<version>${version.slc}</version>
+			<groupId>org.argeo.tp.extras</groupId>
+			<artifactId>org.dbunit</artifactId>
 		</dependency>
-
-		<!-- Launcher -->
 		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.launcher</artifactId>
-			<version>0.13.1-SNAPSHOT</version>
-			<type>tar.gz</type>
-			<classifier>base</classifier>
+			<groupId>org.argeo.tp.extras.eclipse</groupId>
+			<artifactId>org.eclipse.aether.api</artifactId>
 		</dependency>
-
-		<!-- Node -->
 		<dependency>
-			<groupId>org.argeo.commons.security</groupId>
-			<artifactId>org.argeo.security.dep.node</artifactId>
-			<version>${version.argeo-commons}</version>
-			<type>pom</type>
+			<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>
@@ -149,15 +183,33 @@
 						<artifactId>maven-dependency-plugin</artifactId>
 						<executions>
 							<execution>
-								<id>copy-dependencies</id>
-								<phase>process-resources</phase>
+								<id>copy-argeo</id>
+								<phase>package</phase>
 								<goals>
 									<goal>copy-dependencies</goal>
 								</goals>
 								<configuration>
 									<includeTypes>jar</includeTypes>
-									<includeGroupIds>org.argeo.slc.modules,org.argeo.slc.runtime</includeGroupIds>
-									<outputDirectory>${project.build.directory}/slc</outputDirectory>
+									<outputDirectory>${project.build.directory}/lib-argeo</outputDirectory>
+									<includeGroupIds>org.argeo.slc</includeGroupIds>
+									<excludeTransitive>true</excludeTransitive>
+									<includeTypes>jar</includeTypes>
+									<includeScope>runtime</includeScope>
+								</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.slc</excludeGroupIds>
+									<excludeTransitive>true</excludeTransitive>
+									<includeTypes>jar</includeTypes>
+									<includeScope>runtime</includeScope>
 								</configuration>
 							</execution>
 						</executions>
@@ -167,14 +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>
-									<copyright>2011 Argeo</copyright>
+									<name>slc-platform</name>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi</directory>
@@ -184,39 +235,23 @@
 											<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>
 						</executions>
 					</plugin>
-					<plugin>
-						<artifactId>maven-antrun-plugin</artifactId>
-						<executions>
-							<execution>
-								<phase>install</phase>
-								<goals>
-									<goal>run</goal>
-								</goals>
-								<configuration>
-									<target>
-										<copy todir="${rpm.stagingRepository}" verbose="true">
-											<fileset dir="${project.build.directory}/rpm"
-												includes="*/RPMS/**/*.rpm" />
-											<flattenmapper />
-										</copy>
-									</target>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
 				</plugins>
 			</build>
 		</profile>
@@ -235,7 +270,7 @@
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>slc-tp</name>
+									<name>slc-platform-tp</name>
 									<projversion>${version.argeo-distribution}</projversion>
 									<mappings>
 										<mapping>
@@ -244,32 +279,19 @@
 											<groupname>root</groupname>
 											<filemode>644</filemode>
 											<directoryIncluded>false</directoryIncluded>
-											<dependency>
-												<includes>
-													<!-- Core -->
-													<include>org.aspectj:com.springsource.org.aspectj.runtime</include>
-													<include>org.aspectj:com.springsource.org.aspectj.weaver</include>
-													<!-- Simple -->
-													<include>com.jcraft.jsch:com.springsource.com.jcraft.jsch</include>
-													<include>com.opensymphony.quartz:com.springsource.org.quartz</include>
-													<include>org.springframework:org.springframework.context.support</include>
-													<include>javax.mail:com.springsource.javax.mail</include>
-													<include>com.svnkit:com.springsource.org.tmatesoft.svn</include>
-													<include>javax.mail:com.springsource.javax.mail</include>
-													<include>org.argeo.dep.osgi:org.redline_rpm</include>
-													<!-- Ant -->
-													<include>org.apache.ant:com.springsource.org.apache.tools.ant</include>
-													<include>org.apache.ant:com.springsource.org.apache.tools.ant.launch</include>
-													<include>org.apache.oro:com.springsource.org.apache.oro</include>
-													<include>org.apache.bsf:com.springsource.org.apache.bsf</include>
-													<!-- Maven -->
-													<include>org.argeo.dep.osgi:org.argeo.dep.osgi.aether</include>
-													<!-- Misc -->
-													<include>net.sourceforge.jexcelapi:com.springsource.jxl</include>
-												</includes>
-											</dependency>
+											<sources>
+												<source>
+													<location>${project.build.directory}/lib-tp</location>
+													<includes>
+														<include>*.jar</include>
+													</includes>
+												</source>
+											</sources>
 										</mapping>
 									</mappings>
+									<requires>
+										<require>argeo-cms-sdk-tp</require>
+									</requires>
 								</configuration>
 							</execution>
 						</executions>