Merge commit '9807a385940a991d426e91e0d94963c5c14709ca' into 3.x
Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
diff --git a/NOTICE.md b/NOTICE.md
index f542417..bb4663d 100644
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -65,7 +65,7 @@
* License: Apache License, 2.0
* Copyright (C) 2009 The JSR-330 Expert Group
-Javassist Version 3.29.0-GA
+Javassist Version 3.29.2-GA
* License: Apache License, 2.0
* Project: http://www.javassist.org/
* Copyright (C) 1999- Shigeru Chiba. All Rights Reserved.
diff --git a/archetypes/jersey-heroku-webapp/src/main/resources/archetype-resources/pom.xml b/archetypes/jersey-heroku-webapp/src/main/resources/archetype-resources/pom.xml
index 1cd8f78..9ebc378 100644
--- a/archetypes/jersey-heroku-webapp/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/jersey-heroku-webapp/src/main/resources/archetype-resources/pom.xml
@@ -114,6 +114,6 @@
<jersey.version>${project.version}</jersey.version>
<jetty.version>11.0.15</jetty.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <surefire.mvn.plugin.version>3.0.0-M7</surefire.mvn.plugin.version>
+ <surefire.mvn.plugin.version>3.1.2</surefire.mvn.plugin.version>
</properties>
</project>
\ No newline at end of file
diff --git a/archetypes/jersey-quickstart-grizzly2/src/main/resources/archetype-resources/pom.xml b/archetypes/jersey-quickstart-grizzly2/src/main/resources/archetype-resources/pom.xml
index 0519417..98b0d46 100644
--- a/archetypes/jersey-quickstart-grizzly2/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/jersey-quickstart-grizzly2/src/main/resources/archetype-resources/pom.xml
@@ -83,8 +83,8 @@
<properties>
<jersey.version>${project.version}</jersey.version>
- <junit-jupiter.version>5.9.1</junit-jupiter.version>
+ <junit-jupiter.version>5.9.3</junit-jupiter.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <surefire.mvn.plugin.version>3.0.0-M7</surefire.mvn.plugin.version>
+ <surefire.mvn.plugin.version>3.1.2</surefire.mvn.plugin.version>
</properties>
</project>
diff --git a/containers/jetty-http2/pom.xml b/containers/jetty-http2/pom.xml
index 74da64c..3901a58 100644
--- a/containers/jetty-http2/pom.xml
+++ b/containers/jetty-http2/pom.xml
@@ -45,18 +45,42 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-server</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-alpn-conscrypt-server</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
diff --git a/examples/NOTICE.md b/examples/NOTICE.md
index 020b11a..aee85c4 100644
--- a/examples/NOTICE.md
+++ b/examples/NOTICE.md
@@ -66,7 +66,7 @@
* License: Apache License, 2.0
* Copyright (C) 2009 The JSR-330 Expert Group
-Javassist Version 3.29.0-GA
+Javassist Version 3.29.2-GA
* License: Apache License, 2.0
* Project: http://www.javassist.org/
* Copyright (C) 1999- Shigeru Chiba. All Rights Reserved.
diff --git a/examples/extended-wadl-webapp/pom.xml b/examples/extended-wadl-webapp/pom.xml
index 845f0c5..01cd7ef 100644
--- a/examples/extended-wadl-webapp/pom.xml
+++ b/examples/extended-wadl-webapp/pom.xml
@@ -234,6 +234,16 @@
<artifactId>xercesImpl</artifactId>
<version>${xerces.version}</version>
</docletArtifact>
+ <docletArtifact>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>1.4.01</version>
+ </docletArtifact>
+ <docletArtifact>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>${jakarta.jaxb.api.version}</version>
+ </docletArtifact>
</docletArtifacts>
<!-- the following option is required as a work around for
version 2.5 of the javadoc plugin which will be used
diff --git a/incubator/declarative-linking/pom.xml b/incubator/declarative-linking/pom.xml
index eb5a188..b433372 100644
--- a/incubator/declarative-linking/pom.xml
+++ b/incubator/declarative-linking/pom.xml
@@ -169,7 +169,7 @@
<id>attach-sources</id>
<phase>package</phase>
<goals>
- <goal>jar</goal>
+ <goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
diff --git a/pom.xml b/pom.xml
index 229c0c6..a587106 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2189,97 +2189,96 @@
<!-- Versions of Maven plugins -->
<antrun.mvn.plugin.version>3.1.0</antrun.mvn.plugin.version>
- <assembly.mvn.plugin.version>3.4.2</assembly.mvn.plugin.version>
- <enforcer.mvn.plugin.version>3.1.0</enforcer.mvn.plugin.version>
+ <assembly.mvn.plugin.version>3.6.0</assembly.mvn.plugin.version>
+ <enforcer.mvn.plugin.version>3.3.0</enforcer.mvn.plugin.version>
<exec.mvn.plugin.version>3.1.0</exec.mvn.plugin.version>
- <buildhelper.mvn.plugin.version>3.3.0</buildhelper.mvn.plugin.version>
- <buildnumber.mvn.plugin.version>3.0.0</buildnumber.mvn.plugin.version>
- <checkstyle.mvn.plugin.version>3.1.2</checkstyle.mvn.plugin.version>
- <checkstyle.version>10.3.2</checkstyle.version>
- <compiler.mvn.plugin.version>3.8.0</compiler.mvn.plugin.version>
- <dependency.mvn.plugin.version>3.3.0</dependency.mvn.plugin.version>
- <deploy.mvn.plugin.version>3.0.0-M2</deploy.mvn.plugin.version>
- <ear.mvn.plugin.version>3.2.0</ear.mvn.plugin.version>
- <failsafe.mvn.plugin.version>3.0.0-M7</failsafe.mvn.plugin.version>
- <felix.mvn.plugin.version>5.1.8</felix.mvn.plugin.version>
+ <buildhelper.mvn.plugin.version>3.4.0</buildhelper.mvn.plugin.version>
+ <buildnumber.mvn.plugin.version>3.2.0</buildnumber.mvn.plugin.version>
+ <checkstyle.mvn.plugin.version>3.3.0</checkstyle.mvn.plugin.version>
+ <checkstyle.version>10.9.3</checkstyle.version>
+ <compiler.mvn.plugin.version>3.9.0</compiler.mvn.plugin.version>
+ <dependency.mvn.plugin.version>3.6.0</dependency.mvn.plugin.version>
+ <deploy.mvn.plugin.version>3.1.1</deploy.mvn.plugin.version>
+ <ear.mvn.plugin.version>3.3.0</ear.mvn.plugin.version>
+ <failsafe.mvn.plugin.version>3.1.2</failsafe.mvn.plugin.version>
+ <felix.mvn.plugin.version>5.1.9</felix.mvn.plugin.version>
<findbugs.mvn.plugin.version>3.0.5</findbugs.mvn.plugin.version>
<gfembedded.mvn.plugin.version>5.1</gfembedded.mvn.plugin.version>
- <install.mvn.plugin.version>3.0.1</install.mvn.plugin.version>
- <istack.mvn.plugin.version>4.1.1</istack.mvn.plugin.version>
- <jar.mvn.plugin.version>3.2.2</jar.mvn.plugin.version>
- <javadoc.mvn.plugin.version>3.4.0</javadoc.mvn.plugin.version>
- <jxr.mvn.plugin.version>3.2.0</jxr.mvn.plugin.version>
+ <install.mvn.plugin.version>3.1.1</install.mvn.plugin.version>
+ <istack.mvn.plugin.version>4.2.0</istack.mvn.plugin.version>
+ <jar.mvn.plugin.version>3.3.0</jar.mvn.plugin.version>
+ <javadoc.mvn.plugin.version>3.5.0</javadoc.mvn.plugin.version>
+ <jxr.mvn.plugin.version>3.3.0</jxr.mvn.plugin.version>
<paxexam.mvn.plugin.version>1.2.4</paxexam.mvn.plugin.version>
<proguard.mvn.plugin.version>2.6.0</proguard.mvn.plugin.version>
- <resources.mvn.plugin.version>3.3.0</resources.mvn.plugin.version>
- <shade.mvn.plugin.version>3.3.0</shade.mvn.plugin.version>
+ <resources.mvn.plugin.version>3.3.1</resources.mvn.plugin.version>
+ <shade.mvn.plugin.version>3.4.1</shade.mvn.plugin.version>
<site.mvn.plugin.version>3.9.1</site.mvn.plugin.version>
- <source.mvn.plugin.version>3.2.1</source.mvn.plugin.version>
- <surefire.mvn.plugin.version>3.0.0-M7</surefire.mvn.plugin.version>
+ <source.mvn.plugin.version>3.3.0</source.mvn.plugin.version>
+ <surefire.mvn.plugin.version>3.1.2</surefire.mvn.plugin.version>
<war.mvn.plugin.version>3.3.2</war.mvn.plugin.version>
- <wiremock.mvn.plugin.version>2.9.0</wiremock.mvn.plugin.version>
+ <wiremock.mvn.plugin.version>2.11.0</wiremock.mvn.plugin.version>
<xml.mvn.plugin.version>1.0.2</xml.mvn.plugin.version>
<!-- END of Versions of Maven plugins -->
<!-- Dependency versions -->
<jersey.version>${project.version}</jersey.version>
- <arquillian.version>1.7.0.Alpha13</arquillian.version>
- <arquillian.weld.version>3.0.1.Final</arquillian.weld.version>
+ <arquillian.version>1.7.0.Final</arquillian.version>
+ <arquillian.weld.version>3.0.2.Final</arquillian.weld.version>
<!-- asm is now source integrated - keeping this property to see the version -->
<!-- see core-server/src/main/java/jersey/repackaged/asm/.. -->
<asm.version>9.5</asm.version>
- <bnd.plugin.version>2.3.6</bnd.plugin.version>
-
- <bouncycastle.version>1.68</bouncycastle.version>
- <commons.io.version>2.11.0</commons.io.version>
- <commons-lang3.version>3.3.2</commons-lang3.version>
+<!-- <bnd.plugin.version>2.3.6</bnd.plugin.version>-->
+ <bouncycastle.version>1.70</bouncycastle.version>
+ <commons.io.version>2.13.0</commons.io.version>
+<!-- <commons-lang3.version>3.3.2</commons-lang3.version>-->
<commons.logging.version>1.2</commons.logging.version>
<fasterxml.classmate.version>1.5.1</fasterxml.classmate.version>
<felix.eventadmin.version>1.6.4</felix.eventadmin.version>
- <felix.framework.security.version>2.8.3</felix.framework.security.version>
+ <felix.framework.security.version>2.8.4</felix.framework.security.version>
<felix.framework.version>7.0.5</felix.framework.version>
<findbugs.glassfish.version>1.7</findbugs.glassfish.version>
- <freemarker.version>2.3.31</freemarker.version>
- <gae.version>1.9.98</gae.version>
- <groovy.version>4.0.6</groovy.version>
- <gson.version>2.9.0</gson.version>
+ <freemarker.version>2.3.32</freemarker.version>
+ <gae.version>2.0.14</gae.version>
+ <groovy.version>4.0.12</groovy.version>
+ <gson.version>2.9.1</gson.version>
<!--versions, extracted here due to maven-enforcer-plugin -->
- <commons.codec.version>1.15</commons.codec.version>
+<!-- <commons.codec.version>1.15</commons.codec.version>-->
<com.uber.jaeger.version>0.27.0</com.uber.jaeger.version>
- <org.codehaus.gmavenplus.version>1.13.1</org.codehaus.gmavenplus.version>
+ <org.codehaus.gmavenplus.version>3.0.0</org.codehaus.gmavenplus.version>
<!-- end of versions extracted here due to maven-enforcer-plugin -->
<!-- microprofile -->
<microprofile.config.version>3.0</microprofile.config.version>
<microprofile.rest.client.version>3.0</microprofile.rest.client.version>
- <helidon.config.version>3.0.0-M1</helidon.config.version>
- <smallrye.config.version>3.0.0-RC1</smallrye.config.version>
+ <helidon.config.version>3.0.2</helidon.config.version>
+ <smallrye.config.version>3.0.0</smallrye.config.version>
<guava.version>31.1-jre</guava.version>
<hamcrest.version>2.2</hamcrest.version>
<helidon.version>1.4.13</helidon.version>
<helidon.jersey.connector.version>3.0.2</helidon.jersey.connector.version>
- <xmlunit.version>2.9.0</xmlunit.version>
+ <xmlunit.version>2.9.1</xmlunit.version>
<hk2.osgi.version>org.glassfish.hk2.*;version="[2.5,4)"</hk2.osgi.version>
<hk2.jvnet.osgi.version>org.jvnet.hk2.*;version="[2.5,4)"</hk2.jvnet.osgi.version>
<httpclient.version>4.5.14</httpclient.version>
<httpclient5.version>5.2.1</httpclient5.version>
<jackson.version>2.14.1</jackson.version>
- <javassist.version>3.29.0-GA</javassist.version>
- <jboss.logging.version>3.4.2.Final</jboss.logging.version>
+ <javassist.version>3.29.2-GA</javassist.version>
+ <jboss.logging.version>3.4.3.Final</jboss.logging.version>
<jersey1.version>1.19.3</jersey1.version>
<jersey1.last.final.version>${jersey1.version}</jersey1.last.final.version>
<jettison.version>1.3.7</jettison.version> <!-- TODO: 1.3.8 doesn't work; AbstractJsonTest complexBeanWithAttributes -->
- <jmh.version>1.35</jmh.version>
+ <jmh.version>1.36</jmh.version>
<jmockit.version>1.49</jmockit.version>
<junit4.version>4.13.2</junit4.version>
- <junit5.version>5.9.1</junit5.version>
- <junit-platform-suite.version>1.9.1</junit-platform-suite.version>
+ <junit5.version>5.9.3</junit5.version>
+ <junit-platform-suite.version>1.9.3</junit-platform-suite.version>
<kryo.version>4.0.2</kryo.version>
<mockito.version>3.12.4</mockito.version> <!-- CQ 17673 -->
<mustache.version>0.9.10</mustache.version>
- <netty.version>4.1.79.Final</netty.version>
+ <netty.version>4.1.93.Final</netty.version>
<opentracing.version>0.33.0</opentracing.version>
<osgi.version>6.0.0</osgi.version>
<osgi.framework.version>1.10.0</osgi.framework.version>
@@ -2291,20 +2290,20 @@
<rxjava.version>1.3.8</rxjava.version>
<rxjava2.version>2.2.21</rxjava2.version>
<simple.version>6.0.1</simple.version>
- <slf4j.version>2.0.5</slf4j.version>
- <spring6.version>6.0.0-M3</spring6.version>
+ <slf4j.version>2.0.7</slf4j.version>
+ <spring6.version>6.0.10</spring6.version>
<testng.version>7.6.1</testng.version>
<testng6.version>6.9.13.6</testng6.version>
<!-- Jakartified, eligible for CQ -->
- <weld.version>4.0.2.Final</weld.version>
- <weld3.version>3.1.7.SP1</weld3.version>
+ <weld.version>4.0.3.Final</weld.version>
+ <weld3.version>3.1.9.Final</weld3.version>
<validation.impl.version>7.0.5.Final</validation.impl.version>
<!-- END of Jakartified, eligible for CQ -->
<wiremock.version>2.27.2</wiremock.version>
<xerces.version>2.12.2</xerces.version>
<!-- Graal VM -->
- <graalvm.version>20.3.2</graalvm.version>
+ <graalvm.version>20.3.10</graalvm.version>
<!-- do not need CQs (below this line till the end of version properties)-->
<gf.impl.version>6.2.5</gf.impl.version>
@@ -2316,12 +2315,12 @@
<grizzly2.version>3.0.1</grizzly2.version>
<grizzly.client.version>1.16</grizzly.client.version>
<grizzly.npn.version>2.0.0</grizzly.npn.version>
- <hk2.version>3.0.3</hk2.version>
+ <hk2.version>3.0.4</hk2.version>
<jsp.version>3.0.0</jsp.version>
<jstl.version>2.0.0</jstl.version>
<jta.api.version>2.0.1</jta.api.version>
<servlet5.version>5.0.0</servlet5.version>
- <istack.commons.runtime.version>4.0.0</istack.commons.runtime.version>
+ <istack.commons.runtime.version>4.0.1</istack.commons.runtime.version>
<jakarta.activation-api.version>2.0.1</jakarta.activation-api.version>
<jakarta.activation.version>2.0.1</jakarta.activation.version>
<jakarta.el.version>4.0.0</jakarta.el.version>
@@ -2332,7 +2331,7 @@
<jakarta.interceptor.version>2.0.1</jakarta.interceptor.version>
<jakarta.jsonp.version>2.0.2</jakarta.jsonp.version>
<jakarta.persistence.version>3.0.0</jakarta.persistence.version>
- <jakarta.validation.api.version>3.0.0</jakarta.validation.api.version> <!--Can't be updated to 3.0.1 /OSGi incompatibility with JDK 1.8 -->
+ <jakarta.validation.api.version>3.0.2</jakarta.validation.api.version> <!--Can't be updated to 3.0.1 /OSGi incompatibility with JDK 1.8 -->
<jakarta.jaxb.api.version>3.0.1</jakarta.jaxb.api.version>
<jaxb.ri.version>3.0.2</jaxb.ri.version>
<jaxrs.api.spec.version>3.0</jaxrs.api.spec.version>
@@ -2340,16 +2339,16 @@
<jetty.osgi.version>org.eclipse.jetty.*;version="[11,15)"</jetty.osgi.version>
<jetty.version>11.0.15</jetty.version>
<jetty9.version>9.4.51.v20230217</jetty9.version>
- <jetty.plugin.version>11.0.14</jetty.plugin.version>
+ <jetty.plugin.version>11.0.15</jetty.plugin.version>
<jetty.servlet.api.25.version>6.1.14</jetty.servlet.api.25.version>
<jsonb.api.version>2.0.0</jsonb.api.version>
- <jsonp.ri.version>1.0.0</jsonp.ri.version>
- <jsonp.jaxrs.version>1.0.0</jsonp.jaxrs.version>
- <moxy.version>3.0.2</moxy.version>
+ <jsonp.ri.version>1.0.3</jsonp.ri.version>
+ <jsonp.jaxrs.version>1.0.3</jsonp.jaxrs.version>
+ <moxy.version>3.0.3</moxy.version>
<yasson.version>2.0.4</yasson.version>
<!-- END of Jakartified -->
<javax.annotation.version>1.3.2</javax.annotation.version> <!--Deprecated, used only for @generated annotation in perf tests -->
- <mimepull.version>1.9.13</mimepull.version>
+ <mimepull.version>1.9.15</mimepull.version>
</properties>
</project>
diff --git a/test-framework/maven/container-runner-maven-plugin/pom.xml b/test-framework/maven/container-runner-maven-plugin/pom.xml
index 30bbfde..be654ef 100644
--- a/test-framework/maven/container-runner-maven-plugin/pom.xml
+++ b/test-framework/maven/container-runner-maven-plugin/pom.xml
@@ -36,11 +36,11 @@
</description>
<properties>
- <groovy.version>3.0.2</groovy.version>
- <groovy-eclipse-compiler.version>3.6.0-03</groovy-eclipse-compiler.version>
- <groovy-eclipse-batch.version>3.0.2-02</groovy-eclipse-batch.version>
- <maven.version>3.8.6</maven.version>
- <maven-plugin.version>3.6.4</maven-plugin.version>
+ <groovy.version>3.0.17</groovy.version>
+ <groovy-eclipse-compiler.version>3.7.0</groovy-eclipse-compiler.version>
+ <groovy-eclipse-batch.version>3.0.8-01</groovy-eclipse-batch.version>
+ <maven.version>3.9.2</maven.version>
+ <maven-plugin.version>3.9.0</maven-plugin.version>
</properties>
<dependencies>
@@ -145,6 +145,18 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -175,10 +187,20 @@
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<version>${project.version}</version>
diff --git a/test-framework/maven/custom-enforcer-rules/src/main/java/org/glassfish/jersey/test/maven/rule/FilePatternDoesNotExistRule.java b/test-framework/maven/custom-enforcer-rules/src/main/java/org/glassfish/jersey/test/maven/rule/FilePatternDoesNotExistRule.java
index 604cfcf..f9c8fde 100644
--- a/test-framework/maven/custom-enforcer-rules/src/main/java/org/glassfish/jersey/test/maven/rule/FilePatternDoesNotExistRule.java
+++ b/test-framework/maven/custom-enforcer-rules/src/main/java/org/glassfish/jersey/test/maven/rule/FilePatternDoesNotExistRule.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -24,8 +24,7 @@
import org.apache.commons.io.filefilter.WildcardFileFilter;
import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
-import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
-import org.apache.maven.plugins.enforcer.AbstractNonCacheableEnforcerRule;
+import org.apache.maven.enforcer.rules.AbstractStandardEnforcerRule;
/**
* Maven enforcer rule to enforce that given set of files does not exist.<br/>
@@ -33,11 +32,11 @@
*
* @author Stepan Vavra
*/
-public class FilePatternDoesNotExistRule extends AbstractNonCacheableEnforcerRule {
+public class FilePatternDoesNotExistRule extends AbstractStandardEnforcerRule {
File[] files;
- public void execute(EnforcerRuleHelper helper)
+ public void execute()
throws EnforcerRuleException {
if (files == null) {
diff --git a/test-framework/maven/custom-enforcer-rules/src/main/java/org/glassfish/jersey/test/maven/rule/PatternNotMatchedInFileRule.java b/test-framework/maven/custom-enforcer-rules/src/main/java/org/glassfish/jersey/test/maven/rule/PatternNotMatchedInFileRule.java
index 5906b3e..0f11c5e 100644
--- a/test-framework/maven/custom-enforcer-rules/src/main/java/org/glassfish/jersey/test/maven/rule/PatternNotMatchedInFileRule.java
+++ b/test-framework/maven/custom-enforcer-rules/src/main/java/org/glassfish/jersey/test/maven/rule/PatternNotMatchedInFileRule.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -26,8 +26,7 @@
import java.util.stream.Collectors;
import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
-import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
-import org.apache.maven.plugins.enforcer.AbstractNonCacheableEnforcerRule;
+import org.apache.maven.enforcer.rules.AbstractStandardEnforcerRule;
/**
* Maven enforcer rule to enforce that given file does not contain line matching given pattern. When matched, exception is
@@ -37,7 +36,7 @@
*
* @author Stepan Vavra
*/
-public class PatternNotMatchedInFileRule extends AbstractNonCacheableEnforcerRule {
+public class PatternNotMatchedInFileRule extends AbstractStandardEnforcerRule {
/**
* The pattern to look for in the given file.
@@ -55,7 +54,7 @@
*/
int maxMatchedLines = 0;
- public void execute(EnforcerRuleHelper helper)
+ public void execute()
throws EnforcerRuleException {
if (file == null || !file.exists()) {
diff --git a/test-framework/maven/custom-enforcer-rules/src/test/java/org/glassfish/jersey/test/maven/rule/FilePatternDoesNotExistRuleTest.java b/test-framework/maven/custom-enforcer-rules/src/test/java/org/glassfish/jersey/test/maven/rule/FilePatternDoesNotExistRuleTest.java
index 0c2d91a..ed1b342 100644
--- a/test-framework/maven/custom-enforcer-rules/src/test/java/org/glassfish/jersey/test/maven/rule/FilePatternDoesNotExistRuleTest.java
+++ b/test-framework/maven/custom-enforcer-rules/src/test/java/org/glassfish/jersey/test/maven/rule/FilePatternDoesNotExistRuleTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -42,7 +42,7 @@
final String pattern = file.getAbsolutePath().replace("PatternDoes", "*");
filePatternDoesNotExistRule.files = new File[] {new File(pattern)};
- filePatternDoesNotExistRule.execute(null);
+ filePatternDoesNotExistRule.execute();
});
}
@@ -56,6 +56,6 @@
final String pattern = file.getAbsolutePath().replace("PatternDoes", "*").replace("Exist", "");
filePatternDoesNotExistRule.files = new File[] {new File(pattern)};
- filePatternDoesNotExistRule.execute(null);
+ filePatternDoesNotExistRule.execute();
}
}
diff --git a/test-framework/maven/custom-enforcer-rules/src/test/java/org/glassfish/jersey/test/maven/rule/PatternNotMatchedInFileRuleTest.java b/test-framework/maven/custom-enforcer-rules/src/test/java/org/glassfish/jersey/test/maven/rule/PatternNotMatchedInFileRuleTest.java
index 681106a..223a496 100644
--- a/test-framework/maven/custom-enforcer-rules/src/test/java/org/glassfish/jersey/test/maven/rule/PatternNotMatchedInFileRuleTest.java
+++ b/test-framework/maven/custom-enforcer-rules/src/test/java/org/glassfish/jersey/test/maven/rule/PatternNotMatchedInFileRuleTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -47,6 +47,6 @@
filePatternDoesNotContainLineMatching.file = new File(getClass().getResource(fileOnClasspath).toURI());
filePatternDoesNotContainLineMatching.pattern = ".*java\\.lang\\.OutOfMemoryError.*";
- filePatternDoesNotContainLineMatching.execute(null);
+ filePatternDoesNotContainLineMatching.execute();
}
}
