You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ad...@apache.org on 2014/10/25 20:01:40 UTC

[4/4] git commit: JCLOUDS-652 Pin filesystem api to Java 7+.

JCLOUDS-652 Pin filesystem api to Java 7+.


Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/8b6081bb
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/8b6081bb
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/8b6081bb

Branch: refs/heads/1.8.x
Commit: 8b6081bb943ea170f7462839074f2031b6feb73b
Parents: 6f1c662
Author: Adrian Cole <ad...@gmail.com>
Authored: Fri Oct 24 19:58:11 2014 -0700
Committer: Adrian Cole <ad...@gmail.com>
Committed: Sat Oct 25 10:39:06 2014 -0700

----------------------------------------------------------------------
 allblobstore/pom.xml    | 20 +++++++++++++++-----
 apis/filesystem/pom.xml |  3 +++
 apis/pom.xml            | 12 +++++++++++-
 3 files changed, 29 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jclouds/blob/8b6081bb/allblobstore/pom.xml
----------------------------------------------------------------------
diff --git a/allblobstore/pom.xml b/allblobstore/pom.xml
index 27f2cd8..492e6b3 100644
--- a/allblobstore/pom.xml
+++ b/allblobstore/pom.xml
@@ -74,14 +74,24 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.jclouds.api</groupId>
-      <artifactId>filesystem</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
       <groupId>org.apache.jclouds.provider</groupId>
       <artifactId>hpcloud-objectstorage</artifactId>
       <version>${project.version}</version>
     </dependency>
   </dependencies>
+  <profiles>
+    <profile>
+      <id>jre1.7</id>
+      <activation>
+        <jdk>1.7</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.jclouds.api</groupId>
+          <artifactId>filesystem</artifactId>
+         <version>${project.version}</version>
+       </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/jclouds/blob/8b6081bb/apis/filesystem/pom.xml
----------------------------------------------------------------------
diff --git a/apis/filesystem/pom.xml b/apis/filesystem/pom.xml
index 0115d97..c81d7bb 100644
--- a/apis/filesystem/pom.xml
+++ b/apis/filesystem/pom.xml
@@ -32,6 +32,9 @@
   <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>

http://git-wip-us.apache.org/repos/asf/jclouds/blob/8b6081bb/apis/pom.xml
----------------------------------------------------------------------
diff --git a/apis/pom.xml b/apis/pom.xml
index 48c1ebe..54a48b3 100644
--- a/apis/pom.xml
+++ b/apis/pom.xml
@@ -32,7 +32,6 @@
   <modules>
     <module>cloudwatch</module>
     <module>cloudstack</module>
-    <module>filesystem</module>
     <module>byon</module>
     <module>s3</module>
     <module>ec2</module>
@@ -55,4 +54,15 @@
     <module>sts</module>
     <module>route53</module>
   </modules>
+  <profiles>
+    <profile>
+      <id>jre1.7</id>
+      <activation>
+        <jdk>1.7</jdk>
+      </activation>
+      <modules>
+        <module>filesystem</module>
+      </modules>
+    </profile>
+  </profiles>
 </project>