X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dep%2Forg.argeo.dep.cms.sdk%2Fpom.xml;h=c2dfc847dc5adcd7946caaf54b8ac698f7730b16;hb=08b6b3d0e38af8b6f3ff0f0b0a93f9675b235d63;hp=63ca846ba004f5af4b4e8a2345cf96c2aea99033;hpb=a685dbfc159f32beb7e96a6359bd1d46a0d587d1;p=lgpl%2Fargeo-commons.git

diff --git a/dep/org.argeo.dep.cms.sdk/pom.xml b/dep/org.argeo.dep.cms.sdk/pom.xml
index 63ca846ba..c2dfc847d 100644
--- a/dep/org.argeo.dep.cms.sdk/pom.xml
+++ b/dep/org.argeo.dep.cms.sdk/pom.xml
@@ -3,17 +3,18 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.commons</groupId>
-		<version>2.1.71-SNAPSHOT</version>
+		<version>2.1.80-SNAPSHOT</version>
 		<artifactId>dep</artifactId>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.dep.cms.sdk</artifactId>
 	<name>CMS SDK</name>
 	<dependencies>
+		<!-- Parent dependencies -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.dep.cms.platform</artifactId>
-			<version>2.1.71-SNAPSHOT</version>
+			<version>2.1.80-SNAPSHOT</version>
 			<type>pom</type>
 		</dependency>
 
@@ -40,42 +41,42 @@
 			<groupId>org.argeo.tp.sdk</groupId>
 			<artifactId>org.dbunit</artifactId>
 		</dependency>
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.aether</groupId> -->
-<!-- 			<artifactId>org.eclipse.aether.api</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.aether</groupId> -->
-<!-- 			<artifactId>org.eclipse.aether.spi</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.aether</groupId> -->
-<!-- 			<artifactId>org.eclipse.aether.util</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.aether</groupId> -->
-<!-- 			<artifactId>org.eclipse.aether.impl</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.aether</groupId> -->
-<!-- 			<artifactId>org.eclipse.aether.connector.basic</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.aether</groupId> -->
-<!-- 			<artifactId>org.eclipse.aether.transport.classpath</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.aether</groupId> -->
-<!-- 			<artifactId>org.eclipse.aether.transport.file</artifactId> -->
-<!-- 		</dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.aether</groupId> -->
+		<!-- <artifactId>org.eclipse.aether.api</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.aether</groupId> -->
+		<!-- <artifactId>org.eclipse.aether.spi</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.aether</groupId> -->
+		<!-- <artifactId>org.eclipse.aether.util</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.aether</groupId> -->
+		<!-- <artifactId>org.eclipse.aether.impl</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.aether</groupId> -->
+		<!-- <artifactId>org.eclipse.aether.connector.basic</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.aether</groupId> -->
+		<!-- <artifactId>org.eclipse.aether.transport.classpath</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.aether</groupId> -->
+		<!-- <artifactId>org.eclipse.aether.transport.file</artifactId> -->
+		<!-- </dependency> -->
 		<dependency>
 			<groupId>org.argeo.tp.sdk</groupId>
 			<artifactId>org.redline-rpm</artifactId>
 		</dependency>
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.sdk</groupId> -->
-<!-- 			<artifactId>org.tmatesoft.svnkit</artifactId> -->
-<!-- 		</dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.sdk</groupId> -->
+		<!-- <artifactId>org.tmatesoft.svnkit</artifactId> -->
+		<!-- </dependency> -->
 		<dependency>
 			<groupId>org.argeo.tp.misc</groupId>
 			<artifactId>com.googlecode.javaewah.JavaEWAH</artifactId>
@@ -84,15 +85,15 @@
 			<groupId>org.argeo.tp.misc</groupId>
 			<artifactId>org.eclipse.jgit</artifactId>
 		</dependency>
-		
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.misc</groupId> -->
-<!-- 			<artifactId>org.postgresql.postgresql</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.misc</groupId> -->
-<!-- 			<artifactId>org.h2</artifactId> -->
-<!-- 		</dependency> -->
+
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.misc</groupId> -->
+		<!-- <artifactId>org.postgresql.postgresql</artifactId> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp.misc</groupId> -->
+		<!-- <artifactId>org.h2</artifactId> -->
+		<!-- </dependency> -->
 	</dependencies>
 
 	<profiles>
@@ -101,27 +102,45 @@
 			<build>
 				<plugins>
 					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-dependency-plugin</artifactId>
+						<artifactId>maven-assembly-plugin</artifactId>
 						<executions>
 							<execution>
-								<id>copy-tp</id>
+								<id>prepare-source-tp</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.commons</excludeGroupIds>
-									<excludeTransitive>true</excludeTransitive>
-									<includeTypes>jar</includeTypes>
-									<includeScope>runtime</includeScope>
-									<useRepositoryLayout>true</useRepositoryLayout>
+									<descriptorRefs>
+										<descriptorRef>a2-source-tp</descriptorRef>
+									</descriptorRefs>
 								</configuration>
 							</execution>
 						</executions>
 					</plugin>
+					<!-- <plugin> -->
+					<!-- <groupId>org.apache.maven.plugins</groupId> -->
+					<!-- <artifactId>maven-dependency-plugin</artifactId> -->
+					<!-- <executions> -->
+					<!-- <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.commons</excludeGroupIds> -->
+					<!-- <excludeTransitive>true</excludeTransitive> -->
+					<!-- <excludeArtifactIds>org.argeo.dep.cms.platform</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>
@@ -134,7 +153,7 @@
 								</goals>
 								<configuration>
 									<name>argeo-cms-sdk-tp</name>
-									<projversion>${version.argeo-distribution}</projversion>
+									<projversion>${version.argeo-tp}</projversion>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi</directory>
@@ -144,7 +163,7 @@
 											<directoryIncluded>false</directoryIncluded>
 											<sources>
 												<source>
-													<location>${project.build.directory}/lib-tp</location>
+													<location>${project.build.directory}/${project.artifactId}-${project.version}-a2-source-tp</location>
 													<includes>
 														<include>**/*.jar</include>
 													</includes>