X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dep%2Forg.argeo.slc.dep.backend%2Fpom.xml;h=99c667298124c46d24c059c28ff1224e6d31ddd1;hb=13e17c6a6305cc0b6979ac94e68ba85a2fd7ae52;hp=1c69af5c20efa1b14c87db625ba1ba2c736d44f7;hpb=70901ba1327db41638c771fe923ecd947bd685d0;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 1c69af5c2..99c667298 100644
--- a/dep/org.argeo.slc.dep.backend/pom.xml
+++ b/dep/org.argeo.slc.dep.backend/pom.xml
@@ -1,45 +1,20 @@
-<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>2.1.5-SNAPSHOT</version>
+		<version>2.1.17</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.slc.dep.backend</artifactId>
 	<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>
-				<executions>
-					<execution>
-						<id>generate-descriptors</id>
-						<goals>
-							<goal>descriptors</goal>
-						</goals>
-						<phase>generate-resources</phase>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
 	<dependencies>
+		<!-- SLC Minimal -->
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.dep.minimal</artifactId>
-			<version>2.1.5-SNAPSHOT</version>
+			<artifactId>org.argeo.slc.dep.spring</artifactId>
+			<version>2.1.17</version>
+			<type>pom</type>
 		</dependency>
 
 		<!-- SLC Libs -->
@@ -58,24 +33,24 @@
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.support</artifactId>
-			<version>2.1.5-SNAPSHOT</version>
+			<version>2.1.17</version>
 		</dependency>
 
 		<!-- SLC Repo -->
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.repo</artifactId>
-			<version>2.1.5-SNAPSHOT</version>
+			<version>2.1.17</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.factory</artifactId>
-			<version>2.1.5-SNAPSHOT</version>
+			<version>2.1.17</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.server.repo</artifactId>
-			<version>2.1.5-SNAPSHOT</version>
+			<version>2.1.17</version>
 		</dependency>
 		<!-- <dependency> -->
 		<!-- <groupId>org.argeo.slc</groupId> -->
@@ -83,37 +58,60 @@
 		<!-- <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.client.ui</artifactId>
-			<version>2.1.5-SNAPSHOT</version>
+			<version>2.1.17</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.client.ui.dist</artifactId>
-			<version>2.1.5-SNAPSHOT</version>
+			<version>2.1.17</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.client.rap</artifactId>
-			<version>2.1.5-SNAPSHOT</version>
+			<version>2.1.17</version>
 		</dependency>
 
-		<!-- For target platform generation -->
+		<!-- OSGi Boot for platform generation only, as it could be used by regular 
+			Java applications to launch an OSGi runtime. -->
 		<dependency>
-			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.unit</artifactId>
-			<version>2.1.5-SNAPSHOT</version>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.osgi.boot</artifactId>
+			<version>${version.argeo-commons}</version>
 			<scope>test</scope>
 		</dependency>
+
+		<!-- Legacy Argeo Commons platform (Eclipse 3) -->
+		<dependency>
+			<groupId>org.argeo.slc.legacy.commons</groupId>
+			<artifactId>org.argeo.dep.cms.platform</artifactId>
+			<version>${version.argeo-commons-legacy}</version>
+			<type>pom</type>
+		</dependency>
+
+		<dependency>
+			<groupId>org.argeo.tp.sdk</groupId>
+			<artifactId>biz.aQute.bndlib</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.sdk</groupId>
+			<artifactId>org.junit</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.sdk</groupId>
+			<artifactId>org.redline-rpm</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.misc</groupId>
+			<artifactId>com.googlecode.javaewah.JavaEWAH</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.misc</groupId>
+			<artifactId>org.eclipse.jgit</artifactId>
+		</dependency>
 	</dependencies>
 	<profiles>
 		<profile>
@@ -121,44 +119,20 @@
 			<build>
 				<plugins>
 					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-dependency-plugin</artifactId>
+						<artifactId>maven-assembly-plugin</artifactId>
 						<executions>
 							<execution>
-								<id>copy-argeo</id>
+								<id>prepare-source</id>
 								<phase>package</phase>
 								<goals>
-									<goal>copy-dependencies</goal>
+									<goal>single</goal>
 								</goals>
 								<configuration>
-									<includeTypes>jar</includeTypes>
-									<outputDirectory>${project.build.directory}/lib-argeo</outputDirectory>
-									<includeGroupIds>org.argeo.slc</includeGroupIds>
-									<excludeTransitive>true</excludeTransitive>
-									<includeTypes>jar</includeTypes>
-									<includeScope>runtime</includeScope>
-									<useRepositoryLayout>true</useRepositoryLayout>
+									<descriptorRefs>
+										<descriptorRef>a2-source</descriptorRef>
+									</descriptorRefs>
 								</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>
@@ -179,28 +153,21 @@
 											<username>root</username>
 											<groupname>root</groupname>
 											<filemode>644</filemode>
-											<directoryIncluded>false</directoryIncluded>
+											<directoryIncluded>true</directoryIncluded>
 											<sources>
 												<source>
-													<location>${project.build.directory}/lib-argeo</location>
+													<location>${project.build.directory}/${project.artifactId}-${project.version}-a2-source</location>
 													<includes>
 														<include>**/*.jar</include>
 													</includes>
 												</source>
 											</sources>
 										</mapping>
-										<!-- <mapping> -->
-										<!-- <directory>/usr/share/osgi</directory> -->
-										<!-- <username>root</username> -->
-										<!-- <groupname>root</groupname> -->
-										<!-- <filemode>644</filemode> -->
-										<!-- <artifact /> -->
-										<!-- </mapping> -->
 									</mappings>
 									<requires>
 										<require>argeo-cms-platform</require>
-										<require>slc-agent</require>
-										<require>slc-platform-tp</require>
+										<require>argeo-cms-sdk-tp</require>
+										<require>slc-spring</require>
 									</requires>
 								</configuration>
 							</execution>