geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r780069 - in /geronimo/genesis/trunk: genesis-flava/genesis-default-flava/pom.xml genesis-maven-plugin/src/main/groovy/org/apache/geronimo/genesis/plugin/ValidateReleaseConfigurationMojo.groovy pom.xml
Date Fri, 29 May 2009 18:55:44 GMT
Author: djencks
Date: Fri May 29 18:55:43 2009
New Revision: 780069

URL: http://svn.apache.org/viewvc?rev=780069&view=rev
Log:
set up bundle plugin, make this work with apache-release profile, get ready to use new assembly
plugin when released

Modified:
    geronimo/genesis/trunk/genesis-flava/genesis-default-flava/pom.xml
    geronimo/genesis/trunk/genesis-maven-plugin/src/main/groovy/org/apache/geronimo/genesis/plugin/ValidateReleaseConfigurationMojo.groovy
    geronimo/genesis/trunk/pom.xml

Modified: geronimo/genesis/trunk/genesis-flava/genesis-default-flava/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/genesis-flava/genesis-default-flava/pom.xml?rev=780069&r1=780068&r2=780069&view=diff
==============================================================================
--- geronimo/genesis/trunk/genesis-flava/genesis-default-flava/pom.xml (original)
+++ geronimo/genesis/trunk/genesis-flava/genesis-default-flava/pom.xml Fri May 29 18:55:43
2009
@@ -20,20 +20,21 @@
 
 <!-- $Rev$ $Date$ -->
 
-<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">
+<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>
-    
+
     <parent>
         <groupId>org.apache.geronimo.genesis.flava</groupId>
         <artifactId>genesis-flava</artifactId>
         <version>2.0-SNAPSHOT</version>
     </parent>
-    
+
     <artifactId>genesis-default-flava</artifactId>
     <name>Genesis Flava :: Default</name>
     <packaging>pom</packaging>
-    
+
     <build>
         <!--
         NOTE: This causes problems while building Genesis, projects which need the additional

@@ -48,7 +49,7 @@
             </extension>
         </extensions>
         -->
-        
+
         <resources>
             <resource>
                 <directory>${project.basedir}/src/main/resources</directory>
@@ -57,7 +58,7 @@
                     <include>**/*</include>
                 </includes>
             </resource>
-            
+
             <resource>
                 <directory>${project.basedir}/src/main/filtered-resources</directory>
                 <filtering>true</filtering>
@@ -66,7 +67,7 @@
                 </includes>
             </resource>
         </resources>
-        
+
         <testResources>
             <testResource>
                 <directory>${project.basedir}/src/test/resources</directory>
@@ -75,7 +76,7 @@
                     <include>**/*</include>
                 </includes>
             </testResource>
-            
+
             <testResource>
                 <directory>${project.basedir}/src/test/filtered-resources</directory>
                 <filtering>true</filtering>
@@ -84,25 +85,17 @@
                 </includes>
             </testResource>
         </testResources>
-        
+
         <pluginManagement>
             <plugins>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-resources-plugin</artifactId>
-                    <configuration>
-                        <encoding>UTF-8</encoding>
-                    </configuration>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-assembly-plugin</artifactId>
                     <configuration>
                         <tarLongFileMode>gnu</tarLongFileMode>
                     </configuration>
                 </plugin>
-                
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
@@ -110,7 +103,7 @@
                         <silent>true</silent>
                     </configuration>
                 </plugin>
-                
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-ear-plugin</artifactId>
@@ -131,7 +124,15 @@
                         </archive>
                     </configuration>
                 </plugin>
-                
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <configuration>
+                        <encoding>UTF-8</encoding>
+                    </configuration>
+                </plugin>
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
@@ -150,7 +151,7 @@
                         </includes>
                     </configuration>
                 </plugin>
-                
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-war-plugin</artifactId>
@@ -168,7 +169,19 @@
                         </dependency>
                     </dependencies>
                 </plugin>
