X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dep%2Forg.argeo.slc.dep.backend%2Fpom.xml;h=f70f0eb5ec186d88c07542dddbd139a4f936e168;hb=1992ef2527da82aa17914e575ec5fbaf55e0e0f8;hp=c4455ac8f72e991bac581bf7eb67089da38c16bd;hpb=bb08577c319311cd68bf67abb3c041552bb536b4;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 c4455ac8f..f70f0eb5e 100644
--- a/dep/org.argeo.slc.dep.backend/pom.xml
+++ b/dep/org.argeo.slc.dep.backend/pom.xml
@@ -3,16 +3,23 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>dep</artifactId>
-		<version>0.13.2-SNAPSHOT</version>
+		<version>1.1.19-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>
 	<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>
@@ -24,110 +31,63 @@
 						</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 -->
+		<!-- Base -->
 		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.core</artifactId>
-			<version>0.13.2-SNAPSHOT</version>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.dep.minimal</artifactId>
+			<version>1.1.19-SNAPSHOT</version>
+			<type>pom</type>
 		</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>
+			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.support.simple</artifactId>
-			<version>0.13.2-SNAPSHOT</version>
+			<version>1.1.19-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
+			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.support.ant</artifactId>
-			<version>0.13.2-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.jcr</artifactId>
-			<version>0.13.2-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.activemq</artifactId>
-			<version>0.13.2-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.server</artifactId>
-			<version>0.13.2-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.equinox</artifactId>
-			<version>0.13.2-SNAPSHOT</version>
-		</dependency>
-
-		<!-- SLC Agent Modules -->
-		<dependency>
-			<groupId>org.argeo.slc.modules</groupId>
-			<artifactId>org.argeo.slc.agent</artifactId>
-			<version>0.13.2-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.modules</groupId>
-			<artifactId>org.argeo.slc.agent.jcr</artifactId>
-			<version>0.13.2-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.modules</groupId>
-			<artifactId>org.argeo.slc.node.jackrabbit</artifactId>
-			<version>0.13.2-SNAPSHOT</version>
+			<version>1.1.19-SNAPSHOT</version>
 		</dependency>
 
 		<!-- SLC Repo -->
 		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
+			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.repo</artifactId>
-			<version>0.13.2-SNAPSHOT</version>
+			<version>1.1.19-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.slc.modules</groupId>
-			<artifactId>org.argeo.slc.server.repo</artifactId>
-			<version>0.13.2-SNAPSHOT</version>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.rpmfactory</artifactId>
+			<version>1.1.19-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.slc.modules</groupId>
-			<artifactId>org.argeo.slc.server.repo.webapp</artifactId>
-			<version>0.13.2-SNAPSHOT</version>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.server.repo</artifactId>
+			<version>1.1.19-SNAPSHOT</version>
 		</dependency>
-
-		<!-- Launcher -->
 		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.launcher</artifactId>
-			<version>0.13.2-SNAPSHOT</version>
-			<type>tar.gz</type>
-			<classifier>base</classifier>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.server.repo.webapp</artifactId>
+			<version>1.1.19-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Node -->
@@ -136,9 +96,40 @@
 			<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>
 		</dependency>
 	</dependencies>
 	<profiles>
+		<profile>
+			<id>check-osgi</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.argeo.maven.plugins</groupId>
+						<artifactId>maven-argeo-osgi-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>check-osgi</id>
+								<phase>test</phase>
+								<goals>
+									<goal>equinox</goal>
+								</goals>
+								<configuration>
+									<onlyCheck>true</onlyCheck>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 		<profile>
 			<id>rpmbuild</id>
 			<build>
@@ -155,7 +146,7 @@
 								</goals>
 								<configuration>
 									<includeTypes>jar</includeTypes>
-									<includeGroupIds>org.argeo.slc.modules,org.argeo.slc.runtime</includeGroupIds>
+									<includeGroupIds>org.argeo.slc</includeGroupIds>
 									<outputDirectory>${project.build.directory}/slc</outputDirectory>
 								</configuration>
 							</execution>
@@ -173,7 +164,6 @@
 								</goals>
 								<configuration>
 									<name>slc-libs</name>
-									<copyright>2011 Argeo</copyright>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi</directory>
@@ -226,25 +216,21 @@
 											<dependency>
 												<includes>
 													<!-- Core -->
-													<include>org.aspectj:com.springsource.org.aspectj.runtime</include>
-													<include>org.aspectj:com.springsource.org.aspectj.weaver</include>
+													<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>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>
+													<include>org.argeo.tp:org.tmatesoft.svn</include>
+													<include>org.argeo.tp: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>
+													<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.dep.osgi:org.argeo.dep.osgi.aether</include>
+													<include>org.argeo.tp:org.sonatype.aether</include>
 													<!-- Misc -->
-													<include>net.sourceforge.jexcelapi:com.springsource.jxl</include>
+													<include>org.argeo.tp:biz.aQute.bndlib</include>
 												</includes>
 											</dependency>
 										</mapping>