X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Fpom.xml;h=ec622cc237614f5898b7055f9dc2e20ed571c176;hb=16b2efa4ed3c8531ea539961c9dfaa326a8b164f;hp=e6a4dcf1b6c4ac7e5f5edd707e5e601a47530f7a;hpb=42b1fe5c5c5090b64eb6ca279ca0a865eaa2c2f8;p=gpl%2Fargeo-slc.git

diff --git a/runtime/pom.xml b/runtime/pom.xml
index e6a4dcf1b..ec622cc23 100644
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -1,44 +1,37 @@
-<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.3-SNAPSHOT</version>
-		<relativePath>../org.argeo.slc</relativePath>
+		<version>0.12.1-SNAPSHOT</version>
+		<relativePath>..</relativePath>
 	</parent>
-	<groupId>org.argeo.slc.runtime</groupId>
-	<artifactId>argeo-slc-runtime</artifactId>
+	<groupId>org.argeo.slc</groupId>
+	<artifactId>runtime</artifactId>
 	<packaging>pom</packaging>
-	<name>Argeo SLC Runtime</name>
+	<name>SLC Runtime</name>
 	<modules>
 		<module>org.argeo.slc.osgiboot</module>
 		<module>org.argeo.slc.specs</module>
+		<module>org.argeo.slc.core</module>
+		<module>org.argeo.slc.unit</module>
 		<module>org.argeo.slc.support.simple</module>
 		<module>org.argeo.slc.support.castor</module>
 		<module>org.argeo.slc.support.activemq</module>
-		<module>org.argeo.slc.support.ant</module>
+		<module>org.argeo.slc.support.osgi</module>
 		<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.maven</module>
+		<module>org.argeo.slc.support.jemmy</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>
 	</modules>
 	<build>
-		<plugins>
-		<!-- 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<configuration>
-					<aggregate>true</aggregate>
-				</configuration>
-			</plugin>
-			 -->
-		</plugins>
 		<pluginManagement>
 			<plugins>
 				<plugin>
@@ -49,7 +42,6 @@
 						</archive>
 					</configuration>
 				</plugin>
-
 				<plugin>
 					<groupId>org.apache.felix</groupId>
 					<artifactId>maven-bundle-plugin</artifactId>
@@ -58,9 +50,8 @@
 					<configuration>
 						<manifestLocation>target/classes/META-INF</manifestLocation>
 						<instructions>
-							<Bundle-SymbolicName>
-								${pom.artifactId}
-							</Bundle-SymbolicName>
+							<Bundle-Version>${project.version}-r${buildNumber}</Bundle-Version>
+							<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
 							<_removeheaders>Bnd-LastModified</_removeheaders>
 						</instructions>
 					</configuration>
@@ -77,4 +68,42 @@
 			</plugins>
 		</pluginManagement>
 	</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>
+		</reporting>
+	-->
 </project>