-                
+
+                <plugin>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>maven-bundle-plugin</artifactId>
+                    <configuration>
+                        <instructions>
+                            <Implementation-Title>${project.name}</Implementation-Title>
+                            <Implementation-Version>${project.version}</Implementation-Version>
+                            <Bundle-DocURL>${project.url}</Bundle-DocURL>
+                        </instructions>
+                    </configuration>
+                </plugin>
+
                 <plugin>
                     <groupId>com.google.code.maven-license-plugin</groupId>
                     <artifactId>maven-license-plugin</artifactId>
@@ -199,7 +212,7 @@
                 </plugin>
             </plugins>
         </pluginManagement>
-        
+
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.genesis</groupId>
@@ -212,7 +225,7 @@
                     </execution>
                 </executions>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -223,7 +236,7 @@
                     <showWarnings>true</showWarnings>
                 </configuration>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
@@ -243,7 +256,7 @@
                     </execution>
                 </executions>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-remote-resources-plugin</artifactId>
@@ -260,7 +273,7 @@
                     </execution>
                 </executions>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>ianal-maven-plugin</artifactId>
@@ -286,16 +299,16 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>2.5</version>
-                
+
                 <reportSets>
                     <reportSet>
                         <reports>
                             <report>javadoc</report>
                             <report>test-javadoc</report>
                         </reports>
-                      </reportSet>
+                    </reportSet>
                 </reportSets>
-                
+
                 <configuration>
                     <quiet>true</quiet>
                     <tags>
@@ -342,19 +355,19 @@
                     </tags>
                 </configuration>
             </plugin>
-            
+
             <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-pmd-plugin</artifactId>
                 <version>2.4</version>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
@@ -363,13 +376,13 @@
                     <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
                 </configuration>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-report-plugin</artifactId>
                 <version>2.4.3</version>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>cobertura-maven-plugin</artifactId>
@@ -380,7 +393,7 @@
             </plugin>
         </plugins>
     </reporting>
-    
+
     <profiles>
         <profile>
             <id>apache-release</id>
@@ -407,30 +420,30 @@
         </profile>
 
         <!--<profile>-->
-            <!--<id>release-stage</id>-->
-            <!--<activation>-->
-                <!--<property>-->
-                    <!--<name>release</name>-->
-                    <!--<value>stage</value>-->
-                <!--</property>-->
-            <!--</activation>-->
-            <!--<build>-->
-                <!--<plugins>-->
-                    <!--<plugin>-->
-                        <!--<groupId>org.apache.geronimo.genesis</groupId>-->
-                        <!--<artifactId>genesis-maven-plugin</artifactId>-->
-                        <!--<executions>-->
-                            <!--<execution>-->
-                                <!--<goals>-->
-                                    <!--<goal>validate-release-stage-configuration</goal>-->
-                                <!--</goals>-->
-                            <!--</execution>-->
-                        <!--</executions>-->
-                    <!--</plugin>-->
-                <!--</plugins>-->
-            <!--</build>-->
+        <!--<id>release-stage</id>-->
+        <!--<activation>-->
+        <!--<property>-->
+        <!--<name>release</name>-->
+        <!--<value>stage</value>-->
+        <!--</property>-->
+        <!--</activation>-->
+        <!--<build>-->
+        <!--<plugins>-->
+        <!--<plugin>-->
+        <!--<groupId>org.apache.geronimo.genesis</groupId>-->
+        <!--<artifactId>genesis-maven-plugin</artifactId>-->
+        <!--<executions>-->
+        <!--<execution>-->
+        <!--<goals>-->
+        <!--<goal>validate-release-stage-configuration</goal>-->
+        <!--</goals>-->
+        <!--</execution>-->
+        <!--</executions>-->
+        <!--</plugin>-->
+        <!--</plugins>-->
+        <!--</build>-->
         <!--</profile>-->
-        
+
         <profile>
             <id>license-check</id>
 

