X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=runtime%2Fpom.xml;h=dbec6a4654f2fe559a6cf184540d3bdfd9343122;hb=44c43b9c874d7c6edd4327f180d5506b3e9c99e6;hp=a3f2285e819be844c2f39887dd9027f117fe2e15;hpb=eea9f390935593a8f384f9b0e5f6f3f18afa2728;p=gpl%2Fargeo-slc.git

diff --git a/runtime/pom.xml b/runtime/pom.xml
index a3f2285e8..dbec6a465 100644
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>argeo-slc</artifactId>
-		<version>0.13.1-SNAPSHOT</version>
+		<version>0.13.2-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.argeo.slc</groupId>
@@ -21,16 +21,17 @@
 		<module>org.argeo.slc.support.equinox</module>
 		<module>org.argeo.slc.support.hibernate</module>
 		<module>org.argeo.slc.support.ant</module>
+		<module>org.argeo.slc.support.aether</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.support.gis</module>
 		<module>org.argeo.slc.server</module>
 		<module>org.argeo.slc.detached</module>
 		<module>org.argeo.slc.detached.launcher</module>
 		<module>org.argeo.slc.launcher</module>
 		<module>org.argeo.slc.lib.detached</module>
 		<module>org.argeo.slc.support.ws.client</module>
+		<module>org.argeo.slc.repo</module>
 	</modules>
 	<build>
 		<resources>
@@ -41,7 +42,11 @@
 				<directory>.</directory>
 				<includes>
 					<include>META-INF/**</include>
+					<include>*.properties</include>
 				</includes>
+				<excludes>
+					<exclude>build.properties</exclude>
+				</excludes>
 			</resource>
 		</resources>
 		<plugins>
@@ -58,22 +63,6 @@
 					</filesets>
 				</configuration>
 			</plugin>
-<!-- 
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.3.2</version>
-				<configuration>
-					<compilerId>eclipse</compilerId>
-				</configuration>
-				<dependencies>
-					<dependency>
-						<groupId>org.codehaus.plexus</groupId>
-						<artifactId>plexus-compiler-eclipse</artifactId>
-						<version>1.8.1</version>
-					</dependency>
-				</dependencies>
-			</plugin>
- -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
@@ -94,32 +83,16 @@
 			<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>
+			<!-- TO BE DELETED Configuration herited from commons/pom.xml <version>${version.maven-bundle-plugin}</version> 
+				<extensions>true</extensions> <configuration> <manifestLocation>META-INF</manifestLocation> 
+				<instructions> <Bundle-Version>${version.slc}-r${buildNumber}</Bundle-Version> 
+				<Bundle-SymbolicName>${project.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>
-	<!--
-		<reporting> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId>
-		<artifactId>cobertura-maven-plugin</artifactId> </plugin> </plugins>
-		</reporting>
-	-->
+	<!-- <reporting> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> 
+		<artifactId>cobertura-maven-plugin</artifactId> </plugin> </plugins> </reporting> -->
 </project>