Use new structure of Argeo Maven Plugins

git-svn-id: https://svn.argeo.org/slc/trunk@2547 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/demo/pom.xml b/demo/pom.xml
index e95ded53f63685ba374876fb46b61d4fb356671f..684466dbff1bab3c5b6edccb87599bdb742b9498 100644 (file)
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -17,7 +17,7 @@
        <build>
                <plugins>
                        <plugin>
-                               <groupId>org.argeo.slc.maven</groupId>
+                               <groupId>org.argeo.maven.plugins</groupId>
                                <artifactId>maven-argeo-osgi-plugin</artifactId>
                                <version>${version.maven-argeo-osgi}</version>
                                <configuration>
@@ -77,7 +77,7 @@
                        <build>
                                <plugins>
                                        <plugin>
-                                               <groupId>org.argeo.slc.maven</groupId>
+                                               <groupId>org.argeo.maven.plugins</groupId>
                                                <artifactId>maven-argeo-osgi-plugin</artifactId>
                                                <configuration>
                                                        <execDir>target/exec/server</execDir>
@@ -114,7 +114,7 @@
                        <build>
                                <plugins>
                                        <plugin>
-                                               <groupId>org.argeo.slc.maven</groupId>
+                                               <groupId>org.argeo.maven.plugins</groupId>
                                                <artifactId>maven-argeo-osgi-plugin</artifactId>
                                                <configuration>
                                                        <execDir>target/exec/agent</execDir>
@@ -146,7 +146,7 @@
                        <build>
                                <plugins>
                                        <plugin>
-                                               <groupId>org.argeo.slc.maven</groupId>
+                                               <groupId>org.argeo.maven.plugins</groupId>
                                                <artifactId>maven-argeo-osgi-plugin</artifactId>
                                                <configuration>
                                                        <execDir>target/exec/server</execDir>

diff --git a/integration-tests/org.argeo.slc.it.webapp/pom.xml b/integration-tests/org.argeo.slc.it.webapp/pom.xml
index bd66540ab046d24a458d305a2b1151db0b55a0f8..88679ee926607c69655ec5da5463382ace552b5c 100644 (file)
--- a/integration-tests/org.argeo.slc.it.webapp/pom.xml
+++ b/integration-tests/org.argeo.slc.it.webapp/pom.xml
@@ -13,7 +13,7 @@
        <build>
                <plugins>
                        <plugin>
-                               <groupId>org.argeo.slc.maven</groupId>
+                               <groupId>org.argeo.maven.plugins</groupId>
                                <artifactId>maven-argeo-osgi-plugin</artifactId>
                                <version>${version.maven-argeo-osgi}</version>
                                <configuration>

diff --git a/pom.xml b/pom.xml
index c63e2fa70e9ece6dd85e7d1eb79e41fae6173f77..dc33ca5ce0dbb48a8feebccb07a564bcb7ec15e0 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
                <version.slf4j>1.5.6</version.slf4j>
                <version.maven-bundle-plugin>2.0.0</version.maven-bundle-plugin>
                <version.activemq>5.2.0.0006</version.activemq>
-               <version.maven-argeo-osgi>0.1.13</version.maven-argeo-osgi>
+               <version.maven-argeo-osgi>0.1.14-SNAPSHOT</version.maven-argeo-osgi>
                <site.repoBase>file:///var/argeo/projects/SLC/www/site</site.repoBase>
                <site.urlBase>http://www.argeo.org/projects/slc/site</site.urlBase>
        </properties>
@@ -140,64 +140,8 @@ limitations under the License.
                                                </execution>
                                        </executions>
                                </plugin>
