You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2014/09/23 06:58:55 UTC
git commit: Add modernizer-maven-plugin to build
Repository: jclouds
Updated Branches:
refs/heads/master b9f54a330 -> 2d70087bf
Add modernizer-maven-plugin to build
This plugin finds uses of legacy APIs:
https://github.com/andrewgaul/modernizer-maven-plugin
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/2d70087b
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/2d70087b
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/2d70087b
Branch: refs/heads/master
Commit: 2d70087bfa6491ee822874576f8e893c44647276
Parents: b9f54a3
Author: Andrew Gaul <ga...@apache.org>
Authored: Tue Sep 16 13:18:37 2014 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Mon Sep 22 21:57:55 2014 -0700
----------------------------------------------------------------------
.../JavaUrlHttpCommandExecutorService.java | 2 +-
project/pom.xml | 30 +++++++++++++++
resources/checkstyle.xml | 40 --------------------
resources/modernizer_exclusions.txt | 19 ++++++++++
resources/pom.xml | 1 +
5 files changed, 51 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d70087b/core/src/main/java/org/jclouds/http/internal/JavaUrlHttpCommandExecutorService.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/http/internal/JavaUrlHttpCommandExecutorService.java b/core/src/main/java/org/jclouds/http/internal/JavaUrlHttpCommandExecutorService.java
index 712ea28..3647ef2 100644
--- a/core/src/main/java/org/jclouds/http/internal/JavaUrlHttpCommandExecutorService.java
+++ b/core/src/main/java/org/jclouds/http/internal/JavaUrlHttpCommandExecutorService.java
@@ -280,7 +280,7 @@ public class JavaUrlHttpCommandExecutorService extends BaseHttpCommandExecutorSe
// HttpUrlConnection strips Content-Length: 0 without setDoOutput(true)
String method = connection.getRequestMethod();
if ("POST".equals(method) || "PUT".equals(method)) {
- connection.setFixedLengthStreamingMode(0);
+ connection.setFixedLengthStreamingMode(0L);
connection.setDoOutput(true);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d70087b/project/pom.xml
----------------------------------------------------------------------
diff --git a/project/pom.xml b/project/pom.xml
index 45c8e73..3a0c19c 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -434,6 +434,7 @@
<exclude>**/.gitignore</exclude>
<exclude>**/.gitattributes</exclude>
<exclude>**/.java-version</exclude>
+ <exclude>**/modernizer_exclusions.txt</exclude>
<!-- Temporary files generated on CloudBees slaves -->
<exclude>.repository/**</exclude>
@@ -714,6 +715,24 @@
<violationSeverity>warning</violationSeverity>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.gaul</groupId>
+ <artifactId>modernizer-maven-plugin</artifactId>
+ <version>1.1.0</version>
+ <executions>
+ <execution>
+ <id>modernizer</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>modernizer</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <javaVersion>1.7</javaVersion>
+ <exclusionsFile>resources/modernizer_exclusions.txt</exclusionsFile>
+ </configuration>
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
@@ -1107,6 +1126,17 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.gaul</groupId>
+ <artifactId>modernizer-maven-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.jclouds</groupId>
+ <artifactId>jclouds-resources</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
</plugins>
</build>
</profile>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d70087b/resources/checkstyle.xml
----------------------------------------------------------------------
diff --git a/resources/checkstyle.xml b/resources/checkstyle.xml
index 0be56a3..da62202 100644
--- a/resources/checkstyle.xml
+++ b/resources/checkstyle.xml
@@ -88,44 +88,4 @@
<property name="format" value="@author"/>
<property name="message" value="Do not use Javadoc @author annotation"/>
</module>
- <module name="RegexpMultiline">
- <property name="format" value="=\s*new ArrayList<[^>]"/>
- <property name="message" value="Prefer com.google.common.collect.Lists"/>
- </module>
- <module name="RegexpMultiline">
- <property name="format" value="=\s*new HashMap<[^>]"/>
- <property name="message" value="Prefer com.google.common.collect.Maps"/>
- </module>
- <module name="RegexpMultiline">
- <property name="format" value="=\s*new HashSet<[^>]"/>
- <property name="message" value="Prefer com.google.common.collect.Sets"/>
- </module>
- <module name="RegexpMultiline">
- <property name="format" value="=\s*new LinkedHashMap<[^>]"/>
- <property name="message" value="Prefer com.google.common.collect.Maps"/>
- </module>
- <module name="RegexpMultiline">
- <property name="format" value="=\s*new LinkedHashSet<[^>]"/>
- <property name="message" value="Prefer com.google.common.collect.Sets"/>
- </module>
- <module name="RegexpMultiline">
- <property name="format" value="=\s*new LinkedList<[^>]"/>
- <property name="message" value="Prefer com.google.common.collect.Lists"/>
- </module>
- <module name="RegexpMultiline">
- <property name="format" value="=\s*new TreeMap<[^>]"/>
- <property name="message" value="Prefer com.google.common.collect.Maps"/>
- </module>
- <module name="RegexpMultiline">
- <property name="format" value="=\s*new TreeSet<[^>]"/>
- <property name="message" value="Prefer com.google.common.collect.Sets"/>
- </module>
- <module name="RegexpMultiline">
- <property name="format" value="=\s*new AtomicReference<[^>]"/>
- <property name="message" value="Prefer com.google.common.util.concurrent.Atomics"/>
- </module>
- <module name="RegexpMultiline">
- <property name="format" value="new StringBuffer"/>
- <property name="message" value="Prefer java.lang.StringBuilder"/>
- </module>
</module>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d70087b/resources/modernizer_exclusions.txt
----------------------------------------------------------------------
diff --git a/resources/modernizer_exclusions.txt b/resources/modernizer_exclusions.txt
new file mode 100644
index 0000000..7fec5af
--- /dev/null
+++ b/resources/modernizer_exclusions.txt
@@ -0,0 +1,19 @@
+com/google/common/base/Charsets.ISO_8859_1:Ljava/nio/charset/Charset;
+com/google/common/base/Charsets.US_ASCII:Ljava/nio/charset/Charset;
+com/google/common/base/Charsets.UTF_8:Ljava/nio/charset/Charset;
+com/google/common/base/Objects.equal:(Ljava/lang/Object;Ljava/lang/Object;)Z
+com/google/common/base/Objects.hashCode:([Ljava/lang/Object;)I
+com/google/common/collect/Lists.newArrayList:()Ljava/util/ArrayList;
+com/google/common/collect/Lists.newArrayListWithCapacity:(I)Ljava/util/ArrayList;
+com/google/common/collect/Lists.newLinkedList:()Ljava/util/LinkedList;
+com/google/common/collect/Maps.newConcurrentMap:()Ljava/util/concurrent/ConcurrentMap;
+com/google/common/collect/Maps.newHashMap:()Ljava/util/HashMap;
+com/google/common/collect/Maps.newHashMap:(Ljava/util/Map;)Ljava/util/HashMap;
+com/google/common/collect/Maps.newLinkedHashMap:()Ljava/util/LinkedHashMap;
+com/google/common/collect/Maps.newLinkedHashMap:(Ljava/util/Map;)Ljava/util/LinkedHashMap;
+com/google/common/collect/Maps.newTreeMap:()Ljava/util/TreeMap;
+com/google/common/collect/Sets.newHashSet:()Ljava/util/HashSet;
+com/google/common/collect/Sets.newLinkedHashSet:()Ljava/util/LinkedHashSet;
+com/google/common/collect/Sets.newTreeSet:()Ljava/util/TreeSet;
+com/google/common/primitives/Ints.compare:(II)I
+com/google/common/primitives/Longs.compare:(JJ)I
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2d70087b/resources/pom.xml
----------------------------------------------------------------------
diff --git a/resources/pom.xml b/resources/pom.xml
index 02eac53..6404210 100644
--- a/resources/pom.xml
+++ b/resources/pom.xml
@@ -37,6 +37,7 @@
<directory>${project.basedir}</directory>
<includes>
<include>checkstyle.xml</include>
+ <include>modernizer_exclusions.txt</include>
</includes>
</resource>
</resources>