Skip to content
This repository was archived by the owner on Sep 16, 2023. It is now read-only.

Commit e8d945d

Browse files
committed
feat: place enforce linkage checker plugin inside parent
1 parent 582fb16 commit e8d945d

File tree

2 files changed

+26
-29
lines changed

2 files changed

+26
-29
lines changed

google-cloud-asset-bom/pom.xml

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -108,34 +108,6 @@
108108
<skip>true</skip>
109109
</configuration>
110110
</plugin>
111-
<plugin>
112-
<groupId>org.apache.maven.plugins</groupId>
113-
<artifactId>maven-enforcer-plugin</artifactId>
114-
<version>3.0.0-M3</version>
115-
<dependencies>
116-
<dependency>
117-
<groupId>com.google.cloud.tools</groupId>
118-
<artifactId>linkage-checker-enforcer-rules</artifactId>
119-
<version>1.1.0</version>
120-
</dependency>
121-
</dependencies>
122-
<executions>
123-
<execution>
124-
<id>enforce-linkage-checker</id>
125-
<!-- Important! Should run after compile -->
126-
<phase>verify</phase>
127-
<goals>
128-
<goal>enforce</goal>
129-
</goals>
130-
<configuration>
131-
<rules>
132-
<LinkageCheckerRule
133-
implementation="com.google.cloud.tools.dependencies.enforcer.LinkageCheckerRule"/>
134-
</rules>
135-
</configuration>
136-
</execution>
137-
</executions>
138-
</plugin>
139111
</plugins>
140112
</build>
141113
</project>

pom.xml

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<grpc.version>1.26.0</grpc.version>
7272
<protobuf.version>3.11.1</protobuf.version>
7373
<junit.version>4.13</junit.version>
74-
<guava.version>28.1-android</guava.version>
74+
<guava.version>28.2-android</guava.version>
7575
<threeten.version>1.4.0</threeten.version>
7676
<javax.annotations.version>1.3.2</javax.annotations.version>
7777
<animal-sniffer.version>1.18</animal-sniffer.version>
@@ -222,6 +222,31 @@
222222
<ignoredUnusedDeclaredDependencies>org.objenesis:objenesis</ignoredUnusedDeclaredDependencies>
223223
</configuration>
224224
</plugin>
225+
<plugin>
226+
<groupId>org.apache.maven.plugins</groupId>
227+
<artifactId>maven-enforcer-plugin</artifactId>
228+
<version>3.0.0-M3</version>
229+
<executions>
230+
<execution>
231+
<id>enforce</id>
232+
<goals>
233+
<goal>enforce</goal>
234+
</goals>
235+
<configuration>
236+
<rules>
237+
<requireMavenVersion>
238+
<version>[3.0,)</version>
239+
</requireMavenVersion>
240+
<requireJavaVersion>
241+
<version>[1.7,)</version>
242+
</requireJavaVersion>
243+
<dependencyConvergence/>
244+
<requireUpperBoundDeps/>
245+
</rules>
246+
</configuration>
247+
</execution>
248+
</executions>
249+
</plugin>
225250
</plugins>
226251
</pluginManagement>
227252
</build>

0 commit comments

Comments
 (0)