You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2018/07/11 16:43:15 UTC
[1/2] jclouds git commit: Configure Java 7 language level
Repository: jclouds
Updated Branches:
refs/heads/master 019ccb743 -> 4958f1f29
Configure Java 7 language level
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/38394327
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/38394327
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/38394327
Branch: refs/heads/master
Commit: 3839432757f08f4f21d0f246fe1837deeba0d1a6
Parents: 019ccb7
Author: Ignasi Barrera <na...@apache.org>
Authored: Mon Jul 9 10:08:08 2018 -0700
Committer: Ignasi Barrera <na...@apache.org>
Committed: Wed Jul 11 09:42:18 2018 -0700
----------------------------------------------------------------------
apis/filesystem/pom.xml | 14 --------------
project/pom.xml | 16 +++++++++++-----
2 files changed, 11 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/38394327/apis/filesystem/pom.xml
----------------------------------------------------------------------
diff --git a/apis/filesystem/pom.xml b/apis/filesystem/pom.xml
index 5e65b02..1515539 100644
--- a/apis/filesystem/pom.xml
+++ b/apis/filesystem/pom.xml
@@ -32,9 +32,6 @@
<packaging>bundle</packaging>
<properties>
- <!-- This api has been written in a manner which requires Java language level 7. -->
- <maven.compile.source>1.7</maven.compile.source>
- <maven.compile.target>1.7</maven.compile.target>
<jclouds.osgi.export>org.jclouds.filesystem*;version="${project.version}"</jclouds.osgi.export>
<jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties>
@@ -102,17 +99,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-maven-plugin</artifactId>
- <configuration>
- <signature>
- <groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java17</artifactId>
- <version>1.0</version>
- </signature>
- </configuration>
- </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/38394327/project/pom.xml
----------------------------------------------------------------------
diff --git a/project/pom.xml b/project/pom.xml
index 9b83246..7ed3bda 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -217,8 +217,8 @@
</developers>
<properties>
- <maven.compile.source>1.6</maven.compile.source>
- <maven.compile.target>1.6</maven.compile.target>
+ <maven.compile.source>1.7</maven.compile.source>
+ <maven.compile.target>1.7</maven.compile.target>
<jdk.version>1.7</jdk.version>
<maven.compile.deprecation>true</maven.compile.deprecation>
<maven.site.url.base>gitsite:git@github.com/jclouds/jclouds-maven-site.git</maven.site.url.base>
@@ -634,8 +634,8 @@
<configuration>
<signature>
<groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java16</artifactId>
- <version>1.1</version>
+ <artifactId>java17</artifactId>
+ <version>1.0</version>
</signature>
</configuration>
</plugin>
@@ -717,7 +717,7 @@
<configuration>
<rules>
<requireJavaVersion>
- <version>[1.6,)</version>
+ <version>[1.7,)</version>
</requireJavaVersion>
<requireMavenVersion>
<version>[3.0.2,)</version>
@@ -1280,7 +1280,10 @@
<groupId>org.gaul</groupId>
<artifactId>modernizer-maven-plugin</artifactId>
<configuration>
+ <!-- Fix fiolations before uncommenting
<javaVersion>${maven.compile.source}</javaVersion>
+ -->
+ <javaVersion>1.6</javaVersion>
<!-- in jclouds-project use the local file. ${project.basedir}
required here as 1.1.0 of the modernizer plugin can't find the
exclusions file otherwise -->
@@ -1329,7 +1332,10 @@
</dependency>
</dependencies>
<configuration>
+ <!-- Fix vioaltions and uncomment again
<javaVersion>${maven.compile.source}</javaVersion>
+ -->
+ <javaVersion>1.6</javaVersion>
<exclusionsFile>resources/modernizer_exclusions.txt</exclusionsFile>
</configuration>
</plugin>
[2/2] jclouds git commit: Adds ConcurrentModificationException to the
list of propagatable types
Posted by na...@apache.org.
Adds ConcurrentModificationException to the list of propagatable types
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/4958f1f2
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/4958f1f2
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/4958f1f2
Branch: refs/heads/master
Commit: 4958f1f29a8e692319ed89d774009c602fcfc44a
Parents: 3839432
Author: Ignasi Barrera <na...@apache.org>
Authored: Tue Jul 10 09:40:26 2018 -0700
Committer: Ignasi Barrera <na...@apache.org>
Committed: Wed Jul 11 09:43:04 2018 -0700
----------------------------------------------------------------------
core/src/main/java/org/jclouds/util/Throwables2.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/4958f1f2/core/src/main/java/org/jclouds/util/Throwables2.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/util/Throwables2.java b/core/src/main/java/org/jclouds/util/Throwables2.java
index 1f74cbf..f9e4fe1 100644
--- a/core/src/main/java/org/jclouds/util/Throwables2.java
+++ b/core/src/main/java/org/jclouds/util/Throwables2.java
@@ -21,6 +21,7 @@ import static com.google.common.base.Throwables.getCausalChain;
import static com.google.common.base.Throwables.propagate;
import static com.google.common.collect.Iterables.find;
+import java.util.ConcurrentModificationException;
import java.util.NoSuchElementException;
import org.jclouds.concurrent.TransformParallelException;
@@ -135,6 +136,7 @@ public class Throwables2 {
ResourceNotFoundException.class,
InsufficientResourcesException.class,
RateLimitExceededException.class,
+ ConcurrentModificationException.class,
HttpResponseException.class);
// Note this needs to be kept up-to-date with all top-level exceptions jclouds works against