X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.detached.launcher%2Fpom.xml;h=813a0cc1bb95590d04a666d8f9b3f9fc1307985c;hb=8675387b5f28779cdc65eb80453d6c3f7eeca799;hp=eb4ee3af3bb3218e21e160306e6568b06b47ae8b;hpb=d8c5cf47f4ce62682c346523a9b988af0d8565ce;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.detached.launcher/pom.xml b/org.argeo.slc.detached.launcher/pom.xml
index eb4ee3af3..813a0cc1b 100644
--- a/org.argeo.slc.detached.launcher/pom.xml
+++ b/org.argeo.slc.detached.launcher/pom.xml
@@ -1,15 +1,13 @@
-<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-SNAPSHOT</version>
+		<version>0.11.3-SNAPSHOT</version>
 		<relativePath>../org.argeo.slc</relativePath>
 	</parent>
 	<artifactId>org.argeo.slc.detached.launcher</artifactId>
-	<name>SLC Detached Launcher</name>
+	<name>Argeo SLC Detached Launcher</name>
 	<packaging>jar</packaging>
 	<build>
 		<plugins>
@@ -17,36 +15,125 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<source>1.3</source>
-					<target>1.3</target>
+					<source>1.4</source>
+					<target>1.4</target>
 				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifest>
+							<mainClass>
+								org.argeo.slc.detached.launcher.Main
+							</mainClass>
+						</manifest>
+					</archive>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<version>${version.maven-bundle-plugin}</version>
+				<configuration>
+					<instructions>
+						<Export-Package>
+							org.argeo.slc.*
+						</Export-Package>
+					</instructions>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<configuration>
+					<descriptors>
+						<descriptor>src/assembly/dist.xml</descriptor>
+					</descriptors>
+				</configuration>
+				<executions>
+					<execution>
+						<id>attach-assembly</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 	<dependencies>
+		<!--
+			<dependency> <groupId>org.apache.felix</groupId>
+			<artifactId>org.apache.felix.main</artifactId> </dependency>
+		-->
 		<dependency>
-			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.detached</artifactId>
-			<version>${project.version}</version>
+			<groupId>org.eclipse.osgi</groupId>
+			<artifactId>org.eclipse.osgi</artifactId>
 		</dependency>
+
 		<dependency>
-			<groupId>org.apache.felix</groupId>
-			<artifactId>org.apache.felix.main</artifactId>
+			<groupId>org.springframework.osgi</groupId>
+			<artifactId>org.springframework.osgi.extender</artifactId>
 		</dependency>
+
+
+		<!--
+			Old <dependency> <groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId> <version>2.0.8</version>
+			</dependency> <dependency> <groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId> </dependency> <dependency>
+			<groupId>log4j</groupId> <artifactId>log4j</artifactId> </dependency>
+			<dependency> <groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId> </dependency>
+		-->
+
+		<!--
+			<dependency> <groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.detached.ext.log4j</artifactId>
+			<version>0.11.2</version> </dependency>
+		-->
 		<!-- Spring -->
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>spring-context</artifactId>
-			<version>2.0.8</version>
+			<artifactId>org.springframework.context</artifactId>
 		</dependency>
 
+		<!--
+			<dependency> <groupId>org.apache.xerces</groupId>
+			<artifactId>com.springsource.org.apache.xerces</artifactId>
+			</dependency> <dependency> <groupId>org.apache.xalan</groupId>
+			<artifactId>com.springsource.org.apache.xalan</artifactId>
+			</dependency> <dependency>
+			<groupId>edu.emory.mathcs.backport</groupId> <artifactId>
+			com.springsource.edu.emory.mathcs.backport </artifactId>
+			</dependency>
+		-->
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>
+				com.springsource.org.apache.commons.io
+			</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.junit</groupId>
+			<artifactId>com.springsource.junit</artifactId>
+		</dependency>
 		<dependency>
-			<groupId>xerces</groupId>
-			<artifactId>xercesImpl</artifactId>
+			<groupId>org.apache.log4j</groupId>
+			<artifactId>com.springsource.org.apache.log4j</artifactId>
 		</dependency>
+		<!--
+			<dependency> <groupId>org.slf4j</groupId>
+			<artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
+			</dependency> <dependency> <groupId>org.slf4j</groupId>
+			<artifactId>com.springsource.slf4j.jcl</artifactId> </dependency>
+		-->
 	</dependencies>
 </project>
\ No newline at end of file