X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.agent%2Fpom.xml;h=c9f75145ebb46fae850dc811bb34fc4b079a5f34;hb=4af418ad1d16e736d7e205567d994eb73c8f7e83;hp=fa3498f819a0cb9b7313dbe9fdb107f82eb040c6;hpb=35c20fa1a15af696cac50d6a208339544955c7b2;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.agent/pom.xml b/org.argeo.slc.agent/pom.xml
index fa3498f81..c9f75145e 100644
--- a/org.argeo.slc.agent/pom.xml
+++ b/org.argeo.slc.agent/pom.xml
@@ -1,17 +1,23 @@
-<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>argeo-slc</artifactId>
-		<version>0.11.1</version>
+		<version>0.11.2-SNAPSHOT</version>
 		<relativePath>../org.argeo.slc</relativePath>
 	</parent>
-	<artifactId>argeo-slc-agent</artifactId>
+	<artifactId>org.argeo.slc.agent</artifactId>
+	<packaging>jar</packaging>
 	<name>Argeo SLC Agent</name>
 	<scm>
-		<connection>scm:svn:https://www.argeo.org/svn/slc/tags/argeo-slc-all-0.11.1/org.argeo.slc.agent</connection>
-	  <url>https://www.argeo.org/svn/slc/tags/argeo-slc-all-0.11.1/org.argeo.slc.agent</url>
-  </scm>
+		<connection>
+			scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc.agent
+		</connection>
+		<url>
+			https://www.argeo.org/svn/slc/trunk/org.argeo.slc.agent
+		</url>
+	</scm>
 	<build>
 		<plugins>
 			<!-- Look to parent pom for inheritances -->
@@ -19,6 +25,10 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
@@ -45,81 +55,98 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<configuration>
+					<instructions>
+						<Export-Package>
+							org.argeo.slc.*
+						</Export-Package>
+						<Import-Package>*,org.argeo.slc.core.test.spring,org.apache.commons.cli;resolution:=optional</Import-Package>
+						<!--
+							<Embed-Dependency>ant*</Embed-Dependency>
+							<Embed-Directory>target/dependency</Embed-Directory>
+							<Embed-StripGroup>true</Embed-StripGroup>
+						-->
+					</instructions>
+				</configuration>
+			</plugin>
+			<!--
+				<plugin> <artifactId>maven-dependency-plugin</artifactId>
+				<executions> <execution> <id>copy-dependencies</id>
+				<phase>process-resources</phase> <goals>
+				<goal>copy-dependencies</goal> </goals> </execution> </executions>
+				</plugin>
+			-->
 		</plugins>
 	</build>
 	<dependencies>
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
-			<artifactId>argeo-slc-core</artifactId>
+			<artifactId>org.argeo.slc.core</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-        <dependency>
-            <groupId>org.argeo.slc</groupId>
-            <artifactId>org.argeo.slc.detached</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
 		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.detached</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.ws</groupId>
-			<artifactId>spring-ws-core</artifactId>
+			<artifactId>org.springframework.ws</artifactId>
 		</dependency>
 
 		<dependency>
 			<groupId>javax.xml.soap</groupId>
-			<artifactId>saaj-api</artifactId>
+			<artifactId>com.springsource.javax.xml.soap</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>com.sun.xml.messaging.saaj</groupId>
-			<artifactId>saaj-impl</artifactId>
+			<groupId>com.sun.xml</groupId>
+			<artifactId>
+				com.springsource.com.sun.xml.messaging.saaj
+			</artifactId>
 		</dependency>
+
 		<dependency>
-			<groupId>javax.activation</groupId>
-			<artifactId>activation</artifactId>
+			<groupId>org.apache.ant</groupId>
+			<artifactId>com.springsource.org.apache.tools.ant</artifactId>
 		</dependency>
-
+		<!--
+			<dependency> <groupId>org.apache.ant</groupId>
+			<artifactId>ant</artifactId> </dependency>
+		-->
 		<dependency>
 			<groupId>org.apache.ant</groupId>
-			<artifactId>ant</artifactId>
+			<artifactId>ant-commons-logging</artifactId>
 		</dependency>
-        <dependency>
-            <groupId>org.apache.ant</groupId>
-            <artifactId>ant-commons-logging</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.ant</groupId>
-            <artifactId>ant-commons-net</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.ant</groupId>
-            <artifactId>ant-apache-oro</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.ant</groupId>
-            <artifactId>ant-apache-bsf</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-net</groupId>
-            <artifactId>commons-net</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>oro</groupId>
-            <artifactId>oro</artifactId>
-        </dependency>
-
 		<dependency>
-			<groupId>org.apache.maven</groupId>
-			<artifactId>maven-embedder</artifactId>
+			<groupId>org.apache.ant</groupId>
+			<artifactId>ant-commons-net</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.maven</groupId>
-			<artifactId>maven-settings</artifactId>
+			<groupId>org.apache.ant</groupId>
+			<artifactId>ant-apache-oro</artifactId>
 		</dependency>
-
+		<dependency>
+			<groupId>org.apache.ant</groupId>
+			<artifactId>ant-apache-bsf</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>commons-net</groupId>
+			<artifactId>commons-net</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>oro</groupId>
+			<artifactId>oro</artifactId>
+		</dependency>
+		<!--
+			<dependency> <groupId>org.apache.maven</groupId>
+			<artifactId>maven-embedder</artifactId> </dependency> <dependency>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-settings</artifactId> </dependency>
+		-->
 		<dependency>
 			<groupId>commons-cli</groupId>
 			<artifactId>commons-cli</artifactId>