[maven-release-plugin] prepare for next development iteration

[gpl/argeo-slc.git] / runtime / pom.xml

diff --git a/runtime/pom.xml b/runtime/pom.xml
index c3114416b7228ff5aca4970a9dbcd749b1a1c7e8..dbec6a4654f2fe559a6cf184540d3bdfd9343122 100644 (file)
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -1,10 +1,9 @@
-<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.12.2-SNAPSHOT</version>
+               <version>0.13.2-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <groupId>org.argeo.slc</groupId>
@@ -12,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>
@@ -23,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>
@@ -43,7 +42,11 @@
                                <directory>.</directory>
                                <includes>
                                        <include>META-INF/**</include>
+                                       <include>*.properties</include>
                                </includes>
+                               <excludes>
+                                       <exclude>build.properties</exclude>
+                               </excludes>
                        </resource>
                </resources>
                <plugins>
@@ -80,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>