You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whirr.apache.org by to...@apache.org on 2010/09/10 01:00:45 UTC
svn commit: r995605 - in /incubator/whirr/branches/branch-0.1: CHANGES.txt
pom.xml
Author: tomwhite
Date: Thu Sep 9 23:00:44 2010
New Revision: 995605
URL: http://svn.apache.org/viewvc?rev=995605&view=rev
Log:
Merge -r 995601:995602 from trunk to branch-0.1. Fixes: WHIRR-85
Modified:
incubator/whirr/branches/branch-0.1/CHANGES.txt
incubator/whirr/branches/branch-0.1/pom.xml
Modified: incubator/whirr/branches/branch-0.1/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/whirr/branches/branch-0.1/CHANGES.txt?rev=995605&r1=995604&r2=995605&view=diff
==============================================================================
--- incubator/whirr/branches/branch-0.1/CHANGES.txt (original)
+++ incubator/whirr/branches/branch-0.1/CHANGES.txt Thu Sep 9 23:00:44 2010
@@ -60,6 +60,9 @@ Release 0.1.0 - 2010-09-02
WHIRR-80. Clean up POM dependencies. (tomwhite)
+ WHIRR-85. Publish Maven artifacts to http://repository.apache.org.
+ (tomwhite)
+
BUG FIXES
WHIRR-50. Cassandra POM should depend on top-level. (tomwhite)
Modified: incubator/whirr/branches/branch-0.1/pom.xml
URL: http://svn.apache.org/viewvc/incubator/whirr/branches/branch-0.1/pom.xml?rev=995605&r1=995604&r2=995605&view=diff
==============================================================================
--- incubator/whirr/branches/branch-0.1/pom.xml (original)
+++ incubator/whirr/branches/branch-0.1/pom.xml Thu Sep 9 23:00:44 2010
@@ -18,10 +18,22 @@
<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</groupId>
+ <artifactId>apache</artifactId>
+ <version>7</version>
+ </parent>
+
<groupId>org.apache.whirr</groupId>
<artifactId>whirr</artifactId>
<version>0.1.0-incubating</version>
<packaging>pom</packaging>
+
+ <name>Whirr</name>
+ <description>Libraries for running cloud services</description>
+ <url>http://incubator.apache.org/whirr</url>
+ <inceptionYear>2010</inceptionYear>
<modules>
<module>build-tools</module>
@@ -159,6 +171,26 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0-beta-1</version>
+ <executions>
+ <execution>
+ <id>enforce-java</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>[2.2.1,)</version>
+ </requireMavenVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.3.1</version>
<configuration>
@@ -309,22 +341,7 @@
</plugin>
</plugins>
</reporting>
-
- <name>Whirr</name>
- <description>Libraries for running cloud services</description>
- <url>http://incubator.apache.org/whirr</url>
- <inceptionYear>2010</inceptionYear>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <organization>
- <name>Apache Software Foundation</name>
- <url>http://www.apache.org</url>
- </organization>
+
<developers>
<developer>
<id>apurtell</id>
@@ -421,6 +438,14 @@
</scm>
<repositories>
<repository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ <repository>
<id>jclouds</id>
<url>http://jclouds.googlecode.com/svn/repo</url>
</repository>
@@ -436,17 +461,6 @@
<id>apache.website</id>
<url>scpexe://people.apache.org/www/incubator.apache.org/whirr</url>
</site>
- <repository>
- <id>whirr-repo</id>
- <name>Whirr staging repo</name>
- <url>scpexe://people.apache.org/home/tomwhite/public_html/whirr-repo</url>
- </repository>
- <snapshotRepository>
- <id>whirr-snapshot-repo</id>
- <name>Whirr snapshot staging repo</name>
- <url>scpexe://people.apache.org/home/tomwhite/public_html/whirr-snapshot-repo</url>
- <!-- <url>file:///tmp/m2-repo</url> --> <!-- Uncomment to try locally. -->
- </snapshotRepository>
</distributionManagement>
<profiles>
<profile>