X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dep%2Forg.argeo.slc.dep.minimal%2Fpom.xml;h=c1ab9d88e3e08979389868e4a9b6db0dc135ca61;hb=aba0f1135009d9014c42368ecea338088e6d2be1;hp=449c6f8f2d83e477161fd3174ef361857f5824a5;hpb=9dfce8483418e7c5c9c0a76a4c790a1f8ab1a500;p=gpl%2Fargeo-slc.git

diff --git a/dep/org.argeo.slc.dep.minimal/pom.xml b/dep/org.argeo.slc.dep.minimal/pom.xml
index 449c6f8f2..c1ab9d88e 100644
--- a/dep/org.argeo.slc.dep.minimal/pom.xml
+++ b/dep/org.argeo.slc.dep.minimal/pom.xml
@@ -1,75 +1,39 @@
-<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.13</version>
+		<version>2.1.17-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.slc.dep.minimal</artifactId>
 	<name>SLC Agent</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>
-<!-- 			<plugin> -->
-<!-- 				<groupId>org.apache.maven.plugins</groupId> -->
-<!-- 				<artifactId>maven-dependency-plugin</artifactId> -->
-<!-- 				<executions> -->
-<!-- 					<execution> -->
-<!-- 						<id>copy-dependencies</id> -->
-<!-- 						<phase>package</phase> -->
-<!-- 						<goals> -->
-<!-- 							<goal>copy-dependencies</goal> -->
-<!-- 						</goals> -->
-<!-- 					</execution> -->
-<!-- 				</executions> -->
-<!-- 			</plugin> -->
-		</plugins>
-	</build>
 	<dependencies>
 		<!-- Parent dependencies -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.dep.cms.node</artifactId>
 			<version>${version.argeo-commons}</version>
+			<type>pom</type>
 		</dependency>
-		
+
 		<!-- Absolutely minimal SLC Agent -->
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.api</artifactId>
-			<version>2.1.13</version>
+			<version>2.1.17-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
 			<artifactId>org.argeo.slc.core</artifactId>
-			<version>2.1.13</version>
+			<version>2.1.17-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.agent</artifactId>
-			<version>2.1.13</version>
+			<artifactId>org.argeo.slc.support</artifactId>
+			<version>2.1.17-SNAPSHOT</version>
 		</dependency>
 
 		<!-- CLI Agent -->
@@ -84,18 +48,6 @@
 		<!-- <version>2.1.1-SNAPSHOT</version> -->
 		<!-- </dependency> -->
 
-		<!-- JCR Agent -->
-		<dependency>
-			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.agent.jcr</artifactId>
-			<version>2.1.13</version>
-		</dependency>
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.slc</groupId> -->
-<!-- 			<artifactId>org.argeo.slc.node.jackrabbit</artifactId> -->
-<!-- 			<version>2.1.5-SNAPSHOT</version> -->
-<!-- 		</dependency> -->
-
 	</dependencies>
 	<profiles>
 		<profile>
@@ -103,24 +55,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>
+								<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>
-									<excludeArtifactIds>org.argeo.dep.cms.node</excludeArtifactIds>
-									<includeTypes>jar</includeTypes>
-									<includeScope>runtime</includeScope>
-									<useRepositoryLayout>true</useRepositoryLayout>
+									<descriptorRefs>
+										<descriptorRef>a2-source</descriptorRef>
+									</descriptorRefs>
 								</configuration>
 							</execution>
 						</executions>
@@ -146,20 +92,13 @@
 											<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>
 									</mappings>
 									<requires>
 										<require>argeo-cms-node</require>