Move to the root the bundles which will be part of v1.4 and v2.2

[lgpl/argeo-commons.git] / server / runtime / pom.xml

diff --git a/server/runtime/pom.xml b/server/runtime/pom.xml
index dc32569b4f5be6c143a58ad931dcb8030232b788..4c9e9dde23321953e2f07bdfc8dec37a2af689c8 100644 (file)
--- a/server/runtime/pom.xml
+++ b/server/runtime/pom.xml
@@ -3,17 +3,18 @@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons</groupId>
-               <version>1.1.1</version>
+               <version>2.1.12-SNAPSHOT</version>
                <artifactId>server</artifactId>
                <relativePath>..</relativePath>
        </parent>
-       <groupId>org.argeo.commons.server</groupId>
-       <artifactId>runtime</artifactId>
+       <groupId>org.argeo.commons</groupId>
+       <artifactId>argeo-commons</artifactId>
        <name>Commons Server Runtime</name>
        <packaging>pom</packaging>
        <modules>
                <module>org.argeo.server.core</module>
                <module>org.argeo.server.json</module>
+               <module>org.argeo.server.catalina.start</module>
                <module>org.argeo.server.webextender</module>
                <module>org.argeo.server.jxl</module>
                <module>org.argeo.server.hibernate</module>
@@ -23,49 +24,4 @@
                <module>org.argeo.server.jackrabbit</module>
                <module>org.argeo.server.modeshape</module>
        </modules>
-       <build>
-               <resources>
-                       <resource>
-                               <directory>src/main/resources</directory>
-                       </resource>
-                       <resource>
-                               <directory>.</directory>
-                               <includes>
-                                       <include>META-INF/**</include>
-                               </includes>
-                       </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>
-                       </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>
-                               <extensions>true</extensions>
-                       </plugin>
-               </plugins>
-       </build>
 </project>
\ No newline at end of file