Skip to content

Commit 7c7fe4f

Browse files
suztomosuztomo
authored
deps: upgrade enforcer rule to the latest 3.5.0 (GoogleCloudPlatform#2379)
* deps: upgrade enforcer rule to the latest 3.5.0 Credit: this change is based on the proposed changes by Robert Scholte in GoogleCloudPlatform#2378 (comment) * Fixing integration tests to use a better syntax in the new enforcer rule version * Detailed error message for the new enforcer rule version
1 parent f50c4db commit 7c7fe4f

17 files changed

Lines changed: 234 additions & 200 deletions

File tree

‎enforcer-rules/README.md‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,13 @@ $ mvn verify
1717
Listening for transport dt_socket at address: 5005
1818
```
1919

20-
When you debug one of the integration tests in the "src/it" directory, use the following
21-
command to specify the test case and to provide the debug parameter to Maven invoker plugin.
20+
When you debug one of the integration tests in the "src/it" directory, check the
21+
`build.log` files in the `enforcer-rules/target/it` directory (run
22+
`find enforcer-rules -name 'build.log'`).
23+
The file is used in verification scripts and usually contains build errors.
24+
25+
If you want to attach a debugger, use the following command to specify the test
26+
case and to provide the debug parameter to Maven invoker plugin.
2227

2328
```
2429
mvn install -Dmaven.test.skip -Dinvoker.test=bom-project-using-spring-repository \

‎enforcer-rules/pom.xml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
</licenses>
4949

5050
<properties>
51-
<enforcer.version>3.0.0-M3</enforcer.version>
51+
<enforcer.version>3.5.0</enforcer.version>
5252
<maven.compiler.source>1.8</maven.compiler.source>
5353
<maven.compiler.target>1.8</maven.compiler.target>
5454
</properties>
@@ -131,6 +131,20 @@
131131

132132
<build>
133133
<plugins>
134+
<plugin>
135+
<!-- generate index of project components, this enables users to
136+
specify the rule as linkageCheckerRule via the Named annotation -->
137+
<groupId>org.eclipse.sisu</groupId>
138+
<artifactId>sisu-maven-plugin</artifactId>
139+
<version>0.9.0.M1</version>
140+
<executions>
141+
<execution>
142+
<goals>
143+
<goal>main-index</goal>
144+
</goals>
145+
</execution>
146+
</executions>
147+
</plugin>
134148
<plugin>
135149
<artifactId>maven-invoker-plugin</artifactId>
136150
<version>3.2.2</version>

‎enforcer-rules/src/it/abstract-method-errors/pom.xml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<plugin>
5353
<groupId>org.apache.maven.plugins</groupId>
5454
<artifactId>maven-enforcer-plugin</artifactId>
55-
<version>3.0.0-M3</version>
55+
<version>@enforcer.version@</version>
5656
<dependencies>
5757
<dependency>
5858
<groupId>com.google.cloud.tools</groupId>
@@ -69,9 +69,7 @@
6969
</goals>
7070
<configuration>
7171
<rules>
72-
<LinkageCheckerRule
73-
implementation="com.google.cloud.tools.dependencies.enforcer.LinkageCheckerRule">
74-
</LinkageCheckerRule>
72+
<linkageCheckerRule/>
7573
</rules>
7674
</configuration>
7775
</execution>

‎enforcer-rules/src/it/bom-project-error/pom.xml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<plugin>
5555
<groupId>org.apache.maven.plugins</groupId>
5656
<artifactId>maven-enforcer-plugin</artifactId>
57-
<version>3.0.0-M3</version>
57+
<version>@enforcer.version@</version>
5858
<dependencies>
5959
<dependency>
6060
<groupId>com.google.cloud.tools</groupId>
@@ -71,10 +71,9 @@
7171
</goals>
7272
<configuration>
7373
<rules>
74-
<LinkageCheckerRule
75-
implementation="com.google.cloud.tools.dependencies.enforcer.LinkageCheckerRule">
74+
<linkageCheckerRule>
7675
<dependencySection>DEPENDENCY_MANAGEMENT</dependencySection>
77-
</LinkageCheckerRule>
76+
</linkageCheckerRule>
7877
</rules>
7978
</configuration>
8079
</execution>

‎enforcer-rules/src/it/bom-project-no-error/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<plugin>
5151
<groupId>org.apache.maven.plugins</groupId>
5252
<artifactId>maven-enforcer-plugin</artifactId>
53-
<version>3.0.0-M3</version>
53+
<version>@enforcer.version@</version>
5454
<dependencies>
5555
<dependency>
5656
<groupId>com.google.cloud.tools</groupId>

‎enforcer-rules/src/it/bom-project-no-packaging/pom.xml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<plugin>
4949
<groupId>org.apache.maven.plugins</groupId>
5050
<artifactId>maven-enforcer-plugin</artifactId>
51-
<version>3.0.0-M3</version>
51+
<version>@enforcer.version@</version>
5252
<dependencies>
5353
<dependency>
5454
<groupId>com.google.cloud.tools</groupId>
@@ -65,10 +65,9 @@
6565
</goals>
6666
<configuration>
6767
<rules>
68-
<LinkageCheckerRule
69-
implementation="com.google.cloud.tools.dependencies.enforcer.LinkageCheckerRule">
68+
<linkageCheckerRule>
7069
<dependencySection>DEPENDENCY_MANAGEMENT</dependencySection>
71-
</LinkageCheckerRule>
70+
</linkageCheckerRule>
7271
</rules>
7372
</configuration>
7473
</execution>

‎enforcer-rules/src/it/bom-project-using-spring-repository/pom.xml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<plugin>
6868
<groupId>org.apache.maven.plugins</groupId>
6969
<artifactId>maven-enforcer-plugin</artifactId>
70-
<version>3.0.0-M3</version>
70+
<version>@enforcer.version@</version>
7171
<dependencies>
7272
<dependency>
7373
<groupId>com.google.cloud.tools</groupId>
@@ -84,10 +84,9 @@
8484
</goals>
8585
<configuration>
8686
<rules>
87-
<LinkageCheckerRule
88-
implementation="com.google.cloud.tools.dependencies.enforcer.LinkageCheckerRule">
87+
<linkageCheckerRule>
8988
<dependencySection>DEPENDENCY_MANAGEMENT</dependencySection>
90-
</LinkageCheckerRule>
89+
</linkageCheckerRule>
9190
</rules>
9291
</configuration>
9392
</execution>

‎enforcer-rules/src/it/fail-build-for-linkage-errors/pom.xml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<plugin>
5151
<groupId>org.apache.maven.plugins</groupId>
5252
<artifactId>maven-enforcer-plugin</artifactId>
53-
<version>3.0.0-M3</version>
53+
<version>@enforcer.version@</version>
5454
<dependencies>
5555
<dependency>
5656
<groupId>com.google.cloud.tools</groupId>
@@ -67,9 +67,7 @@
6767
</goals>
6868
<configuration>
6969
<rules>
70-
<LinkageCheckerRule
71-
implementation="com.google.cloud.tools.dependencies.enforcer.LinkageCheckerRule">
72-
</LinkageCheckerRule>
70+
<linkageCheckerRule />
7371
</rules>
7472
</configuration>
7573
</execution>

‎enforcer-rules/src/it/inaccessible-class-error/pom.xml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<plugin>
5353
<groupId>org.apache.maven.plugins</groupId>
5454
<artifactId>maven-enforcer-plugin</artifactId>
55-
<version>3.0.0-M3</version>
55+
<version>@enforcer.version@</version>
5656
<dependencies>
5757
<dependency>
5858
<groupId>com.google.cloud.tools</groupId>
@@ -69,9 +69,7 @@
6969
</goals>
7070
<configuration>
7171
<rules>
72-
<LinkageCheckerRule
73-
implementation="com.google.cloud.tools.dependencies.enforcer.LinkageCheckerRule">
74-
</LinkageCheckerRule>
72+
<linkageCheckerRule />
7573
</rules>
7674
</configuration>
7775
</execution>

‎enforcer-rules/src/it/missing-filter-file-error/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<plugin>
5151
<groupId>org.apache.maven.plugins</groupId>
5252
<artifactId>maven-enforcer-plugin</artifactId>
53-
<version>3.0.0-M3</version>
53+
<version>@enforcer.version@</version>
5454
<dependencies>
5555
<dependency>
5656
<groupId>com.google.cloud.tools</groupId>

0 commit comments

Comments
 (0)