Factorize bundles management

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

diff --git a/pom.xml b/pom.xml
index c2aca1b817d28add65f0a8fdebd8cdaffd9a0902..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>
@@ -1063,18 +1005,20 @@ limitations under the License.
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-pmd-plugin</artifactId>
                                <version>2.3</version>
+                               <inherited>false</inherited>
+                               <configuration>
+                                       <linkXref>true</linkXref>
+                                       <targetJdk>1.5</targetJdk>
+                                       <aggregate>true</aggregate>
+                                       <excludes>
+                                               <exclude>**/springutil/*.java</exclude>
+                                       </excludes>
+                               </configuration>
                                <reportSets>
                                        <reportSet>
                                                <reports>
                                                        <report>cpd</report>
                                                </reports>
-                                               <configuration>
-                                                       <linkXref>true</linkXref>
-                                                       <targetJdk>1.5</targetJdk>
-                                                       <excludes>
-                                                               <exclude>**/springutil/*.java</exclude>
-                                                       </excludes>
-                                               </configuration>
                                        </reportSet>
                                </reportSets>
                        </plugin>