Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue 918:update to latest GAE sdk 1.6.5

This commit is contained in:
Adrian Cole 2012-05-07 16:22:12 -07:00
parent 50074682ba
commit 05ab8b16df
4 changed files with 93 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
demos/perftest/pom.xml
View File

@ -34,9 +34,8 @@
<test.aws-s3.loopcount>100</test.aws-s3.loopcount> <test.aws-s3.loopcount>100</test.aws-s3.loopcount>
<test.aws-s3.identity>${test.aws.identity}</test.aws-s3.identity> <test.aws-s3.identity>${test.aws.identity}</test.aws-s3.identity>
<test.aws-s3.credential>${test.aws.credential}</test.aws-s3.credential> <test.aws-s3.credential>${test.aws.credential}</test.aws-s3.credential>
<test.initializer>org.jclouds.aws.s3.blobstore.integration.AWSS3TestInitializer</test.initializer> <jclouds.version>1.5.0-SNAPSHOT</jclouds.version>
<jclouds.version>1.0-SNAPSHOT</jclouds.version> <appengine.sdk.version>1.6.5</appengine.sdk.version>
<appengine.sdk.version>1.4.3</appengine.sdk.version>
</properties> </properties>
<dependencies> <dependencies>
@ -48,18 +47,23 @@
<dependency> <dependency>
<groupId>com.amazonaws</groupId> <groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk</artifactId> <artifactId>aws-java-sdk</artifactId>
<version>1.1.9</version> <version>1.3.8</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.java.dev.jets3t</groupId> <groupId>net.java.dev.jets3t</groupId>
<artifactId>jets3t</artifactId> <artifactId>jets3t</artifactId>
<version>0.8.0</version> <version>0.9.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jclouds.driver</groupId> <groupId>org.jclouds.driver</groupId>
<artifactId>jclouds-enterprise</artifactId> <artifactId>jclouds-enterprise</artifactId>
<version>${jclouds.version}</version> <version>${jclouds.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.jclouds.driver</groupId>
<artifactId>jclouds-netty</artifactId>
<version>${jclouds.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.jclouds.driver</groupId> <groupId>org.jclouds.driver</groupId>
<artifactId>jclouds-apachehc</artifactId> <artifactId>jclouds-apachehc</artifactId>
@ -94,9 +98,9 @@
<!-- start gae stuff --> <!-- start gae stuff -->
<dependency> <dependency>
<groupId>com.google.appengine</groupId> <groupId>com.google.appengine</groupId>
<artifactId>appengine-tools-sdk</artifactId> <artifactId>appengine-api-1.0-sdk</artifactId>
<version>${appengine.sdk.version}</version> <version>${appengine.sdk.version}</version>
<scope>test</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.appengine</groupId> <groupId>com.google.appengine</groupId>
@ -134,6 +138,80 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>com.ning.maven.plugins</groupId>
<artifactId>maven-duplicate-finder-plugin</artifactId>
<configuration>
<exceptions>
<exception>
<conflictingDependencies>
<!-- AWS SDK and GAE don't play nice -->
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk</artifactId>
<version>1.3.8</version>
</dependency>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-1.0-sdk</artifactId>
<version>${appengine.sdk.version}</version>
</dependency>
</conflictingDependencies>
<resources>
<resource>META-INF/javamail.providers</resource>
</resources>
</exception>
<exception>
<!-- Google App Engine Deps, some google classes are duplicated between packages -->
<conflictingDependencies>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-1.0-sdk</artifactId>
<version>${appengine.sdk.version}</version>
</dependency>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-testing</artifactId>
<version>${appengine.sdk.version}</version>
<scope>test</scope>
</dependency>
</conflictingDependencies>
<packages>
<package>com.google</package>
</packages>
</exception>
</exceptions>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>
<profiles>
<profile>
<id>live</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<executions>
<execution>
<id>integration</id>
<phase>integration-test</phase>
<goals>
<goal>test</goal>
</goals>
<configuration>
<systemPropertyVariables>
<test.aws-s3.identity>${test.aws-s3.identity}</test.aws-s3.identity>
<test.aws-s3.credential>${test.aws-s3.credential}</test.aws-s3.credential>
<test.aws-s3.loopcount>${test.aws-s3.loopcount}</test.aws-s3.loopcount>
</systemPropertyVariables>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project> </project>

6
demos/tweetstore/pom.xml
View File

@ -175,12 +175,12 @@
<dependency> <dependency>
<groupId>com.google.appengine</groupId> <groupId>com.google.appengine</groupId>
<artifactId>appengine-api-1.0-sdk</artifactId> <artifactId>appengine-api-1.0-sdk</artifactId>
<version>1.6.1</version> <version>1.6.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.appengine</groupId> <groupId>com.google.appengine</groupId>
<artifactId>appengine-tools-sdk</artifactId> <artifactId>appengine-tools-sdk</artifactId>
<version>1.6.1</version> <version>1.6.5</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</conflictingDependencies> </conflictingDependencies>
@ -240,7 +240,7 @@
<dependency> <dependency>
<groupId>com.google.appengine</groupId> <groupId>com.google.appengine</groupId>
<artifactId>appengine-tools-sdk</artifactId> <artifactId>appengine-tools-sdk</artifactId>
<version>1.6.1</version> <version>1.6.5</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

6
drivers/gae/pom.xml
View File

@ -56,7 +56,7 @@
<dependency> <dependency>
<groupId>com.google.appengine</groupId> <groupId>com.google.appengine</groupId>
<artifactId>appengine-api-1.0-sdk</artifactId> <artifactId>appengine-api-1.0-sdk</artifactId>
<version>1.6.1</version> <version>1.6.5</version>
</dependency> </dependency>
<dependency> <dependency>
@ -74,13 +74,13 @@
<dependency> <dependency>
<groupId>com.google.appengine</groupId> <groupId>com.google.appengine</groupId>
<artifactId>appengine-api-stubs</artifactId> <artifactId>appengine-api-stubs</artifactId>
<version>1.6.1</version> <version>1.6.5</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.appengine</groupId> <groupId>com.google.appengine</groupId>
<artifactId>appengine-testing</artifactId> <artifactId>appengine-testing</artifactId>
<version>1.6.1</version> <version>1.6.5</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

4
project/pom.xml
View File

@ -318,12 +318,12 @@
<dependency> <dependency>
<groupId>com.google.appengine</groupId> <groupId>com.google.appengine</groupId>
<artifactId>appengine-api-1.0-sdk</artifactId> <artifactId>appengine-api-1.0-sdk</artifactId>
<version>1.4.3</version> <version>1.6.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.appengine</groupId> <groupId>com.google.appengine</groupId>
<artifactId>appengine-testing</artifactId> <artifactId>appengine-testing</artifactId>
<version>1.4.3</version> <version>1.6.5</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</conflictingDependencies> </conflictingDependencies>