X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dep%2Forg.argeo.slc.dep.backend%2Fpom.xml;h=9f0a4f05037941d43a52487e5615fe043971899b;hb=d154e9f68017e8c5a8edac15475b2d79aea3e9d4;hp=ca61b9427354550e05124ca424f30cb43cb1d988;hpb=1fe9ba2cbb1fbc9c7808793374d5d4b42cd26688;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 ca61b9427..9f0a4f050 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.11-SNAPSHOT</version>
+		<version>2.1.15-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.slc.dep.backend</artifactId>
@@ -35,11 +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.11-SNAPSHOT</version>
-			<type>pom</type>
+			<version>2.1.15-SNAPSHOT</version>
 		</dependency>
 
 		<!-- SLC Libs -->
@@ -58,24 +63,24 @@
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.support</artifactId>
-			<version>2.1.11-SNAPSHOT</version>
+			<version>2.1.15-SNAPSHOT</version>
 		</dependency>
 
 		<!-- SLC Repo -->
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.repo</artifactId>
-			<version>2.1.11-SNAPSHOT</version>
+			<version>2.1.15-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.factory</artifactId>
-			<version>2.1.11-SNAPSHOT</version>
+			<version>2.1.15-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.server.repo</artifactId>
-			<version>2.1.11-SNAPSHOT</version>
+			<version>2.1.15-SNAPSHOT</version>
 		</dependency>
 		<!-- <dependency> -->
 		<!-- <groupId>org.argeo.slc</groupId> -->
@@ -83,35 +88,28 @@
 		<!-- <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.11-SNAPSHOT</version>
+			<version>2.1.15-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.client.ui.dist</artifactId>
-			<version>2.1.11-SNAPSHOT</version>
+			<version>2.1.15-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.client.rap</artifactId>
-			<version>2.1.11-SNAPSHOT</version>
+			<version>2.1.15-SNAPSHOT</version>
 		</dependency>
 
 		<!-- For target platform generation -->
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.unit</artifactId>
-			<version>2.1.11-SNAPSHOT</version>
+			<version>2.1.15-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
@@ -121,46 +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>
-									<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> -->
+					<!-- <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>
@@ -182,20 +179,20 @@
 											<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/org/argeo/slc/${project.artifactId}/${project.version}</directory>
-											<username>root</username>
-											<groupname>root</groupname>
-											<directoryIncluded>false</directoryIncluded>
-											<artifact />
-										</mapping>
+										<!-- <mapping> -->
+										<!-- <directory>/usr/share/osgi/org/argeo/slc/${project.artifactId}/${project.version}</directory> -->
+										<!-- <username>root</username> -->
+										<!-- <groupname>root</groupname> -->
+										<!-- <directoryIncluded>false</directoryIncluded> -->
+										<!-- <artifact /> -->
+										<!-- </mapping> -->
 									</mappings>
 									<requires>
 										<require>argeo-cms-platform</require>