X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dep%2Forg.argeo.slc.dep.backend%2Fpom.xml;h=4bbe5394d634564ebbcc2fa444ef7f269091ed13;hb=f8a9ca2e0faabe1e0cdcd3537da34e02a0e55f57;hp=17b682ca44832b04771f233b09507ab2147af467;hpb=44ddf883afdae045d4c3360f30d1b116a6fd2c7f;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 17b682ca4..4bbe5394d 100644
--- a/dep/org.argeo.slc.dep.backend/pom.xml
+++ b/dep/org.argeo.slc.dep.backend/pom.xml
@@ -1,45 +1,22 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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.1-SNAPSHOT</version>
+		<version>2.1.17-SNAPSHOT</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.1-SNAPSHOT</version>
+			<artifactId>org.argeo.slc.dep.spring</artifactId>
+			<version>2.1.17-SNAPSHOT</version>
+			<type>pom</type>
 		</dependency>
 
 		<!-- SLC Libs -->
@@ -58,24 +35,24 @@
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.support</artifactId>
-			<version>2.1.1-SNAPSHOT</version>
+			<version>2.1.17-SNAPSHOT</version>
 		</dependency>
 
 		<!-- SLC Repo -->
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.repo</artifactId>
-			<version>2.1.1-SNAPSHOT</version>
+			<version>2.1.17-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.factory</artifactId>
-			<version>2.1.1-SNAPSHOT</version>
+			<version>2.1.17-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.server.repo</artifactId>
-			<version>2.1.1-SNAPSHOT</version>
+			<version>2.1.17-SNAPSHOT</version>
 		</dependency>
 		<!-- <dependency> -->
 		<!-- <groupId>org.argeo.slc</groupId> -->
@@ -83,86 +60,50 @@
 		<!-- <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.1-SNAPSHOT</version>
+			<version>2.1.17-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.client.ui.dist</artifactId>
-			<version>2.1.1-SNAPSHOT</version>
+			<version>2.1.17-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.client.rap</artifactId>
-			<version>2.1.1-SNAPSHOT</version>
+			<version>2.1.17-SNAPSHOT</version>
 		</dependency>
 
-		<!-- For target platform generation -->
+		<!-- Legacy Argeo Commons platform (Eclipse 3) -->
 		<dependency>
-			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.unit</artifactId>
-			<version>2.1.1-SNAPSHOT</version>
-			<scope>test</scope>
+			<groupId>org.argeo.slc.legacy.commons</groupId>
+			<artifactId>org.argeo.dep.cms.platform</artifactId>
+			<version>${version.argeo-commons-legacy}</version>
+			<type>pom</type>
 		</dependency>
 
-		<!-- Thrid parties (extras) -->
-		<dependency>
-			<groupId>org.argeo.tp.extras</groupId>
-			<artifactId>net.sf.jxl</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.extras</groupId>
-			<artifactId>org.postgresql.postgresql</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.extras</groupId>
-			<artifactId>org.dbunit</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp.extras.eclipse</groupId>
-			<artifactId>org.eclipse.aether.api</artifactId>
-		</dependency>
-		<dependency>
-			<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>
+			<groupId>org.argeo.tp.sdk</groupId>
+			<artifactId>biz.aQute.bndlib</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.extras.eclipse</groupId>
-			<artifactId>org.eclipse.aether.connector.basic</artifactId>
+			<groupId>org.argeo.tp.sdk</groupId>
+			<artifactId>org.junit</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>
+			<groupId>org.argeo.tp.sdk</groupId>
+			<artifactId>org.redline-rpm</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.extras</groupId>
-			<artifactId>org.redline-rpm</artifactId>
+			<groupId>org.argeo.tp.misc</groupId>
+			<artifactId>com.googlecode.javaewah.JavaEWAH</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.tp.extras</groupId>
-			<artifactId>org.tmatesoft.svnkit</artifactId>
+			<groupId>org.argeo.tp.misc</groupId>
+			<artifactId>org.eclipse.jgit</artifactId>
 		</dependency>
 	</dependencies>
 	<profiles>
@@ -171,37 +112,18 @@
 			<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>
-								<phase>package</phase>
-								<goals>
-									<goal>copy-dependencies</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>
-								</configuration>
-							</execution>
-							<execution>
-								<id>copy-tp</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-tp</outputDirectory>
-									<excludeGroupIds>org.argeo.slc</excludeGroupIds>
-									<excludeTransitive>true</excludeTransitive>
-									<includeTypes>jar</includeTypes>
-									<includeScope>runtime</includeScope>
+									<descriptorRefs>
+										<descriptorRef>a2-source</descriptorRef>
+									</descriptorRefs>
 								</configuration>
 							</execution>
 						</executions>
@@ -224,12 +146,12 @@
 											<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>
+														<include>**/*.jar</include>
 													</includes>
 												</source>
 											</sources>
@@ -237,52 +159,8 @@
 									</mappings>
 									<requires>
 										<require>argeo-cms-platform</require>
-										<require>slc-agent</require>
-										<require>slc-platform-tp</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-platform-tp</name>
-									<projversion>${version.argeo-distribution}</projversion>
-									<mappings>
-										<mapping>
-											<directory>/usr/share/osgi</directory>
-											<username>root</username>
-											<groupname>root</groupname>
-											<filemode>644</filemode>
-											<directoryIncluded>false</directoryIncluded>
-											<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>
+										<require>slc-spring</require>
 									</requires>
 								</configuration>
 							</execution>