X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Fpom.xml;h=6dcf63ad6bb8d9591dca2703be949d8f6d84f04f;hb=57a052ecfc47554c04d84a391be36a30615891fd;hp=c63c991af8fc0ab520856acfa3b69773b84c5056;hpb=5fdd82df06b612c7cb6effa41a3d4b5b87c2b4c6;p=gpl%2Fargeo-slc.git

diff --git a/runtime/pom.xml b/runtime/pom.xml
index c63c991af..6dcf63ad6 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.12.1</version>
+		<version>0.14.2-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.argeo.slc</groupId>
@@ -11,7 +11,6 @@
 	<packaging>pom</packaging>
 	<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>
@@ -22,88 +21,78 @@
 		<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.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>
-		<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-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>
+					<include>*.properties</include>
+				</includes>
+				<excludes>
+					<exclude>build.properties</exclude>
+				</excludes>
+			</resource>
+		</resources>
+		<plugins>
+			<plugin>
+				<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-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>
+			</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>
-	<!-- 
-	<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>
-	-->
+	<!-- <reporting> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> 
+		<artifactId>cobertura-maven-plugin</artifactId> </plugin> </plugins> </reporting> -->
 </project>