Merge pull request #3875 from jamezp/parent-upgrade-2

Upgrade the resteasy-parent to 2.0.4.Final
resteasy · Oct 23, 2023 · f114a41 · f114a41
2 parents 6e3ba97 + f2f64e5
commit f114a41
Show file tree

Hide file tree

Showing 69 changed files with 662 additions and 796 deletions.
diff --git a/...illian/RESTEASY-1630-jetty-resteasy-servlet-initializer/src/test/resources/arquillian.xml b/...illian/RESTEASY-1630-jetty-resteasy-servlet-initializer/src/test/resources/arquillian.xml
@@ -15,8 +15,8 @@
             <property name="bindHttpPort">0</property>
             <property name="javaVmArguments">${additionalJvmArgs}</property>
             <!--
-           <property name="javaVmArguments">${additionalJvmArgs} -Xdebug -Xrunjdwp:transport=dt_socket,address=8585,server=y, suspend=n</property>
-         -->
+              <property name="javaVmArguments">${additionalJvmArgs} -Xdebug -Xrunjdwp:transport=dt_socket,address=8585,server=y, suspend=n</property>
+            -->
         </configuration>
     </container>
 </arquillian>
diff --git a/docbook/pom.xml b/docbook/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>dev.resteasy.tools</groupId>
         <artifactId>resteasy-parent</artifactId>
-        <version>2.0.3.Final</version>
+        <version>2.0.4.Final</version>
         <relativePath/>
     </parent>
 

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.resteasy.tools</groupId>
         <artifactId>resteasy-parent</artifactId>
-        <version>2.0.3.Final</version>
+        <version>2.0.4.Final</version>
         <relativePath/>
     </parent>
 

diff --git a/resteasy-bom/pom.xml b/resteasy-bom/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>dev.resteasy.tools</groupId>
         <artifactId>resteasy-parent</artifactId>
-        <version>2.0.3.Final</version>
+        <version>2.0.4.Final</version>
         <relativePath/>
     </parent>
 

