X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=dep%2Forg.argeo.slc.dep.spring%2Fpom.xml;h=835345eea935249970495f765aaf5bae567e488a;hb=f8a9ca2e0faabe1e0cdcd3537da34e02a0e55f57;hp=05ab65c55697111fee0ed7c04b2cd5cb02b4b47a;hpb=e2e42de8e379883a1c696fcd035d837648cb3526;p=gpl%2Fargeo-slc.git

diff --git a/dep/org.argeo.slc.dep.spring/pom.xml b/dep/org.argeo.slc.dep.spring/pom.xml
index 05ab65c55..835345eea 100644
--- a/dep/org.argeo.slc.dep.spring/pom.xml
+++ b/dep/org.argeo.slc.dep.spring/pom.xml
@@ -1,4 +1,6 @@
-<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>
@@ -8,62 +10,24 @@
 	</parent>
 	<artifactId>org.argeo.slc.dep.spring</artifactId>
 	<name>SLC Agent based on Spring</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>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>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.dep.minimal</artifactId>
+			<version>2.1.17-SNAPSHOT</version>
+			<type>pom</type>
 		</dependency>
 
-		<!-- Absolutely minimal SLC Agent -->
+		<!-- Spring-based Agent -->
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.api</artifactId>
+			<artifactId>org.argeo.slc.spring</artifactId>
 			<version>2.1.17-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.core</artifactId>
+			<artifactId>org.argeo.slc.support</artifactId>
 			<version>2.1.17-SNAPSHOT</version>
 		</dependency>
 		<dependency>
@@ -71,6 +35,33 @@
 			<artifactId>org.argeo.slc.agent</artifactId>
 			<version>2.1.17-SNAPSHOT</version>
 		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.agent.jcr</artifactId>
+			<version>2.1.17-SNAPSHOT</version>
+		</dependency>
+
+		<!-- Transitional fake Java 8 APIs, required by old version of Spring, 
+			in the process of being removed -->
+		<dependency>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.legacy.fake.java8</artifactId>
+			<version>2.1.17-SNAPSHOT</version>
+		</dependency>
+
+		<!-- Not strictly Spring dependencies but used by the old approach -->
+		<dependency>
+			<groupId>org.argeo.tp.apache.ant</groupId>
+			<artifactId>org.apache.ant</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.apache.ant</groupId>
+			<artifactId>org.apache.ant.launch</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.javax</groupId>
+			<artifactId>javax.mail</artifactId>
+		</dependency>
 
 		<!-- Base Spring dependency -->
 		<dependency>
@@ -159,96 +150,6 @@
 		<!-- <artifactId>org.argeo.slc.agent.cli</artifactId> -->
 		<!-- <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.17-SNAPSHOT</version>
-		</dependency>
-		<!-- <dependency> -->
-		<!-- <groupId>org.argeo.slc</groupId> -->
-		<!-- <artifactId>org.argeo.slc.node.jackrabbit</artifactId> -->
-		<!-- <version>2.1.5-SNAPSHOT</version> -->
-		<!-- </dependency> -->
-
-
-		<!-- Base Spring dependency -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.spring</groupId> -->
-<!-- 			<artifactId>org.springframework.beans</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.spring</groupId> -->
-<!-- 			<artifactId>org.springframework.core</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.javax</groupId> -->
-<!-- 			<artifactId>javax.el</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.gemini</groupId> -->
-<!-- 			<artifactId>org.eclipse.gemini.blueprint.core</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.gemini</groupId> -->
-<!-- 			<artifactId>org.eclipse.gemini.blueprint.extender</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.gemini</groupId> -->
-<!-- 			<artifactId>org.eclipse.gemini.blueprint.io</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.misc</groupId> -->
-<!-- 			<artifactId>org.aspectj.weaver</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.misc</groupId> -->
-<!-- 			<artifactId>org.aopalliance</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.spring</groupId> -->
-<!-- 			<artifactId>org.springframework.aop</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.spring</groupId> -->
-<!-- 			<artifactId>org.springframework.context</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.spring</groupId> -->
-<!-- 			<artifactId>org.springframework.expression</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.spring</groupId> -->
-<!-- 			<artifactId>org.springframework.instrument</artifactId> -->
-<!-- 		</dependency> -->
-
-		<!-- Spring -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.spring</groupId> -->
-<!-- 			<artifactId>org.springframework.aspects</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.spring</groupId> -->
-<!-- 			<artifactId>org.springframework.context.support</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.spring</groupId> -->
-<!-- 			<artifactId>org.springframework.jdbc</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.spring</groupId> -->
-<!-- 			<artifactId>org.springframework.tx</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.spring</groupId> -->
-<!-- 			<artifactId>org.springframework.web</artifactId> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.tp.spring</groupId> -->
-<!-- 			<artifactId>org.springframework.web.servlet</artifactId> -->
-<!-- 		</dependency> -->
-
 	</dependencies>
 	<profiles>
 		<profile>
@@ -272,29 +173,6 @@
 							</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.dep.cms.node</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>
@@ -306,7 +184,7 @@
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>slc-agent</name>
+									<name>slc-spring</name>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi</directory>
@@ -323,16 +201,10 @@
 												</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>
+										<require>slc-spring-tp</require>
 									</requires>
 								</configuration>
 							</execution>
@@ -341,5 +213,64 @@
 				</plugins>
 			</build>
 		</profile>
+		<profile>
+			<id>rpmbuild-tp</id>
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-assembly-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>prepare-source-tp</id>
+								<phase>package</phase>
+								<goals>
+									<goal>single</goal>
+								</goals>
+								<configuration>
+									<descriptorRefs>
+										<descriptorRef>a2-source-tp</descriptorRef>
+									</descriptorRefs>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					<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-spring-tp</name>
+									<projversion>${version.argeo-tp}</projversion>
+									<release>${maven.build.timestamp}</release>
+									<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}/${project.artifactId}-${project.version}-a2-source-tp</location>
+													<includes>
+														<include>**/*.jar</include>
+													</includes>
+												</source>
+											</sources>
+										</mapping>
+									</mappings>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 	</profiles>
 </project>
\ No newline at end of file