X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Fpom.xml;h=ba2d7ca3784b5743e0e680a2196f1b435e464c68;hb=e0be1cede09ad3163fd389e327191cac8ccea575;hp=6626dba56557a73d26904b06ee70252b9270066e;hpb=e36cc1c9c01f926c7bd4677ffbebb41e8e13874d;p=gpl%2Fargeo-slc.git

diff --git a/runtime/pom.xml b/runtime/pom.xml
index 6626dba56..ba2d7ca37 100644
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -5,7 +5,7 @@
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>argeo-slc</artifactId>
 		<version>0.11.4-SNAPSHOT</version>
-		<relativePath>../org.argeo.slc</relativePath>
+		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.argeo.slc</groupId>
 	<artifactId>runtime</artifactId>
@@ -14,12 +14,15 @@
 	<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.server</module>
 		<module>org.argeo.slc.detached</module>
@@ -46,6 +49,7 @@
 					<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>
@@ -63,59 +67,42 @@
 			</plugins>
 		</pluginManagement>
 	</build>
-	<reporting>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-project-info-reports-plugin</artifactId>
-				<reportSets>
-					<reportSet>
-						<reports>
-							<report>index</report>
-							<report>summary</report>
-							<report>dependencies</report>
-							<report>license</report>
-							<report>scm</report>
-						</reports>
-					</reportSet>
-					<reportSet>
-						<inherited>false</inherited>
-						<reports>
-							<report>dependency-convergence</report>
-							<report>dependency-management</report>
-							<report>issue-tracking</report>
-							<report>plugin-management</report>
-						</reports>
-					</reportSet>
-				</reportSets>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<inherited>false</inherited>
-				<configuration>
-					<aggregate>true</aggregate>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jxr-plugin</artifactId>
-				<configuration>
-					<aggregate>true</aggregate>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-report-plugin</artifactId>
-				<inherited>false</inherited>
-				<configuration>
-					<aggregate>true</aggregate>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>cobertura-maven-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</reporting>
+	<!-- 
+	<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>