Modified: geronimo/genesis/trunk/genesis-maven-plugin/src/main/groovy/org/apache/geronimo/genesis/plugin/ValidateReleaseConfigurationMojo.groovy
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/genesis-maven-plugin/src/main/groovy/org/apache/geronimo/genesis/plugin/ValidateReleaseConfigurationMojo.groovy?rev=780069&r1=780068&r2=780069&view=diff
==============================================================================
--- geronimo/genesis/trunk/genesis-maven-plugin/src/main/groovy/org/apache/geronimo/genesis/plugin/ValidateReleaseConfigurationMojo.groovy
(original)
+++ geronimo/genesis/trunk/genesis-maven-plugin/src/main/groovy/org/apache/geronimo/genesis/plugin/ValidateReleaseConfigurationMojo.groovy
Fri May 29 18:55:43 2009
@@ -51,9 +51,9 @@
         }
         
         // Make sure that we have a configured GPG passphrase
-        def phrase = project.properties['release.gpgPassphrase']
+        def phrase = project.properties['gpg.passphrase']
         if (phrase == null || phrase.trim() == '') {
-            fail('Missing required property: release.gpgPassphrase')
+            fail('Missing required property: gpg.passphrase')
         }
     }
 }

Modified: geronimo/genesis/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/pom.xml?rev=780069&r1=780068&r2=780069&view=diff
==============================================================================
--- geronimo/genesis/trunk/pom.xml (original)
+++ geronimo/genesis/trunk/pom.xml Fri May 29 18:55:43 2009
@@ -103,11 +103,11 @@
         </mailingList>
 
         <!--<mailingList>-->
-            <!--<name>Apache Announce List</name>-->
-            <!--<subscribe>announce-subscribe@apache.org</subscribe>-->
-            <!--<unsubscribe>announce-unsubscribe@apache.org</unsubscribe>-->
-            <!--<post>announce@apache.org</post>-->
-            <!--<archive>http://mail-archives.apache.org/mod_mbox/www-announce</archive>-->
+        <!--<name>Apache Announce List</name>-->
+        <!--<subscribe>announce-subscribe@apache.org</subscribe>-->
+        <!--<unsubscribe>announce-unsubscribe@apache.org</unsubscribe>-->
+        <!--<post>announce@apache.org</post>-->
+        <!--<archive>http://mail-archives.apache.org/mod_mbox/www-announce</archive>-->
         <!--</mailingList>-->
     </mailingLists>
 
@@ -130,18 +130,18 @@
         </repository>
 
         <!--<repository>-->
-            <!--<id>apache.snapshots</id>-->
-            <!--<name>Apache Snapshots Repository</name>-->
-            <!--<url>http://people.apache.org/repo/m2-snapshot-repository</url>-->
-            <!--<layout>default</layout>-->
-            <!--<snapshots>-->
-                <!--<enabled>true</enabled>-->
-                <!--<updatePolicy>daily</updatePolicy>-->
-                <!--<checksumPolicy>ignore</checksumPolicy>-->
-            <!--</snapshots>-->
-            <!--<releases>-->
-                <!--<enabled>false</enabled>-->
-            <!--</releases>-->
+        <!--<id>apache.snapshots</id>-->
+        <!--<name>Apache Snapshots Repository</name>-->
+        <!--<url>http://people.apache.org/repo/m2-snapshot-repository</url>-->
+        <!--<layout>default</layout>-->
+        <!--<snapshots>-->
+        <!--<enabled>true</enabled>-->
+        <!--<updatePolicy>daily</updatePolicy>-->
+        <!--<checksumPolicy>ignore</checksumPolicy>-->
+        <!--</snapshots>-->
+        <!--<releases>-->
+        <!--<enabled>false</enabled>-->
+        <!--</releases>-->
         <!--</repository>-->
 
         <!--
@@ -234,9 +234,9 @@
             <plugins>
 
                 <!--<plugin>-->
