Skip to content

Commit 57982a0

Browse files
feat: remove autovalue profile as it has moved to shared-config (#370)
* feat: remove autovalue profile as it has moved to shared-config * add enable file to enable profile based on module
1 parent 5966733 commit 57982a0

File tree

2 files changed

+1
-83
lines changed

2 files changed

+1
-83
lines changed

google-cloud-bigquery/EnableAutoValue.txt

Whitespace-only changes.

pom.xml

Lines changed: 1 addition & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,6 @@
6767
<javax.annotations.version>1.3.2</javax.annotations.version>
6868
<google-api-services-bigquery.version>v2-rev20200429-1.30.9
6969
</google-api-services-bigquery.version>
70-
<auto-value.version>1.7.2</auto-value.version>
71-
<auto-value-annotations.version>${auto-value.version}</auto-value-annotations.version>
72-
<auto-service-annotations.version>1.0-rc7</auto-service-annotations.version>
7370
</properties>
7471

7572
<dependencyManagement>
@@ -195,99 +192,20 @@
195192
<link>https://developers.google.com/protocol-buffers/docs/reference/java/</link>
196193
<link>https://googleapis.dev/java/google-auth-library/latest/</link>
197194
<link>https://googleapis.dev/java/gax/latest/</link>
198-
<link>https://googleapis.github.io/api-common-java/${google.api-common.version}/apidocs/</link>
195+
<link>https://googleapis.github.io/api-common-java/</link>
199196
</links>
200197
</configuration>
201198
</plugin>
202199
</plugins>
203200
</reporting>
204201

205202
<profiles>
206-
<profile>
207-
<id>autovalue-java7</id>
208-
<activation>
209-
<jdk>1.7</jdk>
210-
</activation>
211-
<properties>
212-
<auto-value-annotations.version>1.7</auto-value-annotations.version>
213-
<auto-value.version>1.4</auto-value.version>
214-
</properties>
215-
<build>
216-
<plugins>
217-
<plugin>
218-
<artifactId>maven-compiler-plugin</artifactId>
219-
<configuration>
220-
<annotationProcessorPaths>
221-
<path>
222-
<groupId>com.google.auto.value</groupId>
223-
<artifactId>auto-value</artifactId>
224-
<version>${auto-value.version}</version>
225-
</path>
226-
<!--
227-
There is currently no available version of auto-service-annotations
228-
in maven central compiled for java 1.7 so we can't include it here.
229-
230-
If you're using IntelliJ please use a newer jdk and set the language
231-
level to 1.7 for your dev work.
232-
-->
233-
</annotationProcessorPaths>
234-
</configuration>
235-
</plugin>
236-
</plugins>
237-
</build>
238-
</profile>
239-
240-
<profile>
241-
<id>autovalue-java8</id>
242-
<activation>
243-
<jdk>[1.8,)</jdk>
244-
</activation>
245-
<build>
246-
<plugins>
247-
<plugin>
248-
<artifactId>maven-compiler-plugin</artifactId>
249-
<configuration>
250-
<annotationProcessorPaths>
251-
<path>
252-
<groupId>com.google.auto.value</groupId>
253-
<artifactId>auto-value</artifactId>
254-
<version>${auto-value.version}</version>
255-
</path>
256-
<!--
257-
Manually pull in auto-service-annotations so that it is part of the
258-
processor path because auto-value has it set to provided scope.
259-
260-
This dependency is needed due to the retention change in
261-
https://github.com/google/auto/commit/628df548685b4fc0f2a9af856f97cc2a68da246b
262-
where the RetentionPolicy changed from SOURCE to CLASS.
263-
264-
Due to the RetentionPolicy change to CLASS we must have the
265-
annotations available on the processor path otherwise the following
266-
will error will be thrown. (This is a particular problem with the
267-
annotation processor configuration in IntelliJ)
268-
269-
Error:java: java.lang.NoClassDefFoundError: com/google/auto/service/AutoService
270-
com.google.auto.service.AutoService
271-
-->
272-
<path>
273-
<groupId>com.google.auto.service</groupId>
274-
<artifactId>auto-service-annotations</artifactId>
275-
<version>${auto-service-annotations.version}</version>
276-
</path>
277-
</annotationProcessorPaths>
278-
</configuration>
279-
</plugin>
280-
</plugins>
281-
</build>
282-
</profile>
283-
284203
<profile>
285204
<id>include-samples</id>
286205
<modules>
287206
<module>samples</module>
288207
</modules>
289208
</profile>
290-
291209
</profiles>
292210

293211
</project>

0 commit comments

Comments
 (0)