diff --git a/...y-client/src/main/java/org/jboss/resteasy/client/jaxrs/engines/AsyncClientHttpEngine.java b/...y-client/src/main/java/org/jboss/resteasy/client/jaxrs/engines/AsyncClientHttpEngine.java
@@ -22,7 +22,7 @@ public interface AsyncClientHttpEngine extends ClientHttpEngine {
      *
      * @param <T> Result-Type
      */
-    public interface ResultExtractor<T> {
+    interface ResultExtractor<T> {
         /**
          * Extracts a result out of a Response
          *

diff --git a/...-core-spi/src/main/java/org/jboss/resteasy/spi/interception/JaxrsInterceptorRegistry.java b/...-core-spi/src/main/java/org/jboss/resteasy/spi/interception/JaxrsInterceptorRegistry.java
@@ -18,7 +18,7 @@ public Match(final Object interceptor, final int order) {
         public final int order;
     }
 
-    public interface InterceptorFactory {
+    interface InterceptorFactory {
         Match preMatch();
 
         Match postMatch(@SuppressWarnings("rawtypes") Class declaring, AccessibleObject target);

diff --git a/resteasy-dependencies-bom/pom.xml b/resteasy-dependencies-bom/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>dev.resteasy.tools</groupId>
         <artifactId>resteasy-parent</artifactId>
-        <version>2.0.3.Final</version>
+        <version>2.0.4.Final</version>
         <relativePath/>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/resteasy-feature-pack/common/src/main/resources/configs/standalone/model.xml b/resteasy-feature-pack/common/src/main/resources/configs/standalone/model.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" ?>
 
 <!--
-  ~ JBoss, Home of Professional Open Source.
-  ~
-  ~ Copyright 2023 Red Hat, Inc., and individual contributors
-  ~ as indicated by the @author tags.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
+~ JBoss, Home of Professional Open Source.
+~
+~ Copyright 2023 Red Hat, Inc., and individual contributors
+~ as indicated by the @author tags.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
 
 <config xmlns="urn:jboss:galleon:config:1.0" model="standalone">
     <packages>

diff --git a/...modules/system/layers/base/com/fasterxml/jackson/core/jackson-annotations/main/module.xml b/...modules/system/layers/base/com/fasterxml/jackson/core/jackson-annotations/main/module.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-  ~ JBoss, Home of Professional Open Source.
-  ~
-  ~ Copyright 2021 Red Hat, Inc., and individual contributors
-  ~ as indicated by the @author tags.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
+~ JBoss, Home of Professional Open Source.
+~
+~ Copyright 2021 Red Hat, Inc., and individual contributors
+~ as indicated by the @author tags.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
 <module xmlns="urn:jboss:module:1.9" name="com.fasterxml.jackson.core.jackson-annotations">
     <resources>
         <artifact name="${com.fasterxml.jackson.core:jackson-annotations}" />

diff --git a/...ources/modules/system/layers/base/com/fasterxml/jackson/core/jackson-core/main/module.xml b/...ources/modules/system/layers/base/com/fasterxml/jackson/core/jackson-core/main/module.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-  ~ JBoss, Home of Professional Open Source.
-  ~
-  ~ Copyright 2021 Red Hat, Inc., and individual contributors
-  ~ as indicated by the @author tags.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
+~ JBoss, Home of Professional Open Source.
+~
+~ Copyright 2021 Red Hat, Inc., and individual contributors
+~ as indicated by the @author tags.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
 <module xmlns="urn:jboss:module:1.9" name="com.fasterxml.jackson.core.jackson-core">
     <resources>
         <artifact name="${com.fasterxml.jackson.core:jackson-core}" />

diff --git a/...es/modules/system/layers/base/com/fasterxml/jackson/core/jackson-databind/main/module.xml b/...es/modules/system/layers/base/com/fasterxml/jackson/core/jackson-databind/main/module.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-  ~ JBoss, Home of Professional Open Source.
-  ~
-  ~ Copyright 2021 Red Hat, Inc., and individual contributors
-  ~ as indicated by the @author tags.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
+~ JBoss, Home of Professional Open Source.
+~
+~ Copyright 2021 Red Hat, Inc., and individual contributors
+~ as indicated by the @author tags.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
 <module xmlns="urn:jboss:module:1.9" name="com.fasterxml.jackson.core.jackson-databind">
 
     <resources>

diff --git a/...s/system/layers/base/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/main/module.xml b/...s/system/layers/base/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/main/module.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-  ~ JBoss, Home of Professional Open Source.
-  ~
-  ~ Copyright 2021 Red Hat, Inc., and individual contributors
-  ~ as indicated by the @author tags.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
+~ JBoss, Home of Professional Open Source.
+~
+~ Copyright 2021 Red Hat, Inc., and individual contributors
+~ as indicated by the @author tags.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
 <module xmlns="urn:jboss:module:1.9" name="com.fasterxml.jackson.datatype.jackson-datatype-jdk8">
     <resources>
         <artifact name="${com.fasterxml.jackson.datatype:jackson-datatype-jdk8}" />

diff --git a/...system/layers/base/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/main/module.xml b/...system/layers/base/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/main/module.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-  ~ JBoss, Home of Professional Open Source.
-  ~
-  ~ Copyright 2021 Red Hat, Inc., and individual contributors
-  ~ as indicated by the @author tags.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
+~ JBoss, Home of Professional Open Source.
+~
+~ Copyright 2021 Red Hat, Inc., and individual contributors
+~ as indicated by the @author tags.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
 <module xmlns="urn:jboss:module:1.9" name="com.fasterxml.jackson.datatype.jackson-datatype-jsr310">
     <resources>
         <artifact name="${com.fasterxml.jackson.datatype:jackson-datatype-jsr310}" />

diff --git a/...m/layers/base/com/fasterxml/jackson/jakarta/jackson-jakarta-json-provider/main/module.xml b/...m/layers/base/com/fasterxml/jackson/jakarta/jackson-jakarta-json-provider/main/module.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-  ~ JBoss, Home of Professional Open Source.
-  ~
-  ~ Copyright 2021 Red Hat, Inc., and individual contributors
-  ~ as indicated by the @author tags.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
+~ JBoss, Home of Professional Open Source.
+~
+~ Copyright 2021 Red Hat, Inc., and individual contributors
+~ as indicated by the @author tags.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
 <module xmlns="urn:jboss:module:1.9" name="com.fasterxml.jackson.jakarta.jackson-jakarta-json-provider">
     <resources>
         <artifact name="${com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-json-provider}" />

diff --git a/...ystem/layers/base/com/fasterxml/jackson/jaxrs/jackson-jaxrs-json-provider/main/module.xml b/...ystem/layers/base/com/fasterxml/jackson/jaxrs/jackson-jaxrs-json-provider/main/module.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-  ~ JBoss, Home of Professional Open Source.
-  ~
-  ~ Copyright 2021 Red Hat, Inc., and individual contributors
-  ~ as indicated by the @author tags.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
+~ JBoss, Home of Professional Open Source.
+~
+~ Copyright 2021 Red Hat, Inc., and individual contributors
+~ as indicated by the @author tags.
+~
+~ Licensed under the Apache License, Version 2.0 (the "License");
+~ you may not use this file except in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~     http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing, software
+~ distributed under the License is distributed on an "AS IS" BASIS,
+~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~ See the License for the specific language governing permissions and
+~ limitations under the License.
+-->
 <module-alias xmlns="urn:jboss:module:1.9" name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"
     target-name="com.fasterxml.jackson.jakarta.jackson-jakarta-json-provider" />