You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by de...@apache.org on 2010/07/08 08:07:46 UTC
svn commit: r961579 - in /geronimo/devtools/eclipse-plugin/branches/2.1.6:
assembly/src/main/assembly/deployable.xml
assembly/src/main/assembly/updatesite.xml eclipse/pom.xml features/pom.xml
plugins/pom.xml pom.xml testsuite/pom.xml
Author: delos
Date: Thu Jul 8 06:07:46 2010
New Revision: 961579
URL: http://svn.apache.org/viewvc?rev=961579&view=rev
Log:
update parent to apache 6 for 2.1 branch
Modified:
geronimo/devtools/eclipse-plugin/branches/2.1.6/assembly/src/main/assembly/deployable.xml
geronimo/devtools/eclipse-plugin/branches/2.1.6/assembly/src/main/assembly/updatesite.xml
geronimo/devtools/eclipse-plugin/branches/2.1.6/eclipse/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.1.6/features/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.1.6/plugins/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.1.6/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.1.6/testsuite/pom.xml
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.6/assembly/src/main/assembly/deployable.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.6/assembly/src/main/assembly/deployable.xml?rev=961579&r1=961578&r2=961579&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.6/assembly/src/main/assembly/deployable.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.6/assembly/src/main/assembly/deployable.xml Thu Jul 8 06:07:46 2010
@@ -51,7 +51,7 @@
|
-->
<dependencySet>
- <outputFileNameMapping>${artifactId}_${version}.${extension}</outputFileNameMapping>
+ <outputFileNameMapping>${artifact.artifactId}_${artifact.version}.${artifact.extension}</outputFileNameMapping>
<outputDirectory>eclipse/plugins/</outputDirectory>
<unpack>false</unpack>
<includes>
@@ -75,8 +75,7 @@
|
-->
<dependencySet>
- <outputFileNameMapping>${artifactId}_${version}</outputFileNameMapping>
- <outputDirectory>eclipse/features/</outputDirectory>
+ <outputDirectory>eclipse/features/${artifact.artifactId}_${artifact.version}/</outputDirectory>
<unpack>true</unpack>
<includes>
<include>org.apache.geronimo.devtools:org.apache.geronimo.v21.feature</include>
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.6/assembly/src/main/assembly/updatesite.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.6/assembly/src/main/assembly/updatesite.xml?rev=961579&r1=961578&r2=961579&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.6/assembly/src/main/assembly/updatesite.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.6/assembly/src/main/assembly/updatesite.xml Thu Jul 8 06:07:46 2010
@@ -55,7 +55,7 @@
|
-->
<dependencySet>
- <outputFileNameMapping>${artifactId}_${version}.${extension}</outputFileNameMapping>
+ <outputFileNameMapping>${artifact.artifactId}_${artifact.version}.${artifact.extension}</outputFileNameMapping>
<outputDirectory>plugins/</outputDirectory>
<unpack>false</unpack>
<includes>
@@ -79,7 +79,7 @@
|
-->
<dependencySet>
- <outputFileNameMapping>${artifactId}_${version}.${extension}</outputFileNameMapping>
+ <outputFileNameMapping>${artifact.artifactId}_${artifact.version}.${artifact.extension}</outputFileNameMapping>
<outputDirectory>features/</outputDirectory>
<includes>
<include>org.apache.geronimo.devtools:org.apache.geronimo.v21.feature</include>
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.6/eclipse/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.6/eclipse/pom.xml?rev=961579&r1=961578&r2=961579&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.6/eclipse/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.6/eclipse/pom.xml Thu Jul 8 06:07:46 2010
@@ -56,6 +56,19 @@
</executions>
</plugin>
</plugins>
+
+
+ <pluginManagement>
+ <plugins>
+ <!-- skip deploy child artifacts in release process-->
+ <plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<profiles>
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.6/features/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.6/features/pom.xml?rev=961579&r1=961578&r2=961579&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.6/features/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.6/features/pom.xml Thu Jul 8 06:07:46 2010
@@ -29,7 +29,24 @@
<version>2.1.6-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <!-- skip deploy child artifacts in release process-->
+ <plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
<modules>
<module>org.apache.geronimo.v21.feature</module>
</modules>
+
+
</project>
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.6/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.6/plugins/pom.xml?rev=961579&r1=961578&r2=961579&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.6/plugins/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.6/plugins/pom.xml Thu Jul 8 06:07:46 2010
@@ -131,6 +131,13 @@
</filesets>
</configuration>
</plugin>
+ <!-- skip deploy child artifacts in release process-->
+ <plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.6/pom.xml?rev=961579&r1=961578&r2=961579&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.6/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.6/pom.xml Thu Jul 8 06:07:46 2010
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>5</version>
+ <version>6</version>
</parent>
<description>Apache Geronimo Eclipse Plugin and WTP Server Adapter</description>
@@ -272,7 +272,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-1</version>
+ <version>2.2-beta-4</version>
</plugin>
<plugin>
@@ -302,17 +302,26 @@
<version>1.0</version>
</plugin>
- <plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-9</version>
- <configuration>
- <useReleaseProfile>false</useReleaseProfile>
+ <configuration>
+ <useReleaseProfile>false</useReleaseProfile>
+ <allowTimestampedSnapshots>false</allowTimestampedSnapshots>
+ <preparationGoals>clean install</preparationGoals>
<goals>deploy</goals>
- <arguments>-Papache-release</arguments>
</configuration>
</plugin>
+ <!-- skip javadoc generation during release:prepare, which is a built-in process from org.apache 6 -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
@@ -555,94 +564,61 @@
</modules>
</profile>
- <profile>
- <id>apache-release</id>
- <build>
- <plugins>
- <!-- Create a source-release artifact that contains the fully buildable
- project directory source structure. This is the artifact which is
- the official subject of any release vote. -->
- <plugin>
- <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>
- </dependencies>
- <executions>
- <execution>
- <id>source-release-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
- <descriptorRefs>
- <descriptorRef>source-release</descriptorRef>
- </descriptorRefs>
- <tarLongFileFormat>gnu</tarLongFileFormat>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- We want to sign the artifact, the POM, and all attached artifacts -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <configuration>
- <passphrase>${gpg.passphrase}</passphrase>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <!-- We want to deploy the artifact to a staging location for perusal -->
- <plugin>
- <inherited>true</inherited>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <updateReleaseInfo>true</updateReleaseInfo>
- </configuration>
- </plugin>
- <!-- plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin-->
- <!--plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <encoding>${project.build.sourceEncoding}</encoding>
- </configuration>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin-->
- </plugins>
- </build>
-</profile>
+ <!-- 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>
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.6/testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.6/testsuite/pom.xml?rev=961579&r1=961578&r2=961579&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.6/testsuite/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.6/testsuite/pom.xml Thu Jul 8 06:07:46 2010
@@ -152,6 +152,17 @@
</configuration>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <!-- skip deploy child artifacts in release process-->
+ <plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<modules>