jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r785585 - /jackrabbit/parent/trunk/pom.xml
Date Wed, 17 Jun 2009 13:13:02 GMT
Author: jukka
Date: Wed Jun 17 13:13:02 2009
New Revision: 785585

URL: http://svn.apache.org/viewvc?rev=785585&view=rev
Log:
JCRSITE-13: Use the org.apache:apache:6 parent POM

Upgrade to version 6 of the Apache parent POM and remove plugin settings that are already
specified there.

Move the license header inside the <project/> element to avoid problems with the Maven
release plugin.

Modified:
    jackrabbit/parent/trunk/pom.xml

Modified: jackrabbit/parent/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/parent/trunk/pom.xml?rev=785585&r1=785584&r2=785585&view=diff
==============================================================================
--- jackrabbit/parent/trunk/pom.xml (original)
+++ jackrabbit/parent/trunk/pom.xml Wed Jun 17 13:13:02 2009
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-  -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
                              http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
+  <!-- =================================================================== -->
+  <!-- Licensed to the Apache Software Foundation (ASF) under one or more  -->
+  <!-- contributor license agreements.  See the NOTICE file distributed    -->
+  <!-- with this work for additional information regarding copyright       -->
+  <!-- ownership. The ASF licenses this file to You under the Apache       -->
+  <!-- License, Version 2.0 (the "License"); you may not use this file     -->
+  <!-- except in compliance with the License.  You may obtain a copy of    -->
+  <!-- the License at                                                      -->
+  <!--                                                                     -->
+  <!--     http://www.apache.org/licenses/LICENSE-2.0                      -->
+  <!--                                                                     -->
+  <!-- Unless required by applicable law or agreed to in writing, software -->
+  <!-- distributed under the License is distributed on an "AS IS" BASIS,   -->
+  <!-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or     -->
+  <!-- implied. See the License for the specific language governing        -->
+  <!-- permissions and limitations under the License.                      -->
+  <!-- =================================================================== -->
+
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>5</version>
+    <version>6</version>
   </parent>
 
   <!-- =================================================================== -->
@@ -53,35 +53,13 @@
     <maven>2.0.9</maven>
   </prerequisites>
 
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-
   <build>
     <pluginManagement>
-      <!-- JCRSITE-9: Fix versions of key Maven plugins -->
+      <!-- JCRSITE-9: Fix versions of key Maven plugins      -->
+      <!-- Note that many plugin versions are set already in -->
+      <!-- the Apache parent POM.                            -->
       <plugins>
         <plugin>
-          <artifactId>maven-clean-plugin</artifactId>
-          <version>2.3</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-resources-plugin</artifactId>
-          <version>2.3</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.0.2</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.4.3</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-jar-plugin</artifactId>
-          <version>2.2</version>
-        </plugin>
-        <plugin>
           <artifactId>maven-war-plugin</artifactId>
           <version>2.0.2</version>
         </plugin>
@@ -90,30 +68,10 @@
           <version>2.2</version>
         </plugin>
         <plugin>
-          <artifactId>maven-install-plugin</artifactId>
-          <version>2.2</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-deploy-plugin</artifactId>
-          <version>2.4</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-source-plugin</artifactId>
-          <version>2.0.4</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <version>2.5</version>
-        </plugin>
-        <plugin>
           <artifactId>maven-dependency-plugin</artifactId>
           <version>2.1</version>
         </plugin>
         <plugin>
-          <artifactId>maven-antrun-plugin</artifactId>
-          <version>1.3</version>
-        </plugin>
-        <plugin>
           <groupId>org.apache.felix</groupId>
           <artifactId>maven-bundle-plugin</artifactId>
           <version>1.4.3</version>



Mime
View raw message