JCLOUDS-652 Pin filesystem api to Java 7+.

This commit is contained in:
Adrian Cole 2014-10-24 19:58:11 -07:00
parent 6f1c6621a5
commit 8b6081bb94
3 changed files with 29 additions and 6 deletions

View File

@ -73,15 +73,25 @@
<artifactId>cloudfiles-uk</artifactId> <artifactId>cloudfiles-uk</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.jclouds.api</groupId>
<artifactId>filesystem</artifactId>
<version>${project.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.jclouds.provider</groupId> <groupId>org.apache.jclouds.provider</groupId>
<artifactId>hpcloud-objectstorage</artifactId> <artifactId>hpcloud-objectstorage</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
</dependencies> </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> </project>

View File

@ -32,6 +32,9 @@
<packaging>bundle</packaging> <packaging>bundle</packaging>
<properties> <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.export>org.jclouds.filesystem*;version="${project.version}"</jclouds.osgi.export>
<jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import> <jclouds.osgi.import>org.jclouds*;version="${project.version}",*</jclouds.osgi.import>
</properties> </properties>

View File

@ -32,7 +32,6 @@
<modules> <modules>
<module>cloudwatch</module> <module>cloudwatch</module>
<module>cloudstack</module> <module>cloudstack</module>
<module>filesystem</module>
<module>byon</module> <module>byon</module>
<module>s3</module> <module>s3</module>
<module>ec2</module> <module>ec2</module>
@ -55,4 +54,15 @@
<module>sts</module> <module>sts</module>
<module>route53</module> <module>route53</module>
</modules> </modules>
<profiles>
<profile>
<id>jre1.7</id>
<activation>
<jdk>1.7</jdk>
</activation>
<modules>
<module>filesystem</module>
</modules>
</profile>
</profiles>
</project> </project>