You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2010/08/04 21:51:57 UTC
svn commit: r982384 - in /tiles/sandbox/trunk/tiles3: ./ pom.xml
Author: apetrelli
Date: Wed Aug 4 19:51:57 2010
New Revision: 982384
URL: http://svn.apache.org/viewvc?rev=982384&view=rev
Log:
TILES-481
Merge from trunk to sandboxed Tiles 3.
Fixed uploading of assemblies in the release process.
Modified:
tiles/sandbox/trunk/tiles3/ (props changed)
tiles/sandbox/trunk/tiles3/pom.xml
Propchange: tiles/sandbox/trunk/tiles3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 4 19:51:57 2010
@@ -1 +1 @@
-/tiles/framework/trunk:829356,836356,880940,880948,887758,900938-902966,904552,921998,931637,949559,950449
+/tiles/framework/trunk:829356,836356,880940,880948,887758,900938-902966,904552,921998,931637,949559,950449,982366-982367
Modified: tiles/sandbox/trunk/tiles3/pom.xml
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/pom.xml?rev=982384&r1=982383&r2=982384&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/pom.xml (original)
+++ tiles/sandbox/trunk/tiles3/pom.xml Wed Aug 4 19:51:57 2010
@@ -64,11 +64,6 @@
</modules>
<distributionManagement>
- <repository>
- <id>apache.releases</id>
- <name>Apache Release repository</name>
- <url>scp://people.apache.org/repo/m2-ibiblio-rsync-repository/</url>
- </repository>
<site>
<id>apache-site</id>
<url>scp://people.apache.org/www/tiles.apache.org/framework</url>
@@ -147,10 +142,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-9</version>
<configuration>
- <stagingRepository>scp://people.apache.org/www/people.apache.org/builds/tiles/${pom.version}/m2-staging-repository</stagingRepository>
- <releaseProfiles>release</releaseProfiles>
+ <releaseProfiles>apache-release</releaseProfiles><!-- xxx tiles still uses "release" instead of "apache-release" -->
+ <goals>deploy site-deploy</goals>
</configuration>
</plugin>
</plugins>
@@ -255,52 +249,14 @@
<profiles>
<profile>
- <id>release</id>
- <activation>
- <property>
- <name>release</name>
- </property>
- </activation>
+ <id>apache-release</id>
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.0-alpha-4</version>
- <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-source-plugin</artifactId>
- <version>2.1</version>
- <executions>
- <execution>
- <id>attach-source</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-javadoc</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
+ <artifactId>maven-install-plugin</artifactId>
+ <configuration>
+ <createChecksum>true</createChecksum>
+ </configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>