Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: move autovalue to annotation processor path #179

Merged
merged 15 commits into from Jan 28, 2021
Merged

fix: move autovalue to annotation processor path #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9467f04
move autovalue to annotation processor path
elharo Jul 27, 2020
4b56b8e
only one parallel job
elharo Jul 27, 2020
1893bb3
fix: verify gs filesystem is available
frankyn Jan 26, 2021
a3bfa0a
fix: remove max-parallel config in workflow
frankyn Jan 26, 2021
fc846c2
fix: lint
frankyn Jan 26, 2021
0114e78
fix: revert plugin ignore removal
frankyn Jan 26, 2021
b5b4fd8
autovalue 1.7.4
Jan 27, 2021
bccc6cb
debug: test provider config is loaded before tests run
frankyn Jan 27, 2021
c1b0ec5
address feedback
frankyn Jan 27, 2021
81e8a36
add EnableAutoValue.txt
frankyn Jan 27, 2021
12d81cf
Merge branch 'master' into av
frankyn Jan 27, 2021
c010b60
mockito for Java 7
Jan 28, 2021
9e62484
add auto-value-annotations to project deps
frankyn Jan 28, 2021
d153920
add retries to tests
frankyn Jan 28, 2021
375ff4d
revert retry in build.sh
frankyn Jan 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Empty file added google-cloud-nio/EnableAutoValue.txt
View file
Open in desktop
Empty file.
44 changes: 6 additions & 38 deletions google-cloud-nio/pom.xml
View file
Open in desktop
Expand Up @@ -42,26 +42,14 @@
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client</artifactId>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>1</version>
</dependency>
<dependency>
<groupId>com.google.auto.service</groupId>
<artifactId>auto-service</artifactId>
<version>1.0-rc3</version>
<optional>true</optional>
<scope>provided</scope> <!-- to leave out of the all-deps jar -->
</dependency>
<dependency>
<groupId>com.google.auto.value</groupId>
<artifactId>auto-value</artifactId>
<scope>provided</scope> <!-- to leave out of the all-deps jar -->
<artifactId>auto-value-annotations</artifactId>
</dependency>
<dependency>
<groupId>com.google.auto.value</groupId>
<artifactId>auto-value-annotations</artifactId>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>1</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
Expand All @@ -86,7 +74,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.7.0</version>
<version>2.28.2</version>
<scope>test</scope>
</dependency><dependency>
<groupId>org.hamcrest</groupId>
Expand All @@ -95,6 +83,7 @@
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
Expand All @@ -104,16 +93,6 @@
<skip>false</skip>
</configuration>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
<encoding>UTF-8</encoding>
<compilerArgument>-Xlint:unchecked</compilerArgument>
</configuration>
</plugin>
<!-- shade the jar so we can demo adding the NIO jar to add functionality. -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -173,17 +152,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
<ignoredUnusedDeclaredDependencies>
<ignoredUnusedDeclaredDependency>com.google.auto.value:auto-value</ignoredUnusedDeclaredDependency>
<ignoredUnusedDeclaredDependency>com.google.auto.service:auto-service</ignoredUnusedDeclaredDependency>
</ignoredUnusedDeclaredDependencies>
</configuration>
</plugin>

</plugins>
</build>
</project>
2 changes: 0 additions & 2 deletions ...io/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProvider.java
View file
Open in desktop
Expand Up @@ -21,7 +21,6 @@
import static com.google.common.base.Strings.isNullOrEmpty;

import com.google.api.gax.paging.Page;
import com.google.auto.service.AutoService;
import com.google.cloud.storage.Acl;
import com.google.cloud.storage.Blob;
import com.google.cloud.storage.BlobId;
Expand Down Expand Up @@ -86,7 +85,6 @@
*/
@Singleton
@ThreadSafe
@AutoService(FileSystemProvider.class)
public final class CloudStorageFileSystemProvider extends FileSystemProvider {

private Storage storage;
Expand Down
14 changes: 14 additions & 0 deletions google-cloud-nio/src/main/resources/META-INF/services/java.nio.file.spi.FileSystemProvider
View file
Open in desktop
@@ -0,0 +1,14 @@
# Copyright 2021 Google LLC
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

com.google.cloud.storage.contrib.nio.CloudStorageFileSystemProvider
36 changes: 2 additions & 34 deletions pom.xml
View file
Open in desktop
Expand Up @@ -96,16 +96,10 @@
</dependency>
<dependency>
<groupId>com.google.auto.value</groupId>
<artifactId>auto-value</artifactId>
<scope>provided</scope> <!-- to leave out of the all-deps jar -->
<version>${auto-value-annotation.version}</version>
</dependency>
<dependency>
<groupId>com.google.auto.value</groupId>
<artifactId>auto-value-annotations</artifactId>
<scope>provided</scope> <!-- to leave out of the all-deps jar -->
<version>${auto-value-annotation.version}</version>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand All @@ -120,21 +114,7 @@
</dependency>
</dependencies>
</dependencyManagement>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
<ignoredUnusedDeclaredDependencies>
<ignoredDependency>com.google.auto.value:auto-value-annotations</ignoredDependency>
</ignoredUnusedDeclaredDependencies>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>

<modules>
<module>google-cloud-nio</module>
<module>google-cloud-nio-retrofit</module>
Expand Down Expand Up @@ -207,18 +187,6 @@
</links>
</configuration>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<annotationProcessorPaths>
<path>
<groupId>com.google.auto.value</groupId>
<artifactId>auto-value</artifactId>
<version>${auto-value.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
</plugins>
</reporting>

Expand Down