From ef361ce3ea7fc21cc8f95016d674e22883473f0d Mon Sep 17 00:00:00 2001
From: Andrew Phillips <demobox1@yahoo.co.uk>
Date: Thu, 26 Aug 2010 00:40:34 +0200
Subject: [PATCH] Issue 344:  setup our maven repository to sync with central

---
 pom.xml            |   1 +
 project/pom.xml    | 167 +++++++++++++++++++++++++++++----------------
 thirdparty/pom.xml |  13 ++++
 3 files changed, 123 insertions(+), 58 deletions(-)

diff --git a/pom.xml b/pom.xml
index 74e9c782f7..45f67aba87 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,6 +129,7 @@ pageTracker._trackPageview();
                     <!-- top-level only -->
                     <plugin>
                         <artifactId>maven-assembly-plugin</artifactId>
+                        <version>2.2-beta-5</version>
                         <inherited>false</inherited>
                         <executions>
                             <execution>
diff --git a/project/pom.xml b/project/pom.xml
index dc24ef89a7..3738d524d4 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -22,6 +22,11 @@
 
 <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.sonatype.oss</groupId>
+        <artifactId>oss-parent</artifactId>
+        <version>4</version>
+    </parent>
     <groupId>org.jclouds</groupId>
     <artifactId>jclouds-project</artifactId>
     <version>1.0-SNAPSHOT</version>
@@ -57,7 +62,7 @@
             <archive>http://groups.google.com/group/jclouds-contributors</archive>
         </mailingList>
         <mailingList>
-            <name>SVN Commits</name>
+            <name>Repository Commits</name>
             <subscribe>http://groups.google.com/group/jclouds-commits</subscribe>
             <unsubscribe>http://groups.google.com/group/jclouds-commits</unsubscribe>
             <post>jclouds-commits@googlegroups.com</post>
@@ -66,19 +71,19 @@
     </mailingLists>
 
     <scm>
-        <connection>scm:svn:http://jclouds.googlecode.com/svn/trunk</connection>
-        <developerConnection>scm:svn:https://jclouds.googlecode.com/svn/trunk</developerConnection>
-        <url>http://jclouds.googlecode.com/svn/trunk</url>
+        <connection>scm:git:git://github.com/jclouds/jclouds.git</connection>
+        <developerConnection>scm:git:ssh://git@github.com/jclouds/jclouds.git</developerConnection>
+        <url>http://github.com/jclouds/jclouds</url>
     </scm>
 
     <repositories>
-        <repository>
+        <!--repository>
             <id>repo2</id>
             <url>http://repo2.maven.org/maven2</url>
             <snapshots>
                 <enabled>false</enabled>
             </snapshots>
-        </repository>
+        </repository-->
         <repository>
             <id>jclouds-googlecode-deploy</id>
             <url>http://jclouds.googlecode.com/svn/repo</url>
@@ -95,7 +100,7 @@
         </repository>
         <repository>
             <id>jboss</id>
-            <url>http://repository.jboss.org/maven2/</url>
+            <url>http://repository.jboss.org/nexus/content/groups/public-jboss</url>
             <snapshots>
                 <enabled>false</enabled>
             </snapshots>
@@ -131,7 +136,7 @@
     </repositories>
 
     <distributionManagement>
-        <repository>
+        <!--repository>
             <id>jclouds-googlecode-deploy</id>
             <url>dav:https://jclouds.googlecode.com/svn/repo</url>
             <uniqueVersion>false</uniqueVersion>
@@ -139,7 +144,7 @@
         <snapshotRepository>
       	    <id>jclouds-rimu-snapshots-nexus</id>
             <url>http://jclouds.rimuhosting.com:8081/nexus/content/repositories/snapshots</url>
-        </snapshotRepository>
+        </snapshotRepository-->
         <site>
             <id>website</id>
             <name>website</name>
@@ -147,13 +152,13 @@
         </site>
     </distributionManagement>
     <pluginRepositories>
-        <pluginRepository>
+        <!--pluginRepository>
             <id>central</id>
             <url>http://repo1.maven.org/maven2</url>
             <snapshots>
                 <enabled>false</enabled>
             </snapshots>
-        </pluginRepository>
+        </pluginRepository-->
         <pluginRepository>
             <id>jclouds-googlecode-deploy</id>
             <url>http://jclouds.googlecode.com/svn/repo</url>
@@ -230,7 +235,6 @@
     </developers>
 
     <properties>
