Apache/jclouds
1
0
Fork 0
mirror of https://github.com/apache/jclouds.git synced 2025-02-08 19:15:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "JCLOUDS-652: Require JDK 7"

Browse Source 
This reverts commit 5e8bd02c93c7ebacb573342e77ef7ca4b02c4ffb.
This commit is contained in:
Adrian Cole 2014-10-24 16:31:23 -07:00
parent 0339cd2fd0
commit 0a801d2ad2
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
blobstore/src/main/java/org/jclouds/blobstore/config/LocalBlobStore.java
View File

@ -549,7 +549,7 @@ public final class LocalBlobStore implements BlobStore {
try { try {
Blob blob = getBlob(containerName, key); Blob blob = getBlob(containerName, key);
return blob != null ? (BlobMetadata) BlobStoreUtils.copy(blob.getMetadata()) : null; return blob != null ? (BlobMetadata) BlobStoreUtils.copy(blob.getMetadata()) : null;
} catch (Exception e) { } catch (RuntimeException e) {
if (size(Iterables.filter(getCausalChain(e), KeyNotFoundException.class)) >= 1) if (size(Iterables.filter(getCausalChain(e), KeyNotFoundException.class)) >= 1)
return null; return null;
throw e; throw e;

2
core/src/main/java/org/jclouds/http/internal/JavaUrlHttpCommandExecutorService.java
View File

@ -278,7 +278,7 @@ public class JavaUrlHttpCommandExecutorService extends BaseHttpCommandExecutorSe
// HttpUrlConnection strips Content-Length: 0 without setDoOutput(true) // HttpUrlConnection strips Content-Length: 0 without setDoOutput(true)
String method = connection.getRequestMethod(); String method = connection.getRequestMethod();
if ("POST".equals(method) || "PUT".equals(method)) { if ("POST".equals(method) || "PUT".equals(method)) {
connection.setFixedLengthStreamingMode(0L); connection.setFixedLengthStreamingMode(0);
connection.setDoOutput(true); connection.setDoOutput(true);
} }
} }

8
project/pom.xml
View File

@ -201,8 +201,8 @@
<properties> <properties>
<clojure.version>1.3.0</clojure.version> <clojure.version>1.3.0</clojure.version>
<maven.compile.source>1.7</maven.compile.source> <maven.compile.source>1.6</maven.compile.source>
<maven.compile.target>1.7</maven.compile.target> <maven.compile.target>1.6</maven.compile.target>
<maven.compile.deprecation>true</maven.compile.deprecation> <maven.compile.deprecation>true</maven.compile.deprecation>
<maven.site.url.base>gitsite:git@github.com/jclouds/jclouds-maven-site.git</maven.site.url.base> <maven.site.url.base>gitsite:git@github.com/jclouds/jclouds-maven-site.git</maven.site.url.base>
<http.proxyHost /> <http.proxyHost />
@ -1088,7 +1088,7 @@
<groupId>org.gaul</groupId> <groupId>org.gaul</groupId>
<artifactId>modernizer-maven-plugin</artifactId> <artifactId>modernizer-maven-plugin</artifactId>
<configuration> <configuration>
<javaVersion>1.7</javaVersion> <javaVersion>${maven.compile.source}</javaVersion>
<!-- in jclouds-project use the local file. ${project.basedir} <!-- in jclouds-project use the local file. ${project.basedir}
required here as 1.1.0 of the modernizer plugin can't find the required here as 1.1.0 of the modernizer plugin can't find the
exclusions file otherwise --> exclusions file otherwise -->
@ -1137,7 +1137,7 @@
</dependency> </dependency>
</dependencies> </dependencies>
<configuration> <configuration>
<javaVersion>1.7</javaVersion> <javaVersion>${maven.compile.source}</javaVersion>
<exclusionsFile>resources/modernizer_exclusions.txt</exclusionsFile> <exclusionsFile>resources/modernizer_exclusions.txt</exclusionsFile>
</configuration> </configuration>
</plugin> </plugin>