Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump resteasy-parent from 2.0.2.Final to 2.0.3.Final #3567

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<arquillian xmlns="http://jboss.org/schema/arquillian"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://jboss.org/schema/arquillian
<arquillian xmlns="http://jboss.org/schema/arquillian" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://jboss.org/schema/arquillian
http://jboss.org/schema/arquillian/arquillian_1_0.xsd">

<!-- Force the use of the Servlet 5.0 protocol with all containers, as it is the most mature -->
<defaultProtocol type="Servlet 5.0" />
<engine>
<property name="deploymentExportPath">target/deployments</property>
</engine>
<!-- Force the use of the Servlet 5.0 protocol with all containers, as it is the most mature -->
<defaultProtocol type="Servlet 5.0" />

<engine>
<property name="deploymentExportPath">target/deployments</property>
</engine>

<container qualifier="jetty" default="true">
<configuration>
<property name="bindHttpPort">0</property>
<property name="javaVmArguments">${additionalJvmArgs}</property>
<!--property name="javaVmArguments">${additionalJvmArgs} -Xdebug -Xrunjdwp:transport=dt_socket,address=8585,server=y, suspend=y</property-->
</configuration>
<configuration>
<property name="bindHttpPort">0</property>
<property name="javaVmArguments">${additionalJvmArgs}</property>
<!--property name="javaVmArguments">${additionalJvmArgs} -Xdebug -Xrunjdwp:transport=dt_socket,address=8585,server=y, suspend=y</property-->
</configuration>
</container>
</arquillian>
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">

<display-name>RESTEASY-1056</display-name>

<servlet>
<servlet-name>Resteasy</servlet-name>
<servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>
<servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>
<init-param>
<param-name>jakarta.ws.rs.Application</param-name>
<param-value>org.jboss.resteasy.resteasy1056.TestApplication</param-value>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<arquillian xmlns="http://jboss.org/schema/arquillian"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://jboss.org/schema/arquillian
<arquillian xmlns="http://jboss.org/schema/arquillian" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://jboss.org/schema/arquillian
http://jboss.org/schema/arquillian/arquillian_1_0.xsd">

<!-- Force the use of the Servlet 5.0 protocol with all containers, as it is the most mature -->
<defaultProtocol type="Servlet 5.0" />
<engine>
<property name="deploymentExportPath">target/deployments</property>
</engine>
<!-- Force the use of the Servlet 5.0 protocol with all containers, as it is the most mature -->
<defaultProtocol type="Servlet 5.0" />

<engine>
<property name="deploymentExportPath">target/deployments</property>
</engine>

<container qualifier="jetty" default="true">
<configuration>
<property name="bindHttpPort">0</property>
<property name="javaVmArguments">${additionalJvmArgs}</property>
<!--
<configuration>
<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>
-->
</configuration>
</configuration>
</container>
</arquillian>
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">

<display-name>RESTEASY-1630</display-name>

<servlet>
<servlet-name>Resteasy</servlet-name>
<servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>
<servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>
<init-param>
<param-name>jakarta.ws.rs.Application</param-name>
<param-value>org.jboss.resteasy.resteasy1630.TestApplication</param-value>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<arquillian xmlns="http://jboss.org/schema/arquillian"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://jboss.org/schema/arquillian
<arquillian xmlns="http://jboss.org/schema/arquillian" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://jboss.org/schema/arquillian
http://jboss.org/schema/arquillian/arquillian_1_0.xsd">

<!-- Force the use of the Servlet 5.0 protocol with all containers, as it is the most mature -->
<defaultProtocol type="Servlet 5.0"/>
<defaultProtocol type="Servlet 5.0" />

<engine>
<property name="deploymentExportPath">target/deployments</property>
Expand Down
5 changes: 2 additions & 3 deletions arquillian/RESTEASY-736-jetty/src/test/resources/web.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">

<display-name>RESTEASY-736</display-name>