-        <sourceEncoding>UTF-8</sourceEncoding>
         <maven.compile.source>1.6</maven.compile.source>
         <maven.compile.target>1.6</maven.compile.target>
         <maven.compile.optimize>true</maven.compile.optimize>
@@ -289,23 +293,23 @@
     </dependencies>
 
     <build>
-      <resources>
-        <resource>
-          <directory>src/main/clojure</directory>
-        </resource>
-        <resource>
-          <directory>src/main/resources</directory>
-        </resource>
-      </resources>
-      <testResources>
-        <testResource>
-          <directory>src/test/clojure</directory>
-        </testResource>
-        <testResource>
-          <directory>src/test/resources</directory>
-        </testResource>
-      </testResources>
-      <plugins>
+        <resources>
+            <resource>
+                <directory>src/main/clojure</directory>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+        </resources>
+        <testResources>
+            <testResource>
+                <directory>src/test/clojure</directory>
+            </testResource>
+            <testResource>
+                <directory>src/test/resources</directory>
+            </testResource>
+        </testResources>
+        <plugins>
             <plugin>
                 <groupId>com.theoryinpractise</groupId>
                 <artifactId>clojure-maven-plugin</artifactId>
@@ -334,6 +338,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.5</version>
                 <executions>
                     <execution>
                         <id>integration</id>
@@ -414,6 +419,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.7</version>
                 <executions>
                     <execution>
                         <id>javadoc</id>
@@ -425,7 +431,7 @@
                 </executions>
                 <configuration>
                     <additionalJOption>-J-Xmx128m</additionalJOption>
-                    <encoding>${sourceEncoding}</encoding>
+                    <encoding>${project.build.sourceEncoding}</encoding>
                     <quiet>true</quiet>
                     <links>
                         <link>http://download.oracle.com/javase/6/docs/api/</link>
@@ -446,6 +452,7 @@ pageTracker._trackPageview();
             </plugin>
             <plugin>
                 <artifactId>maven-enforcer-plugin</artifactId>
+                <version>1.0-beta-1</version>
                 <executions>
                     <execution>
                         <id>enforce-banned-dependencies</id>
@@ -482,20 +489,23 @@ pageTracker._trackPageview();
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.3</version>
                 <configuration>
-                    <encoding>${sourceEncoding}</encoding>
+                    <encoding>${project.build.sourceEncoding}</encoding>
                     <source>${maven.compile.source}</source>
                     <target>${maven.compile.target}</target>
                 </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
+                <version>2.4.2</version>
                 <configuration>
-                    <encoding>${sourceEncoding}</encoding>
+                    <encoding>${project.build.sourceEncoding}</encoding>
                 </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-jar-plugin</artifactId>
+                <version>2.3.1</version>
                 <executions>
                     <execution>
                         <goals>
@@ -506,21 +516,34 @@ pageTracker._trackPageview();
                 <configuration>
                     <archive>
                         <manifestEntries>
-                            <Specification-Title>jclouds ${pom.name}</Specification-Title>
+                            <Specification-Title>jclouds ${project.name}</Specification-Title>
                             <Specification-Vendor>jclouds</Specification-Vendor>
                             <Implementation-Vendor>jclouds</Implementation-Vendor>
                             <Implementation-Vendor-Id>org.jclouds.aws.s3</Implementation-Vendor-Id>
-                            <Implementation-Version>${pom.version}</Implementation-Version>
+                            <Implementation-Version>${project.version}</Implementation-Version>
                             <X-Compile-Source-JDK>${maven.compile.source}</X-Compile-Source-JDK>
                             <X-Compile-Target-JDK>${maven.compile.target}</X-Compile-Target-JDK>
                         </manifestEntries>
                     </archive>
                 </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-site-plugin</artifactId>
-            </plugin>
+            </plugin>        
         </plugins>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <artifactId>maven-site-plugin</artifactId>
+                    <version>2.1</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-deploy-plugin</artifactId>
+                    <version>2.5</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-install-plugin</artifactId>
+                    <version>2.3</version>
+                </plugin>
+            </plugins>            
+        </pluginManagement>
     </build>
     <profiles>
         <profile>
@@ -529,6 +552,7 @@ pageTracker._trackPageview();
                 <plugins>
                     <plugin>
                         <artifactId>maven-surefire-plugin</artifactId>
+                        <version>2.5</version>
                         <executions>
                             <execution>
                                 <id>integration</id>
@@ -568,7 +592,7 @@ pageTracker._trackPageview();
                                   -->
                                         <property>
                                             <name>file.encoding</name>
