directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r747692 - in /directory/studio/trunk: pom.xml test-integration-core/pom.xml test-integration-ui/pom.xml updatesite/pom.xml valueeditors/pom.xml
Date Wed, 25 Feb 2009 07:18:24 GMT
Author: felixk
Date: Wed Feb 25 07:18:24 2009
New Revision: 747692

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

Modified:
    directory/studio/trunk/pom.xml
    directory/studio/trunk/test-integration-core/pom.xml
    directory/studio/trunk/test-integration-ui/pom.xml
    directory/studio/trunk/updatesite/pom.xml
    directory/studio/trunk/valueeditors/pom.xml

Modified: directory/studio/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/pom.xml?rev=747692&r1=747691&r2=747692&view=diff
==============================================================================
--- directory/studio/trunk/pom.xml (original)
+++ directory/studio/trunk/pom.xml Wed Feb 25 07:18:24 2009
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.project</groupId>
     <artifactId>project</artifactId>
-    <version>14</version>
+    <version>15</version>
   </parent>
 
   <groupId>org.apache.directory.studio</groupId>
@@ -53,7 +53,7 @@
   <distributionManagement>
     <site>
       <id>apache.directory.studio</id>
-      <url>${distributionManagement.site.url}</url>
+      <url>${distMgmtSiteUrl}</url>
     </site>
   </distributionManagement>
 
@@ -63,7 +63,7 @@
       Can be overwritten in the settings.xml
     -->
     <studio.dist.url>${pom.distributionManagement.repository.url}</studio.dist.url>
-    <distributionManagement.site.url>scpexe://vm094.oxylos.org/var/www/html/projects/studio/</distributionManagement.site.url>
+    <distMgmtSiteUrl>scpexe://vm094.oxylos.org/var/www/html/projects/studio/</distMgmtSiteUrl>
     <!-- Set versions for subprojects -->
     <aciitemeditor.version>1.4.0-SNAPSHOT</aciitemeditor.version>
     <apacheds.launcher.version>1.2.0</apacheds.launcher.version>
@@ -1074,7 +1074,6 @@
         <artifactId>nlog4j</artifactId>
         <version>1.2.25</version>
       </dependency>
-
     </dependencies>
   </dependencyManagement>
 
@@ -1155,35 +1154,6 @@
           <version>1.0.2-SNAPSHOT</version>
         </plugin>
         <plugin>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>maven-bundle-plugin</artifactId>
-          <version>1.4.3</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-eclipse-plugin</artifactId>
-          <version>2.5.1</version>
-        </plugin>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>dependency-maven-plugin</artifactId>
-          <version>1.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.maven.plugins</groupId>
           <artifactId>maven-antrun-plugin</artifactId>
           <dependencies>
@@ -1299,24 +1269,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>
@@ -1330,6 +1282,7 @@
   </reporting>
 
   <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>
@@ -1339,5 +1292,4 @@
       </releases>
     </repository>
   </repositories>
-  
 </project>

Modified: directory/studio/trunk/test-integration-core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-core/pom.xml?rev=747692&r1=747691&r2=747692&view=diff
==============================================================================
--- directory/studio/trunk/test-integration-core/pom.xml (original)
+++ directory/studio/trunk/test-integration-core/pom.xml Wed Feb 25 07:18:24 2009
@@ -232,7 +232,7 @@
         <artifactId>maven-eclipse-plugin</artifactId>
         <configuration>
           <skip>false</skip>
-	  <pde>true</pde>
+          <pde>true</pde>
           <additionalProjectnatures>
             <projectnature>org.eclipse.pde.PluginNature</projectnature>
             <projectnature>org.eclipse.jdt.core.javanature</projectnature>
@@ -272,7 +272,6 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.4.3</version>
         <extensions>true</extensions>
         <configuration>
           <manifestLocation>META-INF</manifestLocation>

Modified: directory/studio/trunk/test-integration-ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-ui/pom.xml?rev=747692&r1=747691&r2=747692&view=diff
==============================================================================
--- directory/studio/trunk/test-integration-ui/pom.xml (original)
+++ directory/studio/trunk/test-integration-ui/pom.xml Wed Feb 25 07:18:24 2009
@@ -240,7 +240,7 @@
         <artifactId>maven-eclipse-plugin</artifactId>
         <configuration>
           <skip>false</skip>
-	  <pde>true</pde>
+          <pde>true</pde>
           <additionalProjectnatures>
             <projectnature>org.eclipse.pde.PluginNature</projectnature>
             <projectnature>org.eclipse.jdt.core.javanature</projectnature>
@@ -280,7 +280,6 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.4.3</version>
         <extensions>true</extensions>
         <configuration>
           <manifestLocation>META-INF</manifestLocation>

Modified: directory/studio/trunk/updatesite/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/updatesite/pom.xml?rev=747692&r1=747691&r2=747692&view=diff
==============================================================================
--- directory/studio/trunk/updatesite/pom.xml (original)
+++ directory/studio/trunk/updatesite/pom.xml Wed Feb 25 07:18:24 2009
@@ -44,8 +44,8 @@
       <build>
         <plugins>
           <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-assembly-plugin</artifactId>
-            <version>2.2-beta-1</version>
             <executions>
               <execution>
                 <id>nightly</id>
@@ -63,6 +63,7 @@
             </executions>
           </plugin>
           <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-antrun-plugin</artifactId>
             <executions>
               <execution>
@@ -285,8 +286,8 @@
 
       <!-- Build dist in root projects target/distributions -->
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.2-beta-1</version>
         <executions>
           <execution>
             <id>dist</id>

Modified: directory/studio/trunk/valueeditors/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/valueeditors/pom.xml?rev=747692&r1=747691&r2=747692&view=diff
==============================================================================
--- directory/studio/trunk/valueeditors/pom.xml (original)
+++ directory/studio/trunk/valueeditors/pom.xml Wed Feb 25 07:18:24 2009
@@ -59,7 +59,7 @@
         <artifactId>maven-eclipse-plugin</artifactId>
         <configuration>
           <skip>false</skip>
-	  <pde>true</pde>
+          <pde>true</pde>
           <buildcommands>
             <buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand>
             <buildcommand>org.eclipse.pde.ManifestBuilder</buildcommand>
@@ -104,7 +104,6 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.4.3</version>
         <extensions>true</extensions>
         <configuration>
           <manifestLocation>META-INF</manifestLocation>



Mime
View raw message