-                    <!--<groupId>org.apache.maven.plugins</groupId>-->
-                    <!--<artifactId>maven-antrun-plugin</artifactId>-->
-                    <!--<version>1.3</version>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-antrun-plugin</artifactId>-->
+                <!--<version>1.3</version>-->
                 <!--</plugin>-->
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -246,7 +246,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-assembly-plugin</artifactId>
-                    <version>2.2-beta-2</version>
+                    <version>2.2-beta-4</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -267,15 +267,15 @@
                 </plugin>
 
                 <!--<plugin>-->
-                    <!--<groupId>org.apache.maven.plugins</groupId>-->
-                    <!--<artifactId>maven-clean-plugin</artifactId>-->
-                    <!--<version>2.3</version>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-clean-plugin</artifactId>-->
+                <!--<version>2.3</version>-->
                 <!--</plugin>-->
 
                 <!--<plugin>-->
-                    <!--<groupId>org.apache.maven.plugins</groupId>-->
-                    <!--<artifactId>maven-compiler-plugin</artifactId>-->
-                    <!--<version>2.0.2</version>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-compiler-plugin</artifactId>-->
+                <!--<version>2.0.2</version>-->
                 <!--</plugin>-->
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -283,14 +283,14 @@
                     <version>2.1</version>
                 </plugin>
                 <!--<plugin>-->
-                    <!--<groupId>org.apache.maven.plugins</groupId>-->
-                    <!--<artifactId>maven-deploy-plugin</artifactId>-->
-                    <!--<version>2.4</version>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-deploy-plugin</artifactId>-->
+                <!--<version>2.4</version>-->
                 <!--</plugin>-->
                 <!--<plugin>-->
-                    <!--<groupId>org.apache.maven.plugins</groupId>-->
-                    <!--<artifactId>maven-docck-plugin</artifactId>-->
-                    <!--<version>1.0</version>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-docck-plugin</artifactId>-->
+                <!--<version>1.0</version>-->
                 <!--</plugin>-->
 
                 <plugin>
@@ -300,9 +300,9 @@
                 </plugin>
 
                 <!--<plugin>-->
-                    <!--<groupId>org.apache.maven.plugins</groupId>-->
-                    <!--<artifactId>maven-eclipse-plugin</artifactId>-->
-                    <!--<version>2.5.1</version>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-eclipse-plugin</artifactId>-->
+                <!--<version>2.5.1</version>-->
                 <!--</plugin>-->
 
                 <plugin>
@@ -311,14 +311,14 @@
                     <version>2.1</version>
                 </plugin>
                 <!--<plugin>-->
-                    <!--<groupId>org.apache.maven.plugins</groupId>-->
-                    <!--<artifactId>maven-enforcer-plugin</artifactId>-->
-                    <!--<version>1.0-beta-1</version>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-enforcer-plugin</artifactId>-->
+                <!--<version>1.0-beta-1</version>-->
                 <!--</plugin>-->
                 <!--<plugin>-->
-                    <!--<groupId>org.apache.maven.plugins</groupId>-->
-                    <!--<artifactId>maven-gpg-plugin</artifactId>-->
-                    <!--<version>1.0-alpha-4</version>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-gpg-plugin</artifactId>-->
+                <!--<version>1.0-alpha-4</version>-->
                 <!--</plugin>-->
 
                 <plugin>
@@ -328,19 +328,19 @@
                 </plugin>
 
                 <!--<plugin>-->
-                    <!--<groupId>org.apache.maven.plugins</groupId>-->
-                    <!--<artifactId>maven-install-plugin</artifactId>-->
-                    <!--<version>2.2</version>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-install-plugin</artifactId>-->
+                <!--<version>2.2</version>-->
                 <!--</plugin>-->
                 <!--<plugin>-->
-                    <!--<groupId>org.apache.maven.plugins</groupId>-->
-                    <!--<artifactId>maven-jar-plugin</artifactId>-->
-                    <!--<version>2.2</version>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-jar-plugin</artifactId>-->
+                <!--<version>2.2</version>-->
                 <!--</plugin>-->
                 <!--<plugin>-->
