X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=dep%2Forg.argeo.slc.dep.backend%2Fpom.xml;h=9dbefd0f3993e6bf8644de7aaa058bad4d383c8a;hb=6bbf10f4c4ffa33a0a906d26e5ed4dd5019969b7;hp=aa6a97cda12144e710c97d1d8cfb363c7b2d44c7;hpb=3391c32e608ab495bf101d5e0a9066a6232e3a19;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 aa6a97cda..9dbefd0f3 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>1.1.1</version>
+		<version>1.1.6-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>
@@ -31,80 +38,70 @@
 	<dependencies>
 		<!-- SLC Agent -->
 		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
+			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.core</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
+			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.support.simple</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
+			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.support.ant</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
+			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.support.jcr</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.activemq</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.server</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
+			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.support.equinox</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.6-SNAPSHOT</version>
 		</dependency>
 
 		<!-- SLC Agent Modules -->
 		<dependency>
-			<groupId>org.argeo.slc.modules</groupId>
+			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.agent</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.slc.modules</groupId>
+			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.agent.jcr</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.slc.modules</groupId>
+			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.node.jackrabbit</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.6-SNAPSHOT</version>
 		</dependency>
 
 		<!-- SLC Repo -->
 		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
+			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.repo</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.slc.modules</groupId>
+			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.server.repo</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.slc.modules</groupId>
+			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.server.repo.webapp</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.6-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Launcher -->
 		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
+			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.launcher</artifactId>
-			<version>1.1.1</version>
+			<version>1.1.6-SNAPSHOT</version>
 			<type>tar.gz</type>
 			<classifier>base</classifier>
 		</dependency>
@@ -157,7 +154,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>
@@ -175,7 +172,6 @@
 								</goals>
 								<configuration>
 									<name>slc-libs</name>
-									<copyright>2011 Argeo</copyright>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi</directory>
@@ -246,6 +242,7 @@
 													<include>org.argeo.tp:org.sonatype.aether</include>
 													<!-- Misc -->
 													<include>org.argeo.tp:jxl</include>
+													<include>org.argeo.tp:biz.aQute.bndlib</include>
 												</includes>
 											</dependency>
 										</mapping>