Rename Commons bundles

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

diff --git a/pom.xml b/pom.xml
index 7c1fa7493aa00f59b4b542ab8ffbc77c82ea39ba..3f8cc338452170399f01f02cbf213cce2c2c785f 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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>
        <groupId>org.argeo.commons</groupId>
        <artifactId>argeo-commons</artifactId>
-       <version>2.1.45-SNAPSHOT</version>
+       <version>2.1.46-SNAPSHOT</version>
        <name>Argeo Commons</name>
        <packaging>pom</packaging>
        <properties>
-               <version.argeo-commons>2.1.45-SNAPSHOT</version.argeo-commons>
+               <version.argeo-commons>2.1.46-SNAPSHOT</version.argeo-commons>
                <developmentCycle.argeo-commons>2.1</developmentCycle.argeo-commons>
                <developmentCycle.argeo-commons.startDate>2012-12-19</developmentCycle.argeo-commons.startDate>
                <version.argeo-distribution>2.1.15</version.argeo-distribution>
@@ -21,22 +22,23 @@
        <modules>
                <!-- Base -->
                <module>org.argeo.util</module>
+               <module>org.argeo.enterprise</module>
+               <module>org.argeo.jcr</module>
                <module>org.argeo.osgi.boot</module>
-               <module>org.argeo.server.jcr</module>
-               <!-- Security -->
-               <module>org.argeo.security.core</module>
-               <module>org.argeo.security.jackrabbit</module>
                <!-- Eclipse -->
                <module>org.argeo.eclipse.ui</module>
                <module>org.argeo.eclipse.ui.rap</module>
+               <module>org.argeo.eclipse.ui.workbench</module>
                <!-- CMS -->
+               <module>org.argeo.node.api</module>
                <module>org.argeo.cms</module>
-               <!-- Workbench -->
-               <module>org.argeo.eclipse.ui.workbench</module>
-               <module>org.argeo.eclipse.ui.workbench.rap</module>
+               <!-- CMS Workbench -->
                <module>org.argeo.security.ui</module>
-               <module>org.argeo.security.ui.admin</module>
-               <module>org.argeo.security.ui.rap</module>
+               <module>org.argeo.cms.ui.workbench</module>
+               <module>org.argeo.cms.ui.workbench.rap</module>
+               <!-- Third Parties Extensions -->
+               <module>org.argeo.ext.jackrabbit</module>
+               <module>org.argeo.ext.rap.ui.workbench</module>
                <!-- Distribution -->
                <module>dep</module>
                <module>dist</module>
@@ -220,7 +222,7 @@ limitations under the License.
                                <plugin>
                                        <groupId>org.apache.felix</groupId>
                                        <artifactId>maven-bundle-plugin</artifactId>
-                                       <version>2.3.7</version>
+                                       <version>3.0.1</version>
                                        <extensions>true</extensions>
                                        <configuration>
                                                <manifestLocation>META-INF</manifestLocation>
@@ -501,8 +503,10 @@ limitations under the License.
                                                                </goals>
                                                                <configuration>
                                                                        <target>
-                                                                               <copy todir="${argeo.rpm.stagingRepository}" quiet="true" failonerror="false">
-                                                                                       <fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
+                                                                               <copy todir="${argeo.rpm.stagingRepository}" quiet="true"
+                                                                                       failonerror="false">
+                                                                                       <fileset dir="${project.build.directory}/rpm"
+                                                                                               includes="*/RPMS/**/*.rpm" />
                                                                                        <flattenmapper />
                                                                                </copy>
                                                                        </target>
@@ -527,8 +531,10 @@ limitations under the License.
                                                                </goals>
                                                                <configuration>
                                                                        <target>
-                                                                               <copy todir="${argeo.rpm.stagingRepository}" quiet="true" failonerror="false">
-                                                                                       <fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
+                                                                               <copy todir="${argeo.rpm.stagingRepository}" quiet="true"
+                                                                                       failonerror="false">
+                                                                                       <fileset dir="${project.build.directory}/rpm"
+                                                                                               includes="*/RPMS/**/*.rpm" />
                                                                                        <flattenmapper />
                                                                                </copy>
                                                                        </target>