-                    <!--<groupId>org.apache.maven.plugins</groupId>-->
-                    <!--<artifactId>maven-javadoc-plugin</artifactId>-->
-                    <!--<version>2.5</version>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-javadoc-plugin</artifactId>-->
+                <!--<version>2.5</version>-->
                 <!--</plugin>-->
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -348,9 +348,9 @@
                     <version>2.1</version>
                 </plugin>
                 <!--<plugin>-->
-                    <!--<groupId>org.apache.maven.plugins</groupId>-->
-                    <!--<artifactId>maven-plugin-plugin</artifactId>-->
-                    <!--<version>2.4.2</version>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-plugin-plugin</artifactId>-->
+                <!--<version>2.4.2</version>-->
                 <!--</plugin>-->
 
                 <plugin>
@@ -360,9 +360,9 @@
                 </plugin>
 
                 <!--<plugin>-->
-                    <!--<groupId>org.apache.maven.plugins</groupId>-->
-                    <!--<artifactId>maven-project-info-reports-plugin</artifactId>-->
-                    <!--<version>2.1</version>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-project-info-reports-plugin</artifactId>-->
+                <!--<version>2.1</version>-->
                 <!--</plugin>-->
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -375,9 +375,9 @@
                     <version>1.0</version>
                 </plugin>
                 <!--<plugin>-->
-                    <!--<groupId>org.apache.maven.plugins</groupId>-->
-                    <!--<artifactId>maven-release-plugin</artifactId>-->
-                    <!--<version>2.0-beta-8</version>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-release-plugin</artifactId>-->
+                <!--<version>2.0-beta-8</version>-->
                 <!--</plugin>-->
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -392,15 +392,15 @@
                     </configuration>
                 </plugin>
                 <!--<plugin>-->
-                    <!--<groupId>org.apache.maven.plugins</groupId>-->
-                    <!--<artifactId>maven-remote-resources-plugin</artifactId>-->
-                    <!--<version>1.0</version>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-remote-resources-plugin</artifactId>-->
+                <!--<version>1.0</version>-->
                 <!--</plugin>-->
 
                 <!--<plugin>-->
-                    <!--<groupId>org.apache.maven.plugins</groupId>-->
-                    <!--<artifactId>maven-resources-plugin</artifactId>-->
-                    <!--<version>2.3</version>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-resources-plugin</artifactId>-->
+                <!--<version>2.3</version>-->
                 <!--</plugin>-->
 
 
@@ -417,22 +417,22 @@
                     <version>2.0-beta-7</version>
                 </plugin>
                 <!--<plugin>-->
-                    <!--<groupId>org.apache.maven.plugins</groupId>-->
-                    <!--<artifactId>maven-source-plugin</artifactId>-->
-                    <!--<version>2.0.4</version>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-source-plugin</artifactId>-->
+                <!--<version>2.0.4</version>-->
                 <!--</plugin>-->
 
                 <!--<plugin>-->
-                    <!--<groupId>org.apache.maven.plugins</groupId>-->
-                    <!--<artifactId>maven-stage-plugin</artifactId>-->
-                    <!--<version>1.0-alpha-1</version>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-stage-plugin</artifactId>-->
+                <!--<version>1.0-alpha-1</version>-->
                 <!--</plugin>-->
 
 
                 <!--<plugin>-->
-                    <!--<groupId>org.apache.maven.plugins</groupId>-->
-                    <!--<artifactId>maven-surefire-plugin</artifactId>-->
-                    <!--<version>2.4.3</version>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-surefire-plugin</artifactId>-->
+                <!--<version>2.4.3</version>-->
                 <!--</plugin>-->
 
                 <plugin>
@@ -453,13 +453,6 @@
                 </plugin>
 
 