-                               <!--
-                                       <plugin> <groupId>org.apache.maven.plugins</groupId>
-                                       <artifactId>maven-javadoc-plugin</artifactId> <executions>
-                                       <execution> <id>attach-javadoc</id> <phase>package</phase> <goals>
-                                       <goal>jar</goal> </goals> </execution> </executions> </plugin>
-                               -->
-                               <plugin>
-                                       <groupId>org.mortbay.jetty</groupId>
-                                       <artifactId>maven-jetty-plugin</artifactId>
-                                       <version>${version.jetty}</version>
-                                       <configuration>
-                                               <contextPath>org.argeo.slc.webapp</contextPath>
-                                               <stopKey>stopKey</stopKey>
-                                               <stopPort>9091</stopPort>
-                                               <connectors>
-                                                       <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-                                                               <port>9090</port>
-                                                               <maxIdleTime>60000</maxIdleTime>
-                                                       </connector>
-                                               </connectors>
-                                       </configuration>
-                                       <dependencies>
-                                               <dependency>
-                                                       <groupId>org.hsqldb</groupId>
-                                                       <artifactId>
-                                                               com.springsource.org.hsqldb
-                                                       </artifactId>
-                                                       <version>1.8.0.9</version>
-                                               </dependency>
-                                               <dependency>
-                                                       <groupId>org.mortbay.jetty</groupId>
-                                                       <artifactId>jetty-plus</artifactId>
-                                                       <version>${version.jetty}</version>
-                                               </dependency>
-                                               <dependency>
-                                                       <groupId>org.mortbay.jetty</groupId>
-                                                       <artifactId>jetty-naming</artifactId>
-                                                       <version>${version.jetty}</version>
-                                               </dependency>
-                                               <dependency>
-                                                       <groupId>org.apache.log4j</groupId>
-                                                       <artifactId>com.springsource.org.apache.log4j</artifactId>
-                                                       <version>1.2.15</version>
-                                               </dependency>
-                                               <dependency>
-                                                       <groupId>javax.xml.soap</groupId>
-                                                       <artifactId>com.springsource.javax.xml.soap</artifactId>
-                                                       <version>1.3.0</version>
-                                               </dependency>
-                                               <dependency>
-                                                       <groupId>javax.mail</groupId>
-                                                       <artifactId>com.springsource.javax.mail</artifactId>
-                                                       <version>1.4.1</version>
-                                               </dependency>
-                                       </dependencies>
-                               </plugin>
                                <plugin>
-                                       <groupId>org.argeo.slc.maven</groupId>
+                                       <groupId>org.argeo.maven.plugins</groupId>
                                        <artifactId>maven-argeo-osgi-plugin</artifactId>
                                        <version>${version.maven-argeo-osgi}</version>
                                </plugin>
@@ -220,8 +164,6 @@ limitations under the License.
                                        http://jira.codehaus.org/browse/MSITE-276
                                -->
                        </plugin>
-
-
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-release-plugin</artifactId>

diff --git a/server/org.argeo.slc.ria/pom.xml b/server/org.argeo.slc.ria/pom.xml
index 64063b01630dc6bf140a0212efaeae5a615e39cf..4db222d16286d8c6bd58e8a81e605d2f22f1cf38 100644 (file)
--- a/server/org.argeo.slc.ria/pom.xml
+++ b/server/org.argeo.slc.ria/pom.xml
@@ -18,9 +18,9 @@
                                <artifactId>maven-compiler-plugin</artifactId>
                        </plugin>
                        <plugin>
-                               <groupId>org.argeo.slc.maven</groupId>
+                               <groupId>org.argeo.maven.plugins</groupId>
                                <artifactId>maven-argeo-qooxdoo-plugin</artifactId>
-                               <version>0.8.1.6</version>
+                               <version>0.8.1.7-SNAPSHOT</version>
                                <executions>
                                        <execution>
                                                <id>env</id>

diff --git a/server/org.argeo.slc.siteserver/bundles/pom.xml b/server/org.argeo.slc.siteserver/bundles/pom.xml
index d5bc73fcae5e4f299c6232579af477acf920b0d7..508fc12bffd8f00a65221b66f4fe253d21525e70 100644 (file)
--- a/server/org.argeo.slc.siteserver/bundles/pom.xml
+++ b/server/org.argeo.slc.siteserver/bundles/pom.xml
@@ -13,7 +13,7 @@
        <build>
                <plugins>
                        <plugin>
-                               <groupId>org.argeo.slc.maven</groupId>
+                               <groupId>org.argeo.maven.plugins</groupId>
                                <artifactId>maven-argeo-osgi-plugin</artifactId>
                                <extensions>true</extensions>
                                <configuration>