X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=sandbox%2Fargeo.slc.jemmytest%2Fpom.xml;h=64ab8890a77af34b4f2e2e0418f725d192d1d22a;hb=b3e31d2602a7aaec00f7f888b109ca5d74f856ad;hp=17638e5b5b7b14c940622c266320d8bfce8a0dec;hpb=bcccdb9685222783bce8b2bf20208ef887dcd246;p=gpl%2Fargeo-slc.git

diff --git a/sandbox/argeo.slc.jemmytest/pom.xml b/sandbox/argeo.slc.jemmytest/pom.xml
index 17638e5b5..64ab8890a 100644
--- a/sandbox/argeo.slc.jemmytest/pom.xml
+++ b/sandbox/argeo.slc.jemmytest/pom.xml
@@ -1,53 +1,47 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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>
-		<relativePath>../org.argeo.slc</relativePath>
+		<version>0.11.2-SNAPSHOT</version>
+		<relativePath>../../org.argeo.slc</relativePath>
 	</parent>
 	<groupId>org.argeo.slc.sandbox</groupId>
 	<artifactId>org.argeo.slc.sandbox.jemmytest</artifactId>
 	<name>SLC Sandbox JemmyTest</name>
-	<packaging>bundle</packaging>
+	<packaging>jar</packaging>
+	<properties></properties>
 	<build>
 		<plugins>
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>1.4.3</version>
-				<extensions>true</extensions>
+				<version>${version.maven-bundle-plugin}</version>
 				<configuration>
-					<manifestLocation>
-						src/main/resources/META-INF
-					</manifestLocation>
 					<instructions>
-						<Bundle-SymbolicName>
-							${pom.artifactId}
-						</Bundle-SymbolicName>
-						<Bundle-Activator>
-							org.argeo.slc.jemmytest.JemmyTestActivator
-						</Bundle-Activator>
 						<Export-Package>
 							org.argeo.slc.jemmytest.*
-						</Export-Package>
+                        </Export-Package>
 						<Import-Package>
-							*,org.springframework.beans.factory.xml
-						</Import-Package>
+							*,org.springframework.beans.factory.config
+                        </Import-Package>
 						<Require-Bundle>
 							org.argeo.slc.detached
-						</Require-Bundle>
+                        </Require-Bundle>
 					</instructions>
+
 				</configuration>
 			</plugin>
 			<plugin>
 				<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>
@@ -66,41 +60,57 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<skipTests>true</skipTests>
-				</configuration>
+				<configuration></configuration>
 			</plugin>
 		</plugins>
 	</build>
 	<profiles></profiles>
 	<dependencies>
-		<dependency>
-			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.detached</artifactId>
-			<version>${project.version}</version>
-		</dependency>
+
 
 		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context</artifactId>
-			<version>2.0.8</version>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.lib.detached</artifactId>
+			<version>${project.version}</version>
 		</dependency>
-
 		<dependency>
-			<groupId>org.apache.felix</groupId>
-			<artifactId>org.osgi.core</artifactId>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.launcher</artifactId>
+			<version>${project.version}</version>
 		</dependency>
-
 		<dependency>
 			<groupId>org.argeo.dep.jemmy</groupId>
 			<artifactId>org.argeo.dep.jemmy.nb61</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<scope>test</scope>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.detached.launcher</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 
+		<!--
+			<dependency> <groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.detached</artifactId>
+			<version>${project.version}</version> <exclusions> <exclusion>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>com.springsource.org.apache.commons.logging</artifactId>
+			</exclusion> </exclusions> </dependency> <dependency>
+			<groupId>org.argeo.dep.jemmy</groupId>
+			<artifactId>org.argeo.dep.jemmy.nb61</artifactId> </dependency>
+
+			<dependency> <groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.detached.launcher</artifactId>
+			<version>${project.version}</version> <exclusions> <exclusion>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>com.springsource.org.apache.commons.logging</artifactId>
+			</exclusion> </exclusions> </dependency> <dependency>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.agent</artifactId>
+			<version>${project.version}</version> <exclusions> <exclusion>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>com.springsource.org.apache.commons.logging</artifactId>
+			</exclusion> </exclusions> </dependency>
+		-->
 	</dependencies>
 </project>
\ No newline at end of file