-                <plugin>
-                    <groupId>org.codehaus.groovy.maven</groupId>
-                    <artifactId>gmaven-plugin</artifactId>
-                    <version>1.0-rc-3</version>
-                </plugin>
-
-
                 <!--<plugin>-->
                 <!--<groupId>org.apache.maven.plugins</groupId>-->
                 <!--<artifactId>maven-idea-plugin</artifactId>-->
@@ -477,11 +470,17 @@
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
-                    <version>1.4.3</version>
+                    <version>2.0.0</version>
                     <extensions>true</extensions>
                 </plugin>
 
                 <plugin>
+                    <groupId>org.codehaus.groovy.maven</groupId>
+                    <artifactId>gmaven-plugin</artifactId>
+                    <version>1.0-rc-3</version>
+                </plugin>
+
+                <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>build-helper-maven-plugin</artifactId>
                     <version>1.1</version>
@@ -559,19 +558,19 @@
     </build>
 
     <!--<distributionManagement>-->
-        <!--<repository>-->
-            <!--<id>apache.releases</id>-->
-            <!--<name>Apache Release Repository</name>-->
-            <!--<url>scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>-->
-        <!--</repository>-->
-
-        <!--<snapshotRepository>-->
-            <!--<id>apache.snapshots</id>-->
-            <!--<name>Apache Development Repository</name>-->
-            <!--<url>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>-->
-            <!-- Turn off snapshot timestamps, as requested by Infra -->
-            <!--<uniqueVersion>false</uniqueVersion>-->
-        <!--</snapshotRepository>-->
+    <!--<repository>-->
+    <!--<id>apache.releases</id>-->
+    <!--<name>Apache Release Repository</name>-->
+    <!--<url>scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>-->
+    <!--</repository>-->
+
+    <!--<snapshotRepository>-->
+    <!--<id>apache.snapshots</id>-->
+    <!--<name>Apache Development Repository</name>-->
+    <!--<url>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>-->
+    <!-- Turn off snapshot timestamps, as requested by Infra -->
+    <!--<uniqueVersion>false</uniqueVersion>-->
+    <!--</snapshotRepository>-->
     <!--</distributionManagement>-->
 
     <profiles>
@@ -584,129 +583,135 @@
             </activation>
             <build>
                 <plugins>
-
+                    <!-- waiting for release -->
                     <!--<plugin>-->
                         <!--<groupId>org.apache.maven.plugins</groupId>-->
-                        <!--<artifactId>maven-gpg-plugin</artifactId>-->
+                        <!--<artifactId>maven-assembly-plugin</artifactId>-->
                         <!--<executions>-->
                             <!--<execution>-->
                                 <!--<goals>-->
-                                    <!--<goal>sign</goal>-->
+                                    <!--<goal>single</goal>-->
                                 <!--</goals>-->
+                                <!--<phase>validate</phase>-->
                                 <!--<configuration>-->
-                                    <!--<passphrase>${release.gpgPassphrase}</passphrase>-->
+                                    <!--<runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>-->
+                                    <!--<descriptorRefs>-->
+                                        <!--<descriptorRef>-->
+                                            <!--source-release-->
+                                        <!--</descriptorRef>-->
+                                    <!--</descriptorRefs>-->
                                 <!--</configuration>-->
                             <!--</execution>-->
                         <!--</executions>-->
+                        <!--<dependencies>-->
+                            <!--<dependency>-->
+                                <!--<groupId>org.apache</groupId>-->
+                                <!--<artifactId>apache-source-release-assembly-descriptor</artifactId>-->
+                                <!--<version>1.0-SNAPSHOT</version>-->
+                            <!--</dependency>-->
+                        <!--</dependencies>-->
                     <!--</plugin>-->
 
