Skip to content

Commit a31af40

Browse files
committed
Sync enforcer configuration setup with ASF
1 parent 1fa3328 commit a31af40

File tree

1 file changed

+11
-42
lines changed

1 file changed

+11
-42
lines changed

pom.xml

Lines changed: 11 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -555,9 +555,16 @@ limitations under the License.
555555
<plugin>
556556
<groupId>org.apache.maven.plugins</groupId>
557557
<artifactId>maven-enforcer-plugin</artifactId>
558+
<dependencies>
559+
<dependency>
560+
<groupId>org.codehaus.mojo</groupId>
561+
<artifactId>extra-enforcer-rules</artifactId>
562+
<version>1.6.2</version>
563+
</dependency>
564+
</dependencies>
558565
<executions>
559566
<execution>
560-
<id>enforce-maven</id>
567+
<id>enforce-maven-and-java-bytecode</id>
561568
<goals>
562569
<goal>enforce</goal>
563570
</goals>
@@ -567,6 +574,9 @@ limitations under the License.
567574
<version>3.2.5</version>
568575
<message>This project requires at least Maven 3.2.5</message>
569576
</requireMavenVersion>
577+
<enforceBytecodeVersion>
578+
<maxJdkVersion>${maven.compiler.target}</maxJdkVersion>
579+
</enforceBytecodeVersion>
570580
</rules>
571581
</configuration>
572582
</execution>
@@ -753,46 +763,5 @@ limitations under the License.
753763
</plugins>
754764
</build>
755765
</profile>
756-
<profile>
757-
<id>pre-JEP_247</id>
758-
<activation>
759-
<jdk>[7,8]</jdk>
760-
</activation>
761-
<build>
762-
<plugins>
763-
<plugin>
764-
<groupId>org.apache.maven.plugins</groupId>
765-
<artifactId>maven-enforcer-plugin</artifactId>
766-
<dependencies>
767-
<dependency>
768-
<groupId>org.codehaus.mojo</groupId>
769-
<artifactId>animal-sniffer-enforcer-rule</artifactId>
770-
<version>1.23</version>
771-
</dependency>
772-
</dependencies>
773-
<executions>
774-
<execution>
775-
<id>check-signatures</id>
776-
<phase>test</phase>
777-
<goals>
778-
<goal>enforce</goal>
779-
</goals>
780-
<configuration>
781-
<rules>
782-
<checkSignatureRule implementation="org.codehaus.mojo.animal_sniffer.enforcer.CheckSignatureRule">
783-
<signature>
784-
<groupId>org.codehaus.mojo.signature</groupId>
785-
<artifactId>java1${javaVersion}</artifactId>
786-
<version>1.0</version>
787-
</signature>
788-
</checkSignatureRule>
789-
</rules>
790-
</configuration>
791-
</execution>
792-
</executions>
793-
</plugin>
794-
</plugins>
795-
</build>
796-
</profile>
797766
</profiles>
798767
</project>

0 commit comments

Comments
 (0)