incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r782915 - /incubator/sling/trunk/parent/pom.xml
Date Tue, 09 Jun 2009 08:46:16 GMT
Author: fmeschbe
Date: Tue Jun  9 08:46:15 2009
New Revision: 782915

URL: http://svn.apache.org/viewvc?rev=782915&view=rev
Log:
SLING-917 use Apache parent pom 6 and update plugin references

Modified:
    incubator/sling/trunk/parent/pom.xml

Modified: incubator/sling/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/parent/pom.xml?rev=782915&r1=782914&r2=782915&view=diff
==============================================================================
--- incubator/sling/trunk/parent/pom.xml (original)
+++ incubator/sling/trunk/parent/pom.xml Tue Jun  9 08:46:15 2009
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache</groupId>
         <artifactId>apache</artifactId>
-        <version>4</version>
+        <version>6</version>
     </parent>
 
     <groupId>org.apache.sling</groupId>
@@ -47,8 +47,9 @@
 
 
     <properties>
-        <site.jira.version.id>12313662</site.jira.version.id>
+        <site.jira.version.id>12313945</site.jira.version.id>
         <site.javadoc.exclude />
+        <organization.logo>http://incubator.apache.org/sling/site/media.data/logo.png</organization.logo>
     </properties>
     
 
@@ -80,7 +81,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-report-plugin</artifactId>
-                <version>2.4.2</version>
+                <version>2.4.3</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -178,22 +179,22 @@
                 <plugin>
                     <groupId>org.apache.sling</groupId>
                     <artifactId>maven-sling-plugin</artifactId>
-                    <version>2.0.2-incubator</version>
+                    <version>2.0.4-incubator</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.sling</groupId>
                     <artifactId>maven-jspc-plugin</artifactId>
-                    <version>2.0.2-incubator</version>
+                    <version>2.0.4-incubator</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.sling</groupId>
                     <artifactId>maven-jcrocm-plugin</artifactId>
-                    <version>2.0.2-incubator</version>
+                    <version>2.0.4-incubator</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-scr-plugin</artifactId>
-                    <version>1.0.8</version>
+                    <version>1.2.0</version>
                     <executions>
                         <execution>
                             <id>generate-scr-scrdescriptor</id>
@@ -215,7 +216,7 @@
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
-                    <version>1.4.3</version>
+                    <version>2.0.0</version>
                     <inherited>true</inherited>
                     <configuration>
                         <instructions>
@@ -231,53 +232,26 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-release-plugin</artifactId>
-                    <version>2.0-beta-8</version>
                     <configuration>
                         <tagBase>
                             https://svn.apache.org/repos/asf/incubator/sling/tags
                         </tagBase>
-                        <goals>deploy</goals>
                     </configuration>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-resources-plugin</artifactId>
-                    <version>2.3</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.4.3</version>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <version>2.2-beta-4</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-site-plugin</artifactId>
-                    <version>2.0</version>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <version>2.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-war-plugin</artifactId>
-                    <version>2.1-alpha-2</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-plugin-plugin</artifactId>
-                    <version>2.4.2</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-gpg-plugin</artifactId>
-                    <version>1.0-alpha-4</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-assembly-plugin</artifactId>
-                    <version>2.2-beta-2</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <version>2.0</version>
+                    <version>2.1-beta-1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.mortbay.jetty</groupId>
@@ -321,40 +295,15 @@
             </build>
         </profile>
         <profile>
-            <id>release</id>
+            <!-- add assembly build to the generic release profile -->
+            <id>apache-release</id>
             <build>
                 <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>sign-artifacts</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-javadocs</id>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-assembly-plugin</artifactId>
                         <configuration>
                             <descriptorRefs>
-                                <descriptorRef>bin</descriptorRef>
                                 <descriptorRef>project</descriptorRef>
                             </descriptorRefs>
                         </configuration>
@@ -388,6 +337,9 @@
             </archive>
             <otherArchives>
                 <otherArchive>
+                    http://sling-dev.markmail.org/
+                </otherArchive>
+                <otherArchive>
                     http://www.mail-archive.com/sling-dev@incubator.apache.org/
                 </otherArchive>
             </otherArchives>
@@ -405,6 +357,9 @@
             </archive>
             <otherArchives>
                 <otherArchive>
+                    http://sling-commits.markmail.org/
+                </otherArchive>
+                <otherArchive>
                     http://www.mail-archive.com/sling-commits@incubator.apache.org/
                 </otherArchive>
             </otherArchives>
@@ -484,6 +439,16 @@
             <timezone>+1</timezone>
         </developer>
         <developer>
+            <name>Padraic Hannon</name>
+            <id>hannonpi</id>
+            <email />
+            <organization>Edmunds, Inc.</organization>
+            <roles>
+                <role>Java Developer</role>
+            </roles>
+            <timezone />
+        </developer>
+        <developer>
             <name>Vidar Skauge Ramdal</name>
             <id>vramdal</id>
             <email />
@@ -605,57 +570,6 @@
         </dependencies>
     </dependencyManagement>
 
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>apache.snapshots</id>
-            <name>Apache Snapshot Repository</name>
-            <url>http://repository.apache.org/snapshots</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </pluginRepository>
-        <pluginRepository>
-            <id>apache.incubating</id>
-            <name>Apache Incubating Repository</name>
-            <url>http://people.apache.org/repo/m2-incubating-repository</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <repositories>
-        <repository>
-            <id>apache.incubating</id>
-            <name>Apache Incubating Repository</name>
-            <url>http://people.apache.org/repo/m2-incubating-repository</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </repository>
-        <repository>
-            <id>apache.snapshots</id>
-            <name>Apache Snapshot Repository</name>
-            <url>http://repository.apache.org/snapshots</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-    </repositories>
-
     <distributionManagement>
         <site>
             <id>apache.sling.site</id>



Mime
View raw message