-                    <!--<plugin>-->
-                        <!--<groupId>org.apache.maven.plugins</groupId>-->
-                        <!--<artifactId>maven-deploy-plugin</artifactId>-->
-                        <!--<configuration>-->
-                            <!--<updateReleaseInfo>true</updateReleaseInfo>-->
-                        <!--</configuration>-->
-                    <!--</plugin>-->
                 </plugins>
             </build>
         </profile>
 
         <!--<profile>-->
-            <!--<id>release-stage</id>-->
-            <!--<activation>-->
-                <!--<property>-->
-                    <!--<name>release</name>-->
-                    <!--<value>stage</value>-->
-                <!--</property>-->
-            <!--</activation>-->
-            <!--<build>-->
-                <!--<plugins>-->
-                    <!--<plugin>-->
-                        <!--<groupId>org.apache.maven.plugins</groupId>-->
-                        <!--<artifactId>maven-release-plugin</artifactId>-->
-                        <!--<configuration>-->
-                            <!--<arguments>-Drelease=stage</arguments>-->
-                        <!--</configuration>-->
-                    <!--</plugin>-->
-
-                    <!--<plugin>-->
-                        <!--<groupId>org.apache.maven.plugins</groupId>-->
-                        <!--<artifactId>maven-deploy-plugin</artifactId>-->
-                        <!--<configuration>-->
-                            <!--<altDeploymentRepository>stage-deploy::default::${release.stageDeployUrl}-->
-                            <!--</altDeploymentRepository>-->
-                        <!--</configuration>-->
-                    <!--</plugin>-->
-
-                    <!--<plugin>-->
-                        <!--<groupId>org.apache.maven.plugins</groupId>-->
-                        <!--<artifactId>maven-site-plugin</artifactId>-->
-                        <!--<configuration>-->
-                            <!--<stagingSiteURL>${release.siteStageDeployUrl}</stagingSiteURL>-->
-                        <!--</configuration>-->
-                    <!--</plugin>-->
-                <!--</plugins>-->
-            <!--</build>-->
+        <!--<id>release-stage</id>-->
+        <!--<activation>-->
+        <!--<property>-->
+        <!--<name>release</name>-->
+        <!--<value>stage</value>-->
+        <!--</property>-->
+        <!--</activation>-->
+        <!--<build>-->
+        <!--<plugins>-->
+        <!--<plugin>-->
+        <!--<groupId>org.apache.maven.plugins</groupId>-->
+        <!--<artifactId>maven-release-plugin</artifactId>-->
+        <!--<configuration>-->
+        <!--<arguments>-Drelease=stage</arguments>-->
+        <!--</configuration>-->
+        <!--</plugin>-->
+
+        <!--<plugin>-->
+        <!--<groupId>org.apache.maven.plugins</groupId>-->
+        <!--<artifactId>maven-deploy-plugin</artifactId>-->
+        <!--<configuration>-->
+        <!--<altDeploymentRepository>stage-deploy::default::${release.stageDeployUrl}-->
+        <!--</altDeploymentRepository>-->
+        <!--</configuration>-->
+        <!--</plugin>-->
+
+        <!--<plugin>-->
+        <!--<groupId>org.apache.maven.plugins</groupId>-->
+        <!--<artifactId>maven-site-plugin</artifactId>-->
+        <!--<configuration>-->
+        <!--<stagingSiteURL>${release.siteStageDeployUrl}</stagingSiteURL>-->
+        <!--</configuration>-->
+        <!--</plugin>-->
+        <!--</plugins>-->
+        <!--</build>-->
         <!--</profile>-->
 
         <!--<profile>-->
