geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r1487273 - in /geronimo/devtools/maven-plugins/trunk: ./ eclipsepde-maven-plugin/ maven-eclipsepde-plugin/ maven-eclipsepde-plugin/src/ maven-eclipsepde-plugin/src/main/ maven-eclipsepde-plugin/src/main/java/ maven-eclipsepde-plugin/src/mai...
Date Wed, 29 May 2013 05:42:00 GMT
Author: xiaming
Date: Wed May 29 05:42:00 2013
New Revision: 1487273

URL: http://svn.apache.org/r1487273
Log:
GERONIMODEVTOOLS-811 released new plugin not work, so revert the changes

Added:
    geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/   (props changed)
      - copied from r1393849, geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/
    geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/LICENSE
      - copied unchanged from r1393849, geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/LICENSE
    geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/NOTICE
      - copied unchanged from r1393849, geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/NOTICE
    geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/pom.xml
      - copied unchanged from r1393849, geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/pom.xml
    geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/
      - copied from r1393849, geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/
    geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/
      - copied from r1393849, geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/
    geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/
      - copied from r1393849, geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/
    geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/
      - copied from r1393849, geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/
    geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/
      - copied from r1393849, geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/
    geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/
      - copied from r1393849, geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/
    geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/
      - copied from r1393849, geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/
    geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/
      - copied from r1393849, geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/
    geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/
      - copied from r1393849, geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/
    geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/BundleQualifierMojo.java
      - copied unchanged from r1393849, geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/BundleQualifierMojo.java
    geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/ClasspathMojo.java
      - copied unchanged from r1393849, geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/ClasspathMojo.java
    geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/InstallPluginDependenciesMojo.java
      - copied unchanged from r1393849, geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/InstallPluginDependenciesMojo.java
    geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/ManifestDependenciesMojo.java
      - copied unchanged from r1393849, geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/ManifestDependenciesMojo.java
    geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/PluginDescriptorMojo.java
      - copied unchanged from r1393849, geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/PluginDescriptorMojo.java
    geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/ValidateManifestMojo.java
      - copied unchanged from r1393849, geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/ValidateManifestMojo.java
    geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/VelocityMojo.java
      - copied unchanged from r1393849, geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/src/main/java/org/apache/geronimo/devtools/plugins/eclipsepde/VelocityMojo.java
Removed:
    geronimo/devtools/maven-plugins/trunk/eclipsepde-maven-plugin/
Modified:
    geronimo/devtools/maven-plugins/trunk/NOTICE
    geronimo/devtools/maven-plugins/trunk/pom.xml

Modified: geronimo/devtools/maven-plugins/trunk/NOTICE
URL: http://svn.apache.org/viewvc/geronimo/devtools/maven-plugins/trunk/NOTICE?rev=1487273&r1=1487272&r2=1487273&view=diff
==============================================================================
--- geronimo/devtools/maven-plugins/trunk/NOTICE (original)
+++ geronimo/devtools/maven-plugins/trunk/NOTICE Wed May 29 05:42:00 2013
@@ -4,7 +4,7 @@
 =========================================================================
 
 Apache Geronimo Eclipse Maven Plugins
-Copyright 2003-2013 The Apache Software Foundation
+Copyright 2003-2011 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).

Propchange: geronimo/devtools/maven-plugins/trunk/maven-eclipsepde-plugin/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed May 29 05:42:00 2013
@@ -0,0 +1,3 @@
+*.iws
+*.ipr
+*.iml

Modified: geronimo/devtools/maven-plugins/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/maven-plugins/trunk/pom.xml?rev=1487273&r1=1487272&r2=1487273&view=diff
==============================================================================
--- geronimo/devtools/maven-plugins/trunk/pom.xml (original)
+++ geronimo/devtools/maven-plugins/trunk/pom.xml Wed May 29 05:42:00 2013
@@ -23,12 +23,12 @@
     <artifactId>maven-plugins</artifactId>
     <name>${artifactId}</name>
     <packaging>pom</packaging>
-    <version>1.3-SNAPSHOT</version>
+    <version>1.2-SNAPSHOT</version>
 
     <parent>
         <groupId>org.apache</groupId>
         <artifactId>apache</artifactId>
-        <version>13</version>
+        <version>6</version>
     </parent>
 
     <description>Apache Geronimo Devtools Maven Plugins</description>
@@ -133,8 +133,7 @@
     <modules>
         <!--maven-emf-plugin is not in use any more-->
         <!--module>maven-emf-plugin</module-->
-        <!-- maven-__-plugin is reserved for groupId org.apache.maven.plugins, so change
this plugin name -->
-        <module>eclipsepde-maven-plugin</module>
+        <module>maven-eclipsepde-plugin</module>
     </modules>
 
     <build>
@@ -161,13 +160,11 @@
                  <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-release-plugin</artifactId>
-                    <version>2.3.2</version>
                    <configuration>
                         <useReleaseProfile>false</useReleaseProfile> 
                         <allowTimestampedSnapshots>false</allowTimestampedSnapshots>
                         <preparationGoals>clean install</preparationGoals>
                         <goals>deploy</goals>
-                        <autoVersionSubmodules>true</autoVersionSubmodules>
                     </configuration>
                 </plugin>
 
@@ -227,4 +224,61 @@
         </plugins>
     </build>
     
+    <profiles>
+ <!-- this profile is copied from genesis-default-flava and genesis 2.0  -->
+         <profile>
+            <id>apache-release</id>
+            <activation>
+                <property>
+                   <name>apache-release</name>
+                </property>
+            </activation>
+            <build>
+            <plugins>
+                <!-- waiting for release -->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <inherited>false</inherited>
+                    <executions>
+                        <execution>
+                            <goals>
+                             <goal>single</goal>
+                            </goals>
+                            <phase>package</phase>
+                            <configuration>
+                                <runOnlyAtExecutionRoot>false</runOnlyAtExecutionRoot>
+                                <descriptorRefs>
+                                    <descriptorRef>source-release</descriptorRef>
+                                </descriptorRefs>
+                            </configuration>
+                        </execution>
+                    </executions>
+                    <dependencies>
+                        <dependency>
+                            <!-- apache version not yet released -->
+                            <!--<groupId>org.apache</groupId>-->
+                            <groupId>org.apache.geronimo.genesis</groupId>
+                            <artifactId>apache-source-release-assembly-descriptor</artifactId>
+                            <!-- apache version not yet known -->
+                            <version>2.0</version>
+                        </dependency>
+                    </dependencies>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.geronimo.genesis</groupId>
+                    <artifactId>genesis-maven-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <goals>
+                              <goal>validate-release-configuration</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+            </build>
+         </profile>
+    </profiles>
 </project>



Mime
View raw message