jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r887180 - in /jackrabbit/trunk: jackrabbit-api/pom.xml jackrabbit-core/pom.xml jackrabbit-jcr-commons/pom.xml jackrabbit-jcr2spi/pom.xml jackrabbit-parent/pom.xml jackrabbit-spi-commons/pom.xml jackrabbit-spi/pom.xml
Date Fri, 04 Dec 2009 13:05:05 GMT
Author: jukka
Date: Fri Dec  4 13:05:03 2009
New Revision: 887180

URL: http://svn.apache.org/viewvc?rev=887180&view=rev
Log:
JCR-2424: Avoid Maven 3 warnings

Modified:
    jackrabbit/trunk/jackrabbit-api/pom.xml
    jackrabbit/trunk/jackrabbit-core/pom.xml
    jackrabbit/trunk/jackrabbit-jcr-commons/pom.xml
    jackrabbit/trunk/jackrabbit-jcr2spi/pom.xml
    jackrabbit/trunk/jackrabbit-parent/pom.xml
    jackrabbit/trunk/jackrabbit-spi-commons/pom.xml
    jackrabbit/trunk/jackrabbit-spi/pom.xml

Modified: jackrabbit/trunk/jackrabbit-api/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-api/pom.xml?rev=887180&r1=887179&r2=887180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-api/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-api/pom.xml Fri Dec  4 13:05:03 2009
@@ -53,7 +53,7 @@
         <configuration>
           <instructions>
             <Export-Package>
-              org.apache.jackrabbit.api.*;version=${pom.version}
+              org.apache.jackrabbit.api.*;version=${project.version}
             </Export-Package>
           </instructions>
         </configuration>

Modified: jackrabbit/trunk/jackrabbit-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/pom.xml?rev=887180&r1=887179&r2=887180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-core/pom.xml Fri Dec  4 13:05:03 2009
@@ -120,12 +120,6 @@
         </executions>
       </plugin>
       <plugin>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <configuration>
-          <configLocation>checkstyle.xml</configLocation>
-        </configuration>
-      </plugin>
-      <plugin>
         <groupId>org.apache.rat</groupId>
         <artifactId>apache-rat-plugin</artifactId>
         <configuration>
@@ -152,6 +146,17 @@
     </resources>
   </build>
 
+  <reporting>
+    <plugins>
+      <plugin>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <configuration>
+          <configLocation>checkstyle.xml</configLocation>
+        </configuration>
+      </plugin>
+    </plugins>
+  </reporting>
+
   <dependencies>
     <dependency>
       <groupId>concurrent</groupId>

Modified: jackrabbit/trunk/jackrabbit-jcr-commons/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-commons/pom.xml?rev=887180&r1=887179&r2=887180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-commons/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-jcr-commons/pom.xml Fri Dec  4 13:05:03 2009
@@ -53,7 +53,7 @@
         <configuration>
           <instructions>
             <Export-Package>
-              org.apache.jackrabbit.*;version=${pom.version}
+              org.apache.jackrabbit.*;version=${project.version}
             </Export-Package>
           </instructions>
         </configuration>

Modified: jackrabbit/trunk/jackrabbit-jcr2spi/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/pom.xml?rev=887180&r1=887179&r2=887180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/pom.xml Fri Dec  4 13:05:03 2009
@@ -52,8 +52,8 @@
         <configuration>
           <instructions>
             <Export-Package>
-              org.apache.jackrabbit.jcr2spi;version=${pom.version};include:=Jcr2spiRepositoryFactory,
-              org.apache.jackrabbit.jcr2spi.config;version=${pom.version}
+              org.apache.jackrabbit.jcr2spi;version=${project.version};include:=Jcr2spiRepositoryFactory,
+              org.apache.jackrabbit.jcr2spi.config;version=${project.version}
             </Export-Package>
           </instructions>
         </configuration>

Modified: jackrabbit/trunk/jackrabbit-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-parent/pom.xml?rev=887180&r1=887179&r2=887180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-parent/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-parent/pom.xml Fri Dec  4 13:05:03 2009
@@ -93,14 +93,14 @@
 
     <pluginManagement>
       <plugins>
-        <!--  Default configuration of OSGi bundleing (JCR-1342) -->
+        <!--  Default configuration of OSGi bundling (JCR-1342) -->
         <plugin>
           <groupId>org.apache.felix</groupId>
           <artifactId>maven-bundle-plugin</artifactId>
           <inherited>true</inherited>
           <configuration>
             <instructions>
-              <Bundle-SymbolicName>${pom.groupId}.${pom.artifactId}</Bundle-SymbolicName>
+              <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
               <Bundle-Category>jcr,jackrabbit</Bundle-Category>
               <Bundle-DocURL>
                 http://jackrabbit.apache.org
@@ -108,6 +108,11 @@
             </instructions>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>build-helper-maven-plugin</artifactId>
+          <version>1.4</version>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>
@@ -117,22 +122,27 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jxr-plugin</artifactId>
+        <version>2.1</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.6.1</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-report-plugin</artifactId>
+        <version>2.4.3</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
+        <version>2.4</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-pmd-plugin</artifactId>
+        <version>2.4</version>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>

Modified: jackrabbit/trunk/jackrabbit-spi-commons/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/pom.xml?rev=887180&r1=887179&r2=887180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/pom.xml Fri Dec  4 13:05:03 2009
@@ -52,8 +52,8 @@
           <configuration>
             <instructions>
               <Export-Package>
-                org.apache.jackrabbit.spi.commons;version=${pom.version},
-                org.apache.jackrabbit.spi.commons.*;version=${pom.version}
+                org.apache.jackrabbit.spi.commons;version=${project.version},
+                org.apache.jackrabbit.spi.commons.*;version=${project.version}
               </Export-Package>
             </instructions>
           </configuration>

Modified: jackrabbit/trunk/jackrabbit-spi/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi/pom.xml?rev=887180&r1=887179&r2=887180&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-spi/pom.xml Fri Dec  4 13:05:03 2009
@@ -52,7 +52,7 @@
           <configuration>
             <instructions>
               <Export-Package>
-                org.apache.jackrabbit.spi;version=${pom.version}
+                org.apache.jackrabbit.spi;version=${project.version}
               </Export-Package>
             </instructions>
           </configuration>



Mime
View raw message