-            <!--<id>distribution</id>-->
-            <!--<activation>-->
-                <!--<property>-->
-                    <!--<name>release</name>-->
-                <!--</property>-->
-            <!--</activation>-->
-            <!--<build>-->
-                <!--<plugins>-->
-                    <!--<plugin>-->
-                        <!--<groupId>org.apache.maven.plugins</groupId>-->
-                        <!--<artifactId>maven-source-plugin</artifactId>-->
-                        <!--<executions>-->
-                            <!--<execution>-->
-                                <!--<goals>-->
-                                    <!--<goal>jar</goal>-->
-                                <!--</goals>-->
-                            <!--</execution>-->
-                        <!--</executions>-->
-                    <!--</plugin>-->
-
-                    <!--<plugin>-->
-                        <!--<groupId>org.apache.maven.plugins</groupId>-->
-                        <!--<artifactId>maven-javadoc-plugin</artifactId>-->
-                        <!--<executions>-->
-                            <!--<execution>-->
-                                <!--<goals>-->
-                                    <!--<goal>javadoc</goal>-->
-                                    <!--<goal>jar</goal>-->
-                                <!--</goals>-->
-                            <!--</execution>-->
-                        <!--</executions>-->
-                    <!--</plugin>-->
-                <!--</plugins>-->
-            <!--</build>-->
+        <!--<id>distribution</id>-->
+        <!--<activation>-->
+        <!--<property>-->
+        <!--<name>release</name>-->
+        <!--</property>-->
+        <!--</activation>-->
+        <!--<build>-->
+        <!--<plugins>-->
+        <!--<plugin>-->
+        <!--<groupId>org.apache.maven.plugins</groupId>-->
+        <!--<artifactId>maven-source-plugin</artifactId>-->
+        <!--<executions>-->
+        <!--<execution>-->
+        <!--<goals>-->
+        <!--<goal>jar</goal>-->
+        <!--</goals>-->
+        <!--</execution>-->
+        <!--</executions>-->
+        <!--</plugin>-->
+
+        <!--<plugin>-->
+        <!--<groupId>org.apache.maven.plugins</groupId>-->
+        <!--<artifactId>maven-javadoc-plugin</artifactId>-->
+        <!--<executions>-->
+        <!--<execution>-->
+        <!--<goals>-->
+        <!--<goal>javadoc</goal>-->
+        <!--<goal>jar</goal>-->
+        <!--</goals>-->
+        <!--</execution>-->
+        <!--</executions>-->
+        <!--</plugin>-->
+        <!--</plugins>-->
+        <!--</build>-->
         <!--</profile>-->
 
         <!--<profile>-->
-            <!--<id>test-distribution</id>-->
-            <!--<activation>-->
-                <!--<property>-->
-                    <!--<name>testDistributionUrl</name>-->
-                <!--</property>-->
-            <!--</activation>-->
-            <!--<distributionManagement>-->
-                <!--<repository>-->
-                    <!--<id>test-repository</id>-->
-                    <!--<url>${testDistributionUrl}/releases</url>-->
-                <!--</repository>-->
-                <!--<snapshotRepository>-->
-                    <!--<id>test-snapshot-repository</id>-->
-                    <!--<url>${testDistributionUrl}/snapshots</url>-->
-                <!--</snapshotRepository>-->
-                <!--<site>-->
-                    <!--<id>test-site</id>-->
-                    <!--<url>${testDistributionUrl}/site</url>-->
-                <!--</site>-->
-            <!--</distributionManagement>-->
+        <!--<id>test-distribution</id>-->
+        <!--<activation>-->
+        <!--<property>-->
+        <!--<name>testDistributionUrl</name>-->
+        <!--</property>-->
+        <!--</activation>-->
+        <!--<distributionManagement>-->
+        <!--<repository>-->
+        <!--<id>test-repository</id>-->
+        <!--<url>${testDistributionUrl}/releases</url>-->
+        <!--</repository>-->
+        <!--<snapshotRepository>-->
+        <!--<id>test-snapshot-repository</id>-->
+        <!--<url>${testDistributionUrl}/snapshots</url>-->
+        <!--</snapshotRepository>-->
+        <!--<site>-->
+        <!--<id>test-site</id>-->
+        <!--<url>${testDistributionUrl}/site</url>-->
+        <!--</site>-->
+        <!--</distributionManagement>-->
         <!--</profile>-->
 
         <profile>



Mime
View raw message