X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dep%2Forg.argeo.slc.dep.backend%2Fpom.xml;h=aa6a97cda12144e710c97d1d8cfb363c7b2d44c7;hb=340acb39c58f98f025ed86c776a088d38cd1b0ac;hp=3c46f14cd57b00bccb5853c59a1c0315c551f2ad;hpb=725f4e6f317abd989a2bad63403745a5c47d6067;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 3c46f14cd..abcdf4057 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.12</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,87 @@
 						</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.apache.commons</groupId> -->
-		<!-- <artifactId>com.springsource.org.apache.commons.lang</artifactId> -->
-		<!-- <version>2.4.0</version> -->
-		<!-- </dependency> -->
-
-		<!-- SLC Agent -->
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.core</artifactId>
-			<version>0.13.1-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.simple</artifactId>
-			<version>0.13.1-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.ant</artifactId>
-			<version>0.13.1-SNAPSHOT</version>
-		</dependency>
+		<!-- Parent dependencies -->
 		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.jcr</artifactId>
-			<version>0.13.1-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.activemq</artifactId>
-			<version>0.13.1-SNAPSHOT</version>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.dep.cms.sdk</artifactId>
+			<version>${version.argeo-commons}</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.dep.minimal</artifactId>
+			<version>2.1.12</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> -->
+
+		<!-- Extensions -->
 		<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.support</artifactId>
+			<version>2.1.12</version>
 		</dependency>
 
-		<!-- SLC Agent Modules -->
+		<!-- SLC Repo -->
 		<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.repo</artifactId>
+			<version>2.1.12</version>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.slc.modules</groupId>
-			<artifactId>org.argeo.slc.agent.jcr</artifactId>
-			<version>${version.slc}</version>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.factory</artifactId>
+			<version>2.1.12</version>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.slc.modules</groupId>
-			<artifactId>org.argeo.slc.node.jackrabbit</artifactId>
-			<version>${version.slc}</version>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.server.repo</artifactId>
+			<version>2.1.12</version>
 		</dependency>
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.slc</groupId> -->
+		<!-- <artifactId>org.argeo.slc.server.repo.webapp</artifactId> -->
+		<!-- <version>2.1.1-SNAPSHOT</version> -->
+		<!-- </dependency> -->
 
-		<!-- SLC Repo -->
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.repo</artifactId>
-			<version>0.13.1-SNAPSHOT</version>
-		</dependency>
+		<!-- UI -->
 		<dependency>
-			<groupId>org.argeo.slc.modules</groupId>
-			<artifactId>org.argeo.slc.server.repo</artifactId>
-			<version>${version.slc}</version>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.client.ui</artifactId>
+			<version>2.1.12</version>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.slc.modules</groupId>
-			<artifactId>org.argeo.slc.server.repo.webapp</artifactId>
-			<version>${version.slc}</version>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.client.ui.dist</artifactId>
+			<version>2.1.12</version>
 		</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.slc</groupId>
+			<artifactId>org.argeo.slc.client.rap</artifactId>
+			<version>2.1.12</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>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.unit</artifactId>
+			<version>2.1.12</version>
+			<scope>test</scope>
 		</dependency>
 	</dependencies>
 	<profiles>
@@ -149,17 +123,41 @@
 						<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>
+									<excludeArtifactIds>org.argeo.slc.dep.minimal</excludeArtifactIds>
+									<includeTypes>jar</includeTypes>
+									<includeScope>runtime</includeScope>
+									<useRepositoryLayout>true</useRepositoryLayout>
 								</configuration>
 							</execution>
+<!-- 							<execution> -->
+<!-- 								<id>copy-argeo-self</id> -->
+<!-- 								<phase>package</phase> -->
+<!-- 								<goals> -->
+<!-- 									<goal>copy</goal> -->
+<!-- 								</goals> -->
+<!-- 								<configuration> -->
+<!-- 									<outputDirectory>${project.build.directory}/lib-argeo</outputDirectory> -->
+<!-- 									<useRepositoryLayout>true</useRepositoryLayout> -->
+<!-- 									<artifactItems> -->
+<!-- 										<artifactItem> -->
+<!-- 											<groupId>${project.groupId}</groupId> -->
+<!-- 											<artifactId>${project.artifactId}</artifactId> -->
+<!-- 											<version>${project.version}</version> -->
+<!-- 											<outputDirectory>${project.build.directory}/lib-argeo</outputDirectory> -->
+<!-- 										</artifactItem> -->
+<!-- 									</artifactItems> -->
+<!-- 								</configuration> -->
+<!-- 							</execution> -->
 						</executions>
 					</plugin>
 					<plugin>
@@ -167,91 +165,41 @@
 						<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>
 											<username>root</username>
 											<groupname>root</groupname>
 											<filemode>644</filemode>
-											<directoryIncluded>false</directoryIncluded>
+											<directoryIncluded>true</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>
-									</requires>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-		<profile>
-			<id>rpmbuild-tp</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>rpm-maven-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>rpm-tp</id>
-								<phase>package</phase>
-								<goals>
-									<goal>rpm</goal>
-								</goals>
-								<configuration>
-									<name>slc-tp</name>
-									<projversion>${version.argeo-distribution}</projversion>
-									<mappings>
 										<mapping>
-											<directory>/usr/share/osgi</directory>
+											<directory>/usr/share/osgi/org/argeo/slc/${project.artifactId}/${project.version}</directory>
 											<username>root</username>
 											<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>
+											<artifact />
 										</mapping>
 									</mappings>
 									<requires>
-										<require>argeo-node-tp</require>
+										<require>argeo-cms-platform</require>
+										<require>argeo-cms-sdk-tp</require>
+										<require>slc-agent</require>
 									</requires>
 								</configuration>
 							</execution>