Expand Down
2 changes: 1 addition & 1 deletion docbook/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>dev.resteasy.tools</groupId>
<artifactId>resteasy-parent</artifactId>
<version>2.0.2.Final</version>
<version>2.0.3.Final</version>
<relativePath/>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>dev.resteasy.tools</groupId>
<artifactId>resteasy-parent</artifactId>
<version>2.0.2.Final</version>
<version>2.0.3.Final</version>
<relativePath/>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion resteasy-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>dev.resteasy.tools</groupId>
<artifactId>resteasy-parent</artifactId>
<version>2.0.2.Final</version>
<version>2.0.3.Final</version>
<relativePath/>
</parent>

Expand Down
7 changes: 3 additions & 4 deletions resteasy-cdi/src/main/resources/META-INF/beans.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
version="4.0" bean-discovery-mode="annotated">
<beans xmlns="https://jakarta.ee/xml/ns/jakartaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
version="4.0" bean-discovery-mode="annotated">
</beans>
19 changes: 9 additions & 10 deletions resteasy-cdi/src/main/resources/META-INF/web-fragment.xml
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-fragment xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
<web-fragment xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd"
version="3.0">
version="3.0">

<name>resteasy_cdi</name>
<context-param>
<param-name>resteasy.injector.factory</param-name>
<param-value>org.jboss.resteasy.cdi.CdiInjectorFactory</param-value>
</context-param>
<distributable/>
<name>resteasy_cdi</name>
<context-param>
<param-name>resteasy.injector.factory</param-name>
<param-value>org.jboss.resteasy.cdi.CdiInjectorFactory</param-value>
</context-param>
<distributable />
</web-fragment>
2 changes: 1 addition & 1 deletion resteasy-dependencies-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>dev.resteasy.tools</groupId>
<artifactId>resteasy-parent</artifactId>
<version>2.0.2.Final</version>
<version>2.0.3.Final</version>
<relativePath/>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
-->
<module xmlns="urn:jboss:module:1.9" name="com.fasterxml.jackson.core.jackson-annotations">
<resources>
<artifact name="${com.fasterxml.jackson.core:jackson-annotations}"/>
<artifact name="${com.fasterxml.jackson.core:jackson-annotations}" />
</resources>
</module>
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
-->
<module xmlns="urn:jboss:module:1.9" name="com.fasterxml.jackson.core.jackson-core">
<resources>
<artifact name="${com.fasterxml.jackson.core:jackson-core}"/>
<artifact name="${com.fasterxml.jackson.core:jackson-core}" />
</resources>
</module>
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
<module xmlns="urn:jboss:module:1.9" name="com.fasterxml.jackson.core.jackson-databind">

<resources>
<artifact name="${com.fasterxml.jackson.core:jackson-databind}"/>
<artifact name="${com.fasterxml.jackson.core:jackson-databind}" />
</resources>

<dependencies>
<module name="com.fasterxml.jackson.core.jackson-annotations"/>
<module name="com.fasterxml.jackson.core.jackson-core"/>
<module name="java.desktop"/>
<module name="java.logging"/>
<module name="java.sql"/>
<module name="java.xml"/>
<module name="com.fasterxml.jackson.core.jackson-annotations" />
<module name="com.fasterxml.jackson.core.jackson-core" />
<module name="java.desktop" />
<module name="java.logging" />
<module name="java.sql" />
<module name="java.xml" />
</dependencies>
</module>
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
-->
<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}"/>
<artifact name="${com.fasterxml.jackson.datatype:jackson-datatype-jdk8}" />
</resources>

<dependencies>
<module name="com.fasterxml.jackson.core.jackson-annotations"/>
<module name="com.fasterxml.jackson.core.jackson-core"/>
<module name="com.fasterxml.jackson.core.jackson-databind"/>
<module name="com.fasterxml.jackson.core.jackson-annotations" />
<module name="com.fasterxml.jackson.core.jackson-core" />
<module name="com.fasterxml.jackson.core.jackson-databind" />
</dependencies>
</module>
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
-->
<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}"/>
<artifact name="${com.fasterxml.jackson.datatype:jackson-datatype-jsr310}" />
</resources>

