X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=inline;f=sandbox%2Fargeo.slc.jemmytest%2Fpom.xml;h=f1e2acfcf449bd72408e41054db2c9a3a1e5eaf4;hb=747033df6f046628a98bfacb5dd1c528063fbe8f;hp=aa882e1552a137cb7414b4e386de735cebc01aff;hpb=c42ca2999af4279c26587add59505b4624c3ab0b;p=gpl%2Fargeo-slc.git

diff --git a/sandbox/argeo.slc.jemmytest/pom.xml b/sandbox/argeo.slc.jemmytest/pom.xml
index aa882e155..f1e2acfcf 100644
--- a/sandbox/argeo.slc.jemmytest/pom.xml
+++ b/sandbox/argeo.slc.jemmytest/pom.xml
@@ -1,48 +1,48 @@
-<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.3-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>
-	<version>0.1.2-SNAPSHOT</version>
-	<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>
+						<Spring-Context>*;create-asynchronously:=false</Spring-Context>
 					</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>
@@ -61,55 +61,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>0.11.1-SNAPSHOT</version>
+			<groupId>org.argeo.slc.runtime</groupId>
+			<artifactId>org.argeo.slc.lib.detached</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<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>
-			<version>0.2.2</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.eclipse</groupId>
-			<artifactId>osgi</artifactId>
-			<version>3.3.0-v20070530</version>
+			<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>
-	<repositories>
-		<repository>
-			<id>argeo</id>
-			<url>http://www.argeo.org/maven/argeo</url>
-		</repository>
-		<repository>
-			<id>argeo-snapshots</id>
-			<url>http://www.argeo.org/maven/argeo-snapshots</url>
-		</repository>
-	</repositories>
-	<distributionManagement>
-		<repository>
-			<uniqueVersion>false</uniqueVersion>
-			<id>argeo-restricted</id>
-			<name>Argeo FOSS Repository</name>
-			<url>file:///var/argeo/maven2/argeo</url>
-		</repository>
-		<snapshotRepository>
-			<uniqueVersion>true</uniqueVersion>
-			<id>argeo-snapshots-restricted</id>
-			<name>Argeo FOSS Snapshots Repository</name>
-			<url>file:///var/argeo/maven2/argeo-snapshots</url>
-		</snapshotRepository>
-	</distributionManagement>
 </project>
\ No newline at end of file