You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by fe...@apache.org on 2009/02/25 08:26:59 UTC

svn commit: r747693 - in /directory/apacheds/trunk: all/pom.xml bootstrap-plugin/pom.xml core-plugin/pom.xml pom.xml server-tools/pom.xml

Author: felixk
Date: Wed Feb 25 07:26:59 2009
New Revision: 747693

URL: http://svn.apache.org/viewvc?rev=747693&view=rev
Log:
Use latest Directory TLP pom

Modified:
    directory/apacheds/trunk/all/pom.xml
    directory/apacheds/trunk/bootstrap-plugin/pom.xml
    directory/apacheds/trunk/core-plugin/pom.xml
    directory/apacheds/trunk/pom.xml
    directory/apacheds/trunk/server-tools/pom.xml

Modified: directory/apacheds/trunk/all/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/all/pom.xml?rev=747693&r1=747692&r2=747693&view=diff
==============================================================================
--- directory/apacheds/trunk/all/pom.xml (original)
+++ directory/apacheds/trunk/all/pom.xml Wed Feb 25 07:26:59 2009
@@ -45,16 +45,6 @@
   </dependencies>
 
   <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-shade-plugin</artifactId>
-          <version>1.1</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

Modified: directory/apacheds/trunk/bootstrap-plugin/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/bootstrap-plugin/pom.xml?rev=747693&r1=747692&r2=747693&view=diff
==============================================================================
--- directory/apacheds/trunk/bootstrap-plugin/pom.xml (original)
+++ directory/apacheds/trunk/bootstrap-plugin/pom.xml Wed Feb 25 07:26:59 2009
@@ -117,7 +117,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
-        <version>2.4.3</version>
       </plugin>
     </plugins>
   </reporting>

Modified: directory/apacheds/trunk/core-plugin/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-plugin/pom.xml?rev=747693&r1=747692&r2=747693&view=diff
==============================================================================
--- directory/apacheds/trunk/core-plugin/pom.xml (original)
+++ directory/apacheds/trunk/core-plugin/pom.xml Wed Feb 25 07:26:59 2009
@@ -89,7 +89,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
-        <version>2.4.3</version>
       </plugin>
     </plugins>
   </reporting>

Modified: directory/apacheds/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/pom.xml?rev=747693&r1=747692&r2=747693&view=diff
==============================================================================
--- directory/apacheds/trunk/pom.xml (original)
+++ directory/apacheds/trunk/pom.xml Wed Feb 25 07:26:59 2009
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.directory.project</groupId>
     <artifactId>project</artifactId>
-    <version>14</version>
+    <version>15</version>
   </parent>
 
   <groupId>org.apache.directory.server</groupId>
@@ -36,7 +36,7 @@
 
   <properties>
     <projectName>Apache Directory Server</projectName>
-    <distributionManagement.site.url>scpexe://vm094.oxylos.org/var/www/html/projects/apacheds/</distributionManagement.site.url>
+    <distMgmtSiteUrl>scpexe://vm094.oxylos.org/var/www/html/projects/apacheds/</distMgmtSiteUrl>
 
     <!-- Set versions for depending projects -->
     <org.apache.directory.shared.version>0.9.14-SNAPSHOT</org.apache.directory.shared.version>
@@ -280,7 +280,7 @@
   <distributionManagement>
     <site>
       <id>apache.directory.apacheds</id>
-      <url>${distributionManagement.site.url}</url>
+      <url>${distMgmtSiteUrl}</url>
     </site>
   </distributionManagement>
 
@@ -374,47 +374,6 @@
     <module>xbean-spring</module>
   </modules>
 
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-dependency-plugin</artifactId>
-          <version>2.0</version>
-        </plugin>
-
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-antlr-plugin</artifactId>
-          <version>2.0-beta-1</version>
-          <executions>
-            <execution>
-              <goals>
-                <goal>generate</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-
-
-        <plugin>
-          <groupId>org.apache.xbean</groupId>
-          <artifactId>maven-xbean-plugin</artifactId>
-          <version>3.2</version>
-        </plugin>
-
-        <!--  lets ensure that the XSD gets deployed  -->
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>build-helper-maven-plugin</artifactId>
-          <version>1.0</version>
-        </plugin>
-
-      </plugins>
-    </pluginManagement>
-
-  </build>
-
   <reporting>
     <excludeDefaults>true</excludeDefaults>
     <plugins>
@@ -456,7 +415,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.4</version>
         <configuration>
           <aggregate>true</aggregate>
           <linksource>true</linksource>
@@ -497,24 +455,6 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>
-        <version>1.2</version>
-        <configuration>
-          <xmlOutput>false</xmlOutput>
-          <!--
-            <xmlOutput>true|false</xmlOutput>
-            <xmlOutputDirectory>directory location of xml findbugs report</xmlOutputDirectory>
-            <threshold>High|Normal|Low|Exp|Ignore</threshold>
-            <effort>Min|Default|Max</effort>
-            <excludeFilterFile>findbugs-exclude.xml</excludeFilterFile>
-            <includeFilterFile>findbugs-include.xml</includeFilterFile>
-            <visitors>FindDeadLocalStores,UnreadFields</visitors>
-            <omitVisitors>FindDeadLocalStores,UnreadFields</omitVisitors>
-            <onlyAnalyze>org.codehaus.mojo.findbugs.*</onlyAnalyze>
-            <pluginList>/libs/fb-contrib/fb-contrib-2.8.0.jar</pluginList>
-            <debug>true|false</debug>
-            <relaxed>true|false</relaxed>
-          -->
-        </configuration>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
@@ -523,7 +463,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.2</version>
       </plugin>
     </plugins>
   </reporting>
@@ -535,6 +474,7 @@
   </scm>
 
   <repositories>
+    <!-- Remove me when ASF CI can deploy Snapshots -->
     <repository>
       <id>apache.directory.snapshot.repo</id>
       <name>Snapshot repository for the Apache Directory project</name>
@@ -544,5 +484,4 @@
       </releases>
     </repository>
   </repositories>
-  
 </project>

Modified: directory/apacheds/trunk/server-tools/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-tools/pom.xml?rev=747693&r1=747692&r2=747693&view=diff
==============================================================================
--- directory/apacheds/trunk/server-tools/pom.xml (original)
+++ directory/apacheds/trunk/server-tools/pom.xml Wed Feb 25 07:26:59 2009
@@ -102,7 +102,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>2.2</version>
         <configuration>
           <archive>
             <manifestFile>src/main/manifest/MANIFEST.MF</manifestFile>