-                                            <value>${sourceEncoding}</value>
+                                            <value>${project.build.sourceEncoding}</value>
                                         </property>
                                         <property>
                                             <name>jclouds.test.initializer</name>
@@ -657,28 +681,50 @@ pageTracker._trackPageview();
                 </plugins>
             </build>
         </profile>
-	<profile>
-	  <id>clojure-1.1</id>
-	  <dependencies>
-        <dependency>
-           <groupId>org.clojure</groupId>
-           <artifactId>clojure</artifactId>
-           <version>1.1.0</version>
-           <optional>true</optional>
-        </dependency>
-        <dependency>
-           <groupId>org.clojure</groupId>
-           <artifactId>clojure-contrib</artifactId>
-           <version>1.1.0</version>
-           <optional>true</optional>
-        </dependency>
-	  </dependencies>
-	</profile>
+        <!-- modifies the plugin config inherited from oss-parent -->
+        <profile> 
+            <id>sonatype-release-profile-extension</id>
+            <activation>
+                <property> 
+                    <name>performRelease</name> 
+                    <value>true</value> 
+                </property>
+            </activation>            
+            <build> 
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-gpg-plugin</artifactId> 
+                        <configuration>
+                            <executable>${gpg.command}</executable>
+                            <passphrase>${gpg.passphrase}</passphrase>
+                        </configuration>
+                    </plugin> 
+                </plugins>
+            </build> 
+        </profile>        
+        <profile>
+            <id>clojure-1.1</id>
+            <dependencies>
+                <dependency>
+                    <groupId>org.clojure</groupId>
+                    <artifactId>clojure</artifactId>
+                    <version>1.1.0</version>
+                    <optional>true</optional>
+                </dependency>
+                <dependency>
+                    <groupId>org.clojure</groupId>
+                    <artifactId>clojure-contrib</artifactId>
+                    <version>1.1.0</version>
+                    <optional>true</optional>
+                </dependency>
+            </dependencies>
+        </profile>
     </profiles>
     <reporting>
         <plugins>
             <plugin>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
+                <version>2.1.2</version>
                 <reportSets>
                     <reportSet>
                         <reports>
@@ -700,7 +746,7 @@ pageTracker._trackPageview();
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>2.6.1</version>
                 <configuration>
-                    <encoding>${sourceEncoding}</encoding>
+                    <encoding>${project.build.sourceEncoding}</encoding>
                     <quiet>true</quiet>
                 </configuration>
                 <reportSets>
@@ -713,21 +759,25 @@ pageTracker._trackPageview();
                 </reportSets>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
+                <groupId>org.sonatype.maven.plugin</groupId>
                 <artifactId>emma-maven-plugin</artifactId>
+                <version>1.2</version>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>surefire-report-maven-plugin</artifactId>
+                <version>2.0-beta-1</version>
                 <inherited>true</inherited>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>rat-maven-plugin</artifactId>
+                <version>1.0-alpha-3</version>
                 <inherited>true</inherited>
             </plugin>
             <plugin>
                 <artifactId>maven-pmd-plugin</artifactId>
+                <version>2.4</version>
                 <configuration>
                     <targetJdk>${maven.compile.source}</targetJdk>
                 </configuration>
@@ -736,6 +786,7 @@ pageTracker._trackPageview();
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>findbugs-maven-plugin</artifactId>
+                <version>2.3.1</version>
                 <configuration>
                     <xmlOutput>true</xmlOutput>
                 </configuration>
diff --git a/thirdparty/pom.xml b/thirdparty/pom.xml
index 533461c965..d099a049d9 100644
--- a/thirdparty/pom.xml
+++ b/thirdparty/pom.xml
@@ -33,4 +33,17 @@
     <modules>
         <module>resteasy-jaxrs-client</module>
     </modules>
+    
+    <distributionManagement>
+        <!-- third-party projects not in org.jclouds can't be deployed to Sonatype -->
+        <repository>
+            <id>jclouds-googlecode-deploy</id>
+            <url>dav:https://jclouds.googlecode.com/svn/repo</url>
+            <uniqueVersion>false</uniqueVersion>
+        </repository>
+        <snapshotRepository>
+      	    <id>jclouds-rimu-snapshots-nexus</id>
+            <url>http://jclouds.rimuhosting.com:8081/nexus/content/repositories/snapshots</url>
+        </snapshotRepository>
+    </distributionManagement>
 </project>