X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dep%2Forg.argeo.slc.dep.backend%2Fpom.xml;h=810327ce2672b35574132ec4ca61cc2bccb1b753;hb=8c4c36fee41edde192cad185f3f7850163207490;hp=7ee68d4f0fad34f7f71b9693e558ff573d27a4ad;hpb=b591523813c012e8901f51d50b5154909c6aa525;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 7ee68d4f0..810327ce2 100644
--- a/dep/org.argeo.slc.dep.backend/pom.xml
+++ b/dep/org.argeo.slc.dep.backend/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>dep</artifactId>
-		<version>2.1.4-SNAPSHOT</version>
+		<version>2.1.14-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.slc.dep.backend</artifactId>
@@ -35,10 +35,16 @@
 		</plugins>
 	</build>
 	<dependencies>
+		<!-- Parent dependencies -->
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.dep.cms.sdk</artifactId>
+			<version>${version.argeo-commons}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.dep.minimal</artifactId>
-			<version>2.1.4-SNAPSHOT</version>
+			<version>2.1.14-SNAPSHOT</version>
 		</dependency>
 
 		<!-- SLC Libs -->
@@ -57,24 +63,24 @@
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.support</artifactId>
-			<version>2.1.4-SNAPSHOT</version>
+			<version>2.1.14-SNAPSHOT</version>
 		</dependency>
 
 		<!-- SLC Repo -->
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.repo</artifactId>
-			<version>2.1.4-SNAPSHOT</version>
+			<version>2.1.14-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.factory</artifactId>
-			<version>2.1.4-SNAPSHOT</version>
+			<version>2.1.14-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.server.repo</artifactId>
-			<version>2.1.4-SNAPSHOT</version>
+			<version>2.1.14-SNAPSHOT</version>
 		</dependency>
 		<!-- <dependency> -->
 		<!-- <groupId>org.argeo.slc</groupId> -->
@@ -82,96 +88,30 @@
 		<!-- <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.4-SNAPSHOT</version>
+			<version>2.1.14-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.client.ui.dist</artifactId>
-			<version>2.1.4-SNAPSHOT</version>
+			<version>2.1.14-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.client.rap</artifactId>
-			<version>2.1.4-SNAPSHOT</version>
+			<version>2.1.14-SNAPSHOT</version>
 		</dependency>
 
 		<!-- For target platform generation -->
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.unit</artifactId>
-			<version>2.1.4-SNAPSHOT</version>
+			<version>2.1.14-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
-
-		<!-- Third parties (extras) -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.misc</groupId> -->
-<!-- 			<artifactId>biz.aQute.bnd</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.misc</groupId> -->
-<!-- 			<artifactId>org.junit</artifactId> -->
-<!-- 		</dependency> -->
-
-<!-- 		<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> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.extras.eclipse</groupId> -->
-<!-- 			<artifactId>org.eclipse.aether.connector.basic</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> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.extras</groupId> -->
-<!-- 			<artifactId>org.redline-rpm</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.extras</groupId> -->
-<!-- 			<artifactId>org.tmatesoft.svnkit</artifactId> -->
-<!-- 		</dependency> -->
 	</dependencies>
 	<profiles>
 		<profile>
@@ -179,41 +119,45 @@
 			<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>
-								</configuration>
-							</execution>
-							<execution>
-								<id>copy-tp</id>
-								<phase>package</phase>
-								<goals>
-									<goal>copy-dependencies</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>
 					</plugin>
+<!-- 					<plugin> -->
+<!-- 						<groupId>org.apache.maven.plugins</groupId> -->
+<!-- 						<artifactId>maven-dependency-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> -->
+<!-- 									<excludeArtifactIds>org.argeo.slc.dep.minimal</excludeArtifactIds> -->
+<!-- 									<includeTypes>jar</includeTypes> -->
+<!-- 									<includeScope>runtime</includeScope> -->
+<!-- 									<useRepositoryLayout>true</useRepositoryLayout> -->
+<!-- 								</configuration> -->
+<!-- 							</execution> -->
+<!-- 						</executions> -->
+<!-- 					</plugin> -->
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>rpm-maven-plugin</artifactId>
@@ -232,65 +176,28 @@
 											<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>
 										</mapping>
-									</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>
+											<directory>/usr/share/osgi/org/argeo/slc/${project.artifactId}/${project.version}</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>
+											<artifact />
 										</mapping>
 									</mappings>
 									<requires>
+										<require>argeo-cms-platform</require>
 										<require>argeo-cms-sdk-tp</require>
+										<require>slc-agent</require>
 									</requires>
 								</configuration>
 							</execution>