From 9807a385940a991d426e91e0d94963c5c14709ca Mon Sep 17 00:00:00 2001 From: Maxim Nesen <24524084+senivam@users.noreply.github.com> Date: Tue, 20 Jun 2023 10:10:00 +0200 Subject: [PATCH] dependencies update (#5348) Signed-off-by: Maxim Nesen --- NOTICE.md | 4 +- .../resources/archetype-resources/pom.xml | 4 +- .../resources/archetype-resources/pom.xml | 4 +- examples/NOTICE.md | 4 +- examples/extended-wadl-webapp/pom.xml | 10 +++ .../main/resources/META-INF/NOTICE.markdown | 2 +- incubator/declarative-linking/pom.xml | 2 +- pom.xml | 90 +++++++++---------- .../container-runner-maven-plugin/pom.xml | 24 +++-- .../rule/FilePatternDoesNotExistRule.java | 9 +- .../rule/PatternNotMatchedInFileRule.java | 9 +- .../rule/FilePatternDoesNotExistRuleTest.java | 6 +- .../rule/PatternNotMatchedInFileRuleTest.java | 4 +- 13 files changed, 96 insertions(+), 76 deletions(-) diff --git a/NOTICE.md b/NOTICE.md index 505bc115b9..eb090e1044 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -47,7 +47,7 @@ Bean Validation API 2.0.2 * Copyright: 2009, Red Hat, Inc. and/or its affiliates, and individual contributors * by the @authors tag. -Hibernate Validator CDI, 6.2.4.Final +Hibernate Validator CDI, 6.2.5.Final * License: Apache License, 2.0 * Project: https://beanvalidation.org/ * Repackaged in org.glassfish.jersey.server.validation.internal.hibernate @@ -65,7 +65,7 @@ javax.inject Version: 1 * 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 81eec1824a..42ff2201bb 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 @@ -111,8 +111,8 @@ ${project.version} - 9.4.49.v20220914 + 9.4.51.v20230217 UTF-8 - 3.0.0-M7 + 3.1.2 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 0519417080..98b0d46984 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 @@ ${project.version} - 5.9.1 + 5.9.3 UTF-8 - 3.0.0-M7 + 3.1.2 diff --git a/examples/NOTICE.md b/examples/NOTICE.md index d06ee007dc..5815b89a80 100644 --- a/examples/NOTICE.md +++ b/examples/NOTICE.md @@ -43,7 +43,7 @@ Bean Validation API 2.0.2 * Copyright: 2009, Red Hat, Inc. and/or its affiliates, and individual contributors * by the @authors tag. -Hibernate Validator CDI, 6.2.4.Final +Hibernate Validator CDI, 6.2.5.Final * License: Apache License, 2.0 * Project: https://beanvalidation.org/ * Repackaged in org.glassfish.jersey.server.validation.internal.hibernate @@ -61,7 +61,7 @@ javax.inject Version: 1 * 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 a75ead95a1..26655a6468 100644 --- a/examples/extended-wadl-webapp/pom.xml +++ b/examples/extended-wadl-webapp/pom.xml @@ -208,6 +208,16 @@ xercesImpl ${xerces.version} + + xml-apis + xml-apis + 1.4.01 + + + jakarta.xml.bind + jakarta.xml.bind-api + ${jaxb.api.version} + 3.1.0 - 3.4.2 - 3.1.0 + 3.6.0 + 3.3.0 3.1.0 - 3.3.0 - 3.0.0 - 3.1.2 - 10.3.2 + 3.4.0 + 3.2.0 + 3.3.0 + 10.9.3 3.9.0 - 3.3.0 - 3.0.0-M2 - 3.2.0 - 3.0.0-M7 - 5.1.8 + 3.6.0 + 3.1.1 + 3.3.0 + 3.1.2 + 5.1.9 3.0.5 5.1 - 3.0.1 - 4.1.1 - 3.2.2 - 3.4.0 - 3.2.0 + 3.1.1 + 4.2.0 + 3.3.0 + 3.5.0 + 3.3.0 1.2.4 2.6.0 - 3.3.0 - 3.3.0 + 3.3.1 + 3.4.1 3.9.1 - 3.2.1 - 3.0.0-M7 + 3.3.0 + 3.1.2 3.3.2 - 2.9.0 + 2.11.0 1.0.2 ${project.version} - 1.5.0.Final + 1.7.0.Final 2.1.0.Final 9.5 - 2.3.6 - 2.11.0 - 3.3.2 + + 2.13.0 + 1.2 1.5.1 1.6.4 - 2.8.3 + 2.8.4 7.0.5 1.7 - 2.3.31 - 1.9.98 - 4.0.6 - 2.9.0 + 2.3.32 + 2.0.14 + 4.0.12 + 2.9.1 31.1-jre 2.2 - 1.4.9 - 2.9.0 - 4.5.13 + 1.4.13 + 2.9.1 + 4.5.14 5.2.1 2.14.1 1.9.13 - 3.29.0-GA + 3.29.2-GA 1.19.3 ${jersey1.version} 1.3.7 - 1.35 + 1.36 1.49 4.13.2 - 5.9.1 - 1.9.1 + 5.9.3 + 1.9.3 4.0.2 3.12.4 0.9.10 - 4.1.79.Final + 4.1.93.Final 0.33.0 6.0.0 1.10.0 @@ -2249,20 +2249,20 @@ 1.3.8 2.2.21 6.0.1 - 2.0.3 + 2.0.7 1.3.11 4.3.30.RELEASE - 5.3.22 + 5.3.27 7.6.1 6.9.13.6 - 6.2.4.Final + 6.2.5.Final 3.1.9.Final 2.27.2 2.12.2 - 20.3.2 + 20.3.10 1.2 @@ -2286,12 +2286,12 @@ 2.2.3 2.0.2 2.3.3 - 2.3.6 + 2.3.8 2.1 2.1.6 6.1.26 org.eclipse.jetty.*;version="[9.4,11)" - 9.4.49.v20220914 + 9.4.51.v20230217 6.1.14 1.0.2 1.1.6 @@ -2302,7 +2302,7 @@ 2.0.1 2.0 1.9.15 - 2.7.10 + 2.7.12 1.6.1 2.5 3.1.0 diff --git a/test-framework/maven/container-runner-maven-plugin/pom.xml b/test-framework/maven/container-runner-maven-plugin/pom.xml index 122b543c03..d5153bc597 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 @@ - 3.0.2 - 3.6.0-03 - 3.0.2-02 - 3.8.6 - 3.6.4 + 3.0.17 + 3.7.0 + 3.0.8-01 + 3.9.2 + 3.9.0 @@ -120,7 +120,7 @@ org.codehaus.gmavenplus gmavenplus-plugin - 1.13.1 + 3.0.0 org.apache.maven.shared @@ -154,6 +154,14 @@ org.apache.maven maven-plugin-api + + org.slf4j + slf4j-api + + + com.google.guava + guava + @@ -184,6 +192,10 @@ org.apache.ant ant + + org.slf4j + slf4j-api + 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 604cfcfccc..f9c8fdeebc 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.
@@ -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 5906b3e6f2..0f11c5edc1 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 @@ public class PatternNotMatchedInFileRule extends AbstractNonCacheableEnforcerRul */ 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 0c2d91ad22..ed1b3426ed 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 @@ public void testMatchedPath() throws URISyntaxException, EnforcerRuleException { final String pattern = file.getAbsolutePath().replace("PatternDoes", "*"); filePatternDoesNotExistRule.files = new File[] {new File(pattern)}; - filePatternDoesNotExistRule.execute(null); + filePatternDoesNotExistRule.execute(); }); } @@ -56,6 +56,6 @@ public void testNotMatchedPath() throws URISyntaxException, EnforcerRuleExceptio 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 681106a4f8..223a496391 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 @@ private void testFilePatternLineMatcher(String fileOnClasspath) throws URISyntax filePatternDoesNotContainLineMatching.file = new File(getClass().getResource(fileOnClasspath).toURI()); filePatternDoesNotContainLineMatching.pattern = ".*java\\.lang\\.OutOfMemoryError.*"; - filePatternDoesNotContainLineMatching.execute(null); + filePatternDoesNotContainLineMatching.execute(); } }