<dependencies>
<module name="com.fasterxml.jackson.core.jackson-annotations"/>
<module name="com.fasterxml.jackson.core.jackson-core"/>
<module name="com.fasterxml.jackson.core.jackson-databind"/>
<module name="com.fasterxml.jackson.core.jackson-annotations" />
<module name="com.fasterxml.jackson.core.jackson-core" />
<module name="com.fasterxml.jackson.core.jackson-databind" />
</dependencies>
</module>
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@
-->
<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}"/>
<artifact name="${com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-base}"/>
<artifact name="${com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations}"/>
<artifact name="${com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-json-provider}" />
<artifact name="${com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-base}" />
<artifact name="${com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations}" />
</resources>

<dependencies>
<module name="com.fasterxml.jackson.core.jackson-annotations"/>
<module name="com.fasterxml.jackson.core.jackson-core"/>
<module name="com.fasterxml.jackson.core.jackson-databind"/>
<module name="jakarta.ws.rs.api"/>
<module name="jakarta.xml.bind.api"/>
<module name="com.fasterxml.jackson.core.jackson-annotations" />
<module name="com.fasterxml.jackson.core.jackson-core" />
<module name="com.fasterxml.jackson.core.jackson-databind" />
<module name="jakarta.ws.rs.api" />
<module name="jakarta.xml.bind.api" />
</dependencies>
</module>
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,5 @@
~ 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"/>
<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" />
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
<module xmlns="urn:jboss:module:1.9" name="com.github.fge.btf">

<properties>
<property name="jboss.api" value="private"/>
<property name="jboss.api" value="private" />
</properties>

<resources>
<artifact name="${com.github.java-json-tools:btf}"/>
<artifact name="${com.github.java-json-tools:btf}" />
</resources>
</module>
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@
-->
<module xmlns="urn:jboss:module:1.9" name="com.github.fge.jackson-coreutils">
<properties>
<property name="jboss.api" value="private"/>
<property name="jboss.api" value="private" />
</properties>

<resources>
<artifact name="${com.github.java-json-tools:jackson-coreutils}"/>
<artifact name="${com.github.java-json-tools:jackson-coreutils}" />
</resources>

<dependencies>
<module name="com.fasterxml.jackson.core.jackson-annotations"/>
<module name="com.fasterxml.jackson.core.jackson-core"/>
<module name="com.fasterxml.jackson.core.jackson-databind"/>
<module name="com.github.fge.msg-simple" export="true"/>
<module name="com.google.guava"/>
<module name="com.fasterxml.jackson.core.jackson-annotations" />
<module name="com.fasterxml.jackson.core.jackson-core" />
<module name="com.fasterxml.jackson.core.jackson-databind" />
<module name="com.github.fge.msg-simple" export="true" />
<module name="com.google.guava" />
</dependencies>
</module>
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@
-->
<module xmlns="urn:jboss:module:1.9" name="com.github.fge.json-patch">
<properties>
<property name="jboss.api" value="private"/>
<property name="jboss.api" value="private" />
</properties>

<resources>
<artifact name="${com.github.java-json-tools:json-patch}"/>
<artifact name="${com.github.java-json-tools:json-patch}" />
</resources>

<dependencies>
<module name="com.fasterxml.jackson.core.jackson-annotations"/>
<module name="com.fasterxml.jackson.core.jackson-core"/>
<module name="com.fasterxml.jackson.core.jackson-databind"/>
<module name="com.github.fge.jackson-coreutils"/>
<module name="com.google.guava"/>
<module name="com.fasterxml.jackson.core.jackson-annotations" />
<module name="com.fasterxml.jackson.core.jackson-core" />
<module name="com.fasterxml.jackson.core.jackson-databind" />
<module name="com.github.fge.jackson-coreutils" />
<module name="com.google.guava" />
</dependencies>
</module>
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@
<module xmlns="urn:jboss:module:1.9" name="com.github.fge.msg-simple">

<properties>
<property name="jboss.api" value="private"/>
<property name="jboss.api" value="private" />
</properties>

<resources>
<artifact name="${com.github.java-json-tools:msg-simple}"/>
<artifact name="${com.github.java-json-tools:msg-simple}" />
</resources>

<dependencies>
<module name="com.github.fge.btf" export="true"/>
<module name="com.github.fge.btf" export="true" />
</dependencies>
</module>