Bytecode version of multirelease metadata should be lower or equal to specified version (#158)

Vlatombe · web-flow · commit 90ac027afa09 · 2021-12-15T15:30:52.000+01:00
diff --git a/src/it/enforce-bytecode-version-multirelease-2/invoker.properties b/src/it/enforce-bytecode-version-multirelease-2/invoker.properties
@@ -0,0 +1,2 @@
+invoker.goals = enforcer:enforce
+invoker.buildResult = success
diff --git a/src/it/enforce-bytecode-version-multirelease-2/pom.xml b/src/it/enforce-bytecode-version-multirelease-2/pom.xml
@@ -0,0 +1,48 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>pim.pam.poum</groupId>
+	<artifactId>smoking</artifactId>
+	<version>1.0-SNAPSHOT</version>
+
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-enforcer-plugin</artifactId>
+				<version>@enforcerPluginVersion@</version>
+				<dependencies>
+					<dependency>
+						<groupId>@project.groupId@</groupId>
+						<artifactId>@project.artifactId@</artifactId>
+						<version>@project.version@</version>
+					</dependency>
+				</dependencies>
+				<configuration>
+					<rules>
+						<enforceBytecodeVersion>
+							<maxJdkVersion>1.8</maxJdkVersion>
+						</enforceBytecodeVersion>
+					</rules>
+				</configuration>
+				<executions>
+					<execution>
+						<phase>compile</phase>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>com.fasterxml.jackson.module</groupId>
+			<artifactId>jackson-module-jaxb-annotations</artifactId>
+			<version>2.13.0</version>
+			<scope>runtime</scope>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/src/it/enforce-bytecode-version-multirelease-2/verify.groovy b/src/it/enforce-bytecode-version-multirelease-2/verify.groovy
@@ -0,0 +1,9 @@
+File file = new File( basedir, "build.log" );
+assert file.exists();
+
+String text = file.getText("utf-8");
+
+assert text.contains( '[INFO] Adding ignore: module-info' )
+assert !text.contains( '[WARNING] Invalid bytecodeVersion for com.fasterxml.jackson.core:jackson-core:jar:2.13.0:runtime' )
+
+return true;
diff --git a/src/main/java/org/apache/maven/plugins/enforcer/EnforceBytecodeVersion.java b/src/main/java/org/apache/maven/plugins/enforcer/EnforceBytecodeVersion.java
@@ -351,16 +351,16 @@ private String isBadArtifact( Artifact a )
                         
                         if ( matcher.matches() )
                         {
-                            Integer expectedMajor = JDK_TO_MAJOR_VERSION_NUMBER_MAPPING.get( matcher.group( 1 ) );
+                            Integer maxExpectedMajor = JDK_TO_MAJOR_VERSION_NUMBER_MAPPING.get( matcher.group( 1 ) );
                             
-                            if (expectedMajor == null) {
+                            if (maxExpectedMajor == null) {
                                 getLog().warn( "Unknown bytecodeVersion for " + a + " : "
-                                                + entry.getName() + ": got " + expectedMajor + " class-file-version" ); 
+                                                + entry.getName() + ": got " + maxExpectedMajor + " class-file-version" );
                             }
-                            else if ( major != expectedMajor )
+                            else if ( major > maxExpectedMajor )
                             {
                                 getLog().warn( "Invalid bytecodeVersion for " + a + " : "
-                                        + entry.getName() + ": expected " + expectedMajor + ", but was " + major );
+                                        + entry.getName() + ": expected lower or equal to " + maxExpectedMajor + ", but was " + major );
                             }
                         }
                         else

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+invoker.goals = enforcer:enforce`
	`2`	`+invoker.buildResult = success`
Original file line number	Diff line number	Diff line change
`@@ -351,16 +351,16 @@ private String isBadArtifact( Artifact a )`
`351`	`351`
`352`	`352`	`if ( matcher.matches() )`
`353`	`353`	`{`
`354`		`- Integer expectedMajor = JDK_TO_MAJOR_VERSION_NUMBER_MAPPING.get( matcher.group( 1 ) );`
	`354`	`+ Integer maxExpectedMajor = JDK_TO_MAJOR_VERSION_NUMBER_MAPPING.get( matcher.group( 1 ) );`
`355`	`355`
`356`		`- if (expectedMajor == null) {`
	`356`	`+ if (maxExpectedMajor == null) {`
`357`	`357`	`getLog().warn( "Unknown bytecodeVersion for " + a + " : "`
`358`		`- + entry.getName() + ": got " + expectedMajor + " class-file-version" );`
	`358`	`+ + entry.getName() + ": got " + maxExpectedMajor + " class-file-version" );`
`359`	`359`	`}`
`360`		`- else if ( major != expectedMajor )`
	`360`	`+ else if ( major > maxExpectedMajor )`
`361`	`361`	`{`
`362`	`362`	`getLog().warn( "Invalid bytecodeVersion for " + a + " : "`
`363`		`- + entry.getName() + ": expected " + expectedMajor + ", but was " + major );`
	`363`	`+ + entry.getName() + ": expected lower or equal to " + maxExpectedMajor + ", but was " + major );`
`364`	`364`	`}`
`365`	`365`	`}`
`366`	`366`	`else`