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.

Sign up for GitHub

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

Jump to bottom

[WFLY-17045] Move RESTEasy Spring to WildFly Preview as there is not … #16112

Merged
merged 1 commit into from Sep 27, 2022
Merged

[WFLY-17045] Move RESTEasy Spring to WildFly Preview as there is not … #16112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions boms/preview-ee/pom.xml
View file
Open in desktop
Expand Up @@ -74,6 +74,18 @@
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.jboss.resteasy.spring</groupId>
<artifactId>resteasy-spring</artifactId>
<version>${preview.version.org.jboss.resteasy.spring}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
12 changes: 0 additions & 12 deletions boms/standard-ee/pom.xml
View file
Open in desktop
Expand Up @@ -2571,18 +2571,6 @@
<version>${version.org.jboss.resteasy}</version>
</dependency>

<dependency>
<groupId>org.jboss.resteasy.spring</groupId>
<artifactId>resteasy-spring</artifactId>
<version>${version.org.jboss.resteasy.spring}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.jboss.spec.jakarta.el</groupId>
<artifactId>jboss-el-api_5.0_spec</artifactId>
Expand Down
5 changes: 5 additions & 0 deletions ee-9/common/pom.xml
View file
Open in desktop
Expand Up @@ -53,6 +53,11 @@
<artifactId>hibernate-search-mapper-orm-coordination-outbox-polling-orm6</artifactId>
</dependency>

<dependency>
<groupId>org.jboss.resteasy.spring</groupId>
<artifactId>resteasy-spring</artifactId>
</dependency>

</dependencies>

<build>
Expand Down
11 changes: 11 additions & 0 deletions ee-9/common/src/main/resources/license/preview-feature-pack-common-licenses.xml
View file
Open in desktop
Expand Up @@ -437,6 +437,17 @@
</license>
</licenses>
</dependency>
<dependency>
<groupId>org.jboss.resteasy.spring</groupId>
<artifactId>resteasy-spring</artifactId>
<licenses>
<license>
<name>Apache License 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
<distribution>repo</distribution>
</license>
</licenses>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.annotation</groupId>
<artifactId>jboss-annotations-api_1.3_spec</artifactId>
Expand Down
0 .../resteasy/resteasy-spring/main/module.xml → .../resteasy/resteasy-spring/main/module.xml
View file
Open in desktop
File renamed without changes.
8 changes: 8 additions & 0 deletions ee-9/galleon-content/src/main/resources/feature_groups/jaxrs.xml
View file
Open in desktop
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature-group-spec name="jaxrs" xmlns="urn:jboss:galleon:feature-group:1.0">
<feature spec="subsystem.jaxrs"/>
<packages>
<package name="org.jboss.resteasy.resteasy-spring" optional="true"/>
</packages>
</feature-group-spec>

0 ...easy.resteasy-spring/pm/wildfly/tasks.xml → ...easy.resteasy-spring/pm/wildfly/tasks.xml
View file
Open in desktop
File renamed without changes.
11 changes: 0 additions & 11 deletions ee-feature-pack/common/pom.xml
View file
Open in desktop
Expand Up @@ -2475,17 +2475,6 @@
</exclusions>
</dependency>

<dependency>
<groupId>org.jboss.resteasy.spring</groupId>
<artifactId>resteasy-spring</artifactId>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.jboss.seam.integration</groupId>
<artifactId>jboss-seam-int-jbossas</artifactId>
Expand Down
11 changes: 0 additions & 11 deletions ee-feature-pack/common/src/main/resources/license/ee-feature-pack-common-licenses.xml
View file
Open in desktop
Expand Up @@ -3907,17 +3907,6 @@
</license>
</licenses>
</dependency>
<dependency>
<groupId>org.jboss.resteasy.spring</groupId>
<artifactId>resteasy-spring</artifactId>
<licenses>
<license>
<name>Apache License 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
<distribution>repo</distribution>
</license>
</licenses>
</dependency>
<dependency>
<groupId>org.jboss.seam.integration</groupId>
<artifactId>jboss-seam-int-jbossas</artifactId>
Expand Down
5 changes: 3 additions & 2 deletions jaxrs/src/main/java/org/jboss/as/jaxrs/JaxrsSubsystemDefinition.java
View file
Open in desktop
Expand Up @@ -85,9 +85,10 @@ public void registerAdditionalRuntimePackages(ManagementResourceRegistration res
RuntimePackageDependency.optional(RESTEASY_MULTIPART.getName()),
RuntimePackageDependency.optional(RESTEASY_CRYPTO.getName()),
RuntimePackageDependency.optional(JACKSON_DATATYPE_JDK8.getName()),
RuntimePackageDependency.optional(JACKSON_DATATYPE_JSR310.getName()),
RuntimePackageDependency.optional(JACKSON_DATATYPE_JSR310.getName()));
// The following ones are optional dependencies located in org.jboss.as.jaxrs module.xml
// To be provisioned, they need to be explicitly added as optional packages.
RuntimePackageDependency.optional("org.jboss.resteasy.resteasy-spring"));
// TODO this needs to be added back once RESTEasy Spring is moved back from WildFly Preview
//RuntimePackageDependency.optional("org.jboss.resteasy.resteasy-spring"));
}
}
4 changes: 1 addition & 3 deletions pom.xml
View file
Open in desktop
Expand Up @@ -513,7 +513,6 @@
<legacy.version.org.jboss.resteasy>4.7.4.Final</legacy.version.org.jboss.resteasy>
<version.org.jboss.resteasy>6.2.0.Final</version.org.jboss.resteasy>
<version.org.jboss.resteasy.microprofile>2.0.0.Final</version.org.jboss.resteasy.microprofile>
<version.org.jboss.resteasy.spring>3.0.0.Beta1</version.org.jboss.resteasy.spring>
<version.org.jboss.seam.int>7.0.0.GA</version.org.jboss.seam.int>
<!-- only needed here until wildfly-arquillian has this version properly synced with arquillian itslef -->
<version.org.jboss.shrinkwrap.descriptors>2.0.0</version.org.jboss.shrinkwrap.descriptors>
Expand Down Expand Up @@ -594,8 +593,7 @@
WildFly Preview version properties.
Property names should be in the form 'preview.version.xxx'.
-->

<!-- currently none-->
<preview.version.org.jboss.resteasy.spring>3.0.0.Beta1</preview.version.org.jboss.resteasy.spring>

</properties>

Expand Down