Merge remote-tracking branch 'origin/2.x' into 3.x

omnifaces · Jun 24, 2023 · 013bf26 · 013bf26
2 parents 8b0a74a + 3c76a63
commit 013bf26
Showing 1 changed file with 31 additions and 16 deletions.
diff --git a/pom.xml b/pom.xml
@@ -210,28 +210,43 @@
 
 		<plugins>
 
+			<!-- Prevent wrong JDK from being used to build the project. -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>3.0.0</version>
+                <executions>
+                    <execution>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireJavaVersion>
+                                    <version>[1.8,9)</version>
+                                </requireJavaVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
 			<!-- Add missing license headers to source files. -->
 			<plugin>
 				<groupId>com.mycila</groupId>
 				<artifactId>license-maven-plugin</artifactId>
 				<version>4.1</version>
 				<configuration>
-					<header>license.txt</header>
-					<excludes>
-						<exclude>*.*</exclude>
-					</excludes>
-					<mapping>
-						<java>SLASHSTAR_STYLE</java>
-					</mapping>
+                    <licenseSets>
+                        <licenseSet>
+                            <header>license.txt</header>
+                            <excludes>
+                                <exclude>*.*</exclude>
+                            </excludes>
+                        </licenseSet>
+                    </licenseSets>
 				</configuration>
-				<executions>
-					<execution>
-						<phase>process-sources</phase>
-						<goals>
-							<goal>format</goal>
-						</goals>
-					</execution>
-				</executions>
 			</plugin>
 
 			<!-- Configure the JavaScript minifier. -->
@@ -302,7 +317,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>3.2.2</version>
+				<version>3.3.0</version>
 				<configuration>
 					<archive>
 						<manifest>