X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Fpom.xml;h=0d6c3ec161777fcc79234d425b9a7b4fa59fe70a;hb=6e4e2314ce0605519c6165a7e34fde9a3418217a;hp=0f4658e6e72e0b4c02b3ebcaa4f48ce372214a91;hpb=43f284a9b05260113630dfa3175038631c1c09f4;p=gpl%2Fargeo-slc.git

diff --git a/runtime/pom.xml b/runtime/pom.xml
index 0f4658e6e..0d6c3ec16 100644
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -25,6 +25,7 @@
 		<module>org.argeo.slc.support.ant</module>
 		<module>org.argeo.slc.support.maven</module>
 		<module>org.argeo.slc.support.jemmy</module>
+		<module>org.argeo.slc.support.jcr</module>
 		<module>org.argeo.slc.server</module>
 		<module>org.argeo.slc.detached</module>
 		<module>org.argeo.slc.detached.launcher</module>
@@ -33,62 +34,61 @@
 		<module>org.argeo.slc.support.ws.client</module>
 	</modules>
 	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<artifactId>maven-jar-plugin</artifactId>
-					<configuration>
-						<archive>
-							<manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
-						</archive>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-source-plugin</artifactId>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.felix</groupId>
-					<artifactId>maven-bundle-plugin</artifactId>
-					<version>${version.maven-bundle-plugin}</version>
-					<extensions>true</extensions>
-					<configuration>
-						<manifestLocation>target/classes/META-INF</manifestLocation>
-						<instructions>
-							<Bundle-Version>${project.version}-r${buildNumber}</Bundle-Version>
-							<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-							<_removeheaders>Bnd-LastModified</_removeheaders>
-						</instructions>
-					</configuration>
-					<executions>
-						<execution>
-							<id>bundle-manifest</id>
-							<phase>process-classes</phase>
-							<goals>
-								<goal>manifest</goal>
-							</goals>
-						</execution>
-					</executions>
-				</plugin>
-			</plugins>
-		</pluginManagement>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+			</resource>
+			<resource>
+				<directory>.</directory>
+				<includes>
+					<include>META-INF/**</include>
+				</includes>
+			</resource>
+		</resources>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifestFile>META-INF/MANIFEST.MF</manifestFile>
+					</archive>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<version>${version.maven-bundle-plugin}</version>
+				<extensions>true</extensions>
+				<configuration>
+					<manifestLocation>META-INF</manifestLocation>
+					<instructions>
+						<Bundle-Version>${project.version}-r${buildNumber}</Bundle-Version>
+						<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+						<Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
+						<_removeheaders>Bnd-LastModified</_removeheaders>
+					</instructions>
+				</configuration>
+				<executions>
+					<execution>
+						<id>bundle-manifest</id>
+						<phase>process-classes</phase>
+						<goals>
+							<goal>manifest</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
 	</build>
-	<!--
-		<profiles> <profile> <id>release</id> <build> <plugins> <plugin>
-		<groupId>org.apache.felix</groupId>
-		<artifactId>maven-bundle-plugin</artifactId>
-		<version>${version.maven-bundle-plugin}</version>
-		<extensions>true</extensions> <configuration>
-		<manifestLocation>target/classes/META-INF</manifestLocation>
-		<instructions>
-		<Bundle-Version>${project.version}.r${buildNumber}</Bundle-Version>
-		<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-		<_removeheaders>Bnd-LastModified</_removeheaders> </instructions>
-		</configuration> <executions> <execution> <id>bundle-manifest</id>
-		<phase>process-classes</phase> <goals> <goal>manifest</goal> </goals>
-		</execution> </executions> </plugin> </plugins> </build> </profile>
-		</profiles>
-	-->
 	<!--
 		<reporting> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId>
 		<artifactId>cobertura-maven-plugin</artifactId> </plugin> </plugins>