This reverts commit e2e288ee86d537d249c7e58c782a66b0201f2134. Many conflicts on account of lots of changes since the original commit.
see https://issues.apache.org/jira/browse/JCLOUDS-653 for details You can merge this Pull Request by running: git pull https://github.com/adriancole/jclouds-labs-google adrian.no-floor-guava18 Or you can view, comment on it, or merge it online at: https://github.com/jclouds/jclouds-labs-google/pull/63 -- Commit Summary -- * Revert "JCLOUDS-653: Address Guava 18 deprecations" -- File Changes -- M google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/Bucket.java (4) M google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/BucketAccessControls.java (3) M google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/DefaultObjectAccessControls.java (3) M google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/GCSObject.java (6) M google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/ListBucketAccessControls.java (6) M google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/ListDefaultObjectAccessControls.java (6) M google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/ListObjectAccessControls.java (4) M google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/ListPage.java (5) M google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/ObjectAccessControls.java (3) M google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/Resource.java (4) M google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/ResumableUpload.java (6) M google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/Action.java (5) M google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/BucketCors.java (5) M google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/BucketLifeCycle.java (5) M google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/Condition.java (5) M google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/Logging.java (5) M google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/Owner.java (5) M google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/ProjectTeam.java (5) M google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/Rule.java (5) M google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/Versioning.java (5) M google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/internal/Website.java (5) M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceAdapter.java (6) M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/extensions/GoogleComputeEngineSecurityGroupExtension.java (2) M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/strategy/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java (2) M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/AbstractDisk.java (4) M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Address.java (4) M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Deprecated.java (5) M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Disk.java (4) M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/DiskType.java (4) M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Firewall.java (7) M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Image.java (7) M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Instance.java (19) M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/InstanceTemplate.java (5) M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/ListPage.java (5) M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/MachineType.java (8) M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Metadata.java (5) M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Network.java (4) M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Operation.java (7) M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Project.java (4) M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Quota.java (5) M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Region.java (4) M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Resource.java (4) M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Route.java (7) M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Snapshot.java (4) M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Zone.java (7) M google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/internal/NetworkAndAddressRange.java (4) M oauth/src/main/java/org/jclouds/oauth/v2/domain/ClaimSet.java (4) M oauth/src/main/java/org/jclouds/oauth/v2/domain/Header.java (5) M oauth/src/main/java/org/jclouds/oauth/v2/domain/OAuthCredentials.java (5) M oauth/src/main/java/org/jclouds/oauth/v2/domain/Token.java (5) M oauth/src/main/java/org/jclouds/oauth/v2/domain/TokenRequest.java (5) -- Patch Links -- https://github.com/jclouds/jclouds-labs-google/pull/63.patch https://github.com/jclouds/jclouds-labs-google/pull/63.diff --- Reply to this email directly or view it on GitHub: https://github.com/jclouds/jclouds-labs-google/pull/63
