Final tweaks for the release

spring-attic · Jan 9, 2011 · ae4939a · ae4939a
1 parent f00a1f4
commit ae4939a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/org.springframework.build.aws.maven/pom.xml b/org.springframework.build.aws.maven/pom.xml
@@ -48,7 +48,7 @@
 			<extension>
 				<groupId>org.springframework.build.aws</groupId>
 				<artifactId>org.springframework.build.aws.maven</artifactId>
-				<version>3.0.0.RELEASE</version>
+				<version>${project.version}</version>
 			</extension>
 		</extensions>
 
@@ -124,7 +124,7 @@
 	<distributionManagement>
 		<repository>
 			<id>spring-release</id>
-			<name>Spring Relase Repository</name>
+			<name>Spring Release Repository</name>
 			<url>s3://maven.springframework.org/release</url>
 		</repository>
 		<snapshotRepository>

diff --git a/...uild.aws.maven/src/main/java/org/springframework/aws/maven/SimpleStorageServiceWagon.java b/...uild.aws.maven/src/main/java/org/springframework/aws/maven/SimpleStorageServiceWagon.java
@@ -69,11 +69,13 @@ protected void connectToRepository(Repository source, AuthenticationInfo authent
         throws AuthenticationException {
         try {
             Jets3tProperties jets3tProperties = new Jets3tProperties();
-            ProxyInfo proxyInfo = proxyInfoProvider.getProxyInfo("http");
-            if (proxyInfo != null) {
-                jets3tProperties.setProperty("httpclient.proxy-autodetect", "false");
-                jets3tProperties.setProperty("httpclient.proxy-host", proxyInfo.getHost());
-                jets3tProperties.setProperty("httpclient.proxy-port", new Integer(proxyInfo.getPort()).toString());
+            if (proxyInfoProvider != null) {
+                ProxyInfo proxyInfo = proxyInfoProvider.getProxyInfo("http");
+                if (proxyInfo != null) {
+                    jets3tProperties.setProperty("httpclient.proxy-autodetect", "false");
+                    jets3tProperties.setProperty("httpclient.proxy-host", proxyInfo.getHost());
+                    jets3tProperties.setProperty("httpclient.proxy-port", new Integer(proxyInfo.getPort()).toString());
+                }
             }
             this.service = new RestS3Service(getCredentials(authenticationInfo), "mavens3wagon", null, jets3tProperties);
         } catch (S3ServiceException e) {