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

diff --git a/runtime/pom.xml b/runtime/pom.xml
index 6626dba56..7f6bfde5b 100644
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -1,121 +1,109 @@
-<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.4-SNAPSHOT</version>
-		<relativePath>../org.argeo.slc</relativePath>
+		<version>0.13.0-SNAPSHOT</version>
+		<relativePath>..</relativePath>
 	</parent>
 	<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.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>
 	</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.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-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>
-	</build>
-	<reporting>
+		<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-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>
+				<artifactId>maven-clean-plugin</artifactId>
+				<configuration>
+					<filesets>
+						<fileset>
+							<directory>META-INF</directory>
+							<includes>
+								<include>MANIFEST.MF</include>
+							</includes>
+						</fileset>
+					</filesets>
+				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<inherited>false</inherited>
+				<artifactId>maven-jar-plugin</artifactId>
 				<configuration>
-					<aggregate>true</aggregate>
+					<archive>
+						<manifestFile>META-INF/MANIFEST.MF</manifestFile>
+					</archive>
 				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jxr-plugin</artifactId>
-				<configuration>
-					<aggregate>true</aggregate>
-				</configuration>
+				<artifactId>maven-source-plugin</artifactId>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-report-plugin</artifactId>
-				<inherited>false</inherited>
-				<configuration>
-					<aggregate>true</aggregate>
-				</configuration>
+				<artifactId>maven-surefire-plugin</artifactId>
 			</plugin>
 			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>cobertura-maven-plugin</artifactId>
+				<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>
-	</reporting>
+	</build>
+	<!--
+		<reporting> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId>
+		<artifactId>cobertura-maven-plugin</artifactId> </plugin> </plugins>
+		</reporting>
+	-->
 </project>