incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r896879 - /sling/trunk/parent/pom.xml
Date Thu, 07 Jan 2010 13:49:27 GMT
Author: cziegeler
Date: Thu Jan  7 13:48:31 2010
New Revision: 896879

URL: http://svn.apache.org/viewvc?rev=896879&view=rev
Log:
SLING-1259 : Update parent pom: Use new Apache Parent POM, require maven 2.2.1 etc.

Modified:
    sling/trunk/parent/pom.xml

Modified: sling/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/parent/pom.xml?rev=896879&r1=896878&r2=896879&view=diff
==============================================================================
--- sling/trunk/parent/pom.xml (original)
+++ sling/trunk/parent/pom.xml Thu Jan  7 13:48:31 2010
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache</groupId>
         <artifactId>apache</artifactId>
-        <version>6</version>
+        <version>7</version>
     </parent>
 
     <groupId>org.apache.sling</groupId>
@@ -36,7 +36,7 @@
     <url>http://sling.apache.org</url>
 
     <prerequisites>
-        <maven>2.0.7</maven>
+        <maven>2.2.1</maven>
     </prerequisites>
 
 
@@ -65,7 +65,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.6</version>
                 <reportSets>
                     <reportSet>
                         <reports>
@@ -86,7 +85,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-changes-plugin</artifactId>
-                <version>2.1</version>
+                <version>2.3</version>
                 <reportSets>
                     <reportSet>
                         <reports>
@@ -109,7 +108,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>1.0-beta-1</version>
                 <executions>
                     <execution>
                         <id>enforce-java</id>
@@ -264,11 +262,6 @@
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-assembly-plugin</artifactId>
-                    <version>2.2-beta-4</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
                     <version>2.1</version>
                 </plugin>
@@ -333,45 +326,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <!-- add assembly build to the generic release profile -->
-            <id>apache-release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.apache.apache.resources</groupId>
-                                <artifactId>apache-source-release-assembly-descriptor</artifactId>
-                                <version>1.0.2</version>
-                            </dependency>
-                            <dependency>
-                                <!-- NOTE: The fix for PLXUTILS-120 is crucial for the
new assembly descriptor -->
-                                <groupId>org.codehaus.plexus</groupId>
-                                <artifactId>plexus-utils</artifactId>
-                                <version>2.0.1</version>
-                            </dependency>
-                        </dependencies>
-                        <configuration>
-                            <descriptorRefs>
-                                <descriptorRef>source-release</descriptorRef>
-                            </descriptorRefs>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>make-assembly</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>attached</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
 	    <!--
 	    We should execute this profile manually to make sure that all files in our source code
contain proper licenses.
 	    This is very important and should not be skipped in any scenario.  It is very importnt
for us to follow ASF policy.
@@ -508,13 +462,13 @@
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>4.3</version>
+                <version>4.7</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.jmock</groupId>
                 <artifactId>jmock-junit4</artifactId>
-                <version>2.2.0</version>
+                <version>2.5.1</version>
                 <scope>test</scope>
             </dependency>
             <dependency>



Mime
View raw message