You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/11/14 11:42:44 UTC
[isis] branch master updated: ISIS-3276: renames ReatEasy artifact (remove '4' in name)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 1e7690158d ISIS-3276: renames ReatEasy artifact (remove '4' in name)
1e7690158d is described below
commit 1e7690158df33d3b221829d3e98329c4b7ca1905
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Nov 14 12:42:37 2022 +0100
ISIS-3276: renames ReatEasy artifact (remove '4' in name)
---
.../ROOT/pages/2022/2.0.0-RC1/mignotes.adoc | 24 ++++++++++++++++++++++
core/pom.xml | 2 +-
extensions/core/executionoutbox/restclient/pom.xml | 2 +-
.../core/commandreplay/secondary/pom.xml | 2 +-
mavendeps/webapp/pom.xml | 2 +-
starters/pom.xml | 2 +-
.../.gitignore | 0
.../{jaxrs-resteasy-4 => jaxrs-resteasy}/pom.xml | 8 ++++----
...ayModuleViewerRestfulObjectsJaxrsResteasy4.java | 0
.../conneg/RestfulObjectsJaxbWriterForXml.java | 0
.../webmodule/WebModuleJaxrsResteasy4.java | 0
.../Parser_forCacheControl_Test.java | 0
.../Parser_forJaxRsMediaType_Test.java | 0
.../RepresentationTypeTest_getMediaType.java | 0
.../RepresentationTypeTest_getName.java | 0
.../RepresentationTypeTest_lookup.java | 0
.../RepresentationTypeTest_parser.java | 0
...eContext_ensureCompatibleAcceptHeader_Test.java | 0
...tfulObjectsApplicationExceptionMapper_Test.java | 0
viewers/restfulobjects/pom.xml | 2 +-
20 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/antora/components/relnotes/modules/ROOT/pages/2022/2.0.0-RC1/mignotes.adoc b/antora/components/relnotes/modules/ROOT/pages/2022/2.0.0-RC1/mignotes.adoc
index 09fcad1c06..f6d6743a57 100644
--- a/antora/components/relnotes/modules/ROOT/pages/2022/2.0.0-RC1/mignotes.adoc
+++ b/antora/components/relnotes/modules/ROOT/pages/2022/2.0.0-RC1/mignotes.adoc
@@ -39,3 +39,27 @@ The following changed:
| causeway.viewer.*common*.credit
|===
+
+== Maven Artifacts
+
+The following changed:
+[cols="2a,3a", options="header"]
+
+|===
+
+| previously
+| new
+
+|
+[source,xml]
+----
+<groupId>org.apache.causeway.viewer</groupId>
+<artifactId>causeway-viewer-restfulobjects-jaxrsresteasy4</artifactId>
+----
+|
+[source,xml]
+----
+<groupId>org.apache.causeway.viewer</groupId>
+<artifactId>causeway-viewer-restfulobjects-jaxrsresteasy</artifactId>
+----
+|===
diff --git a/core/pom.xml b/core/pom.xml
index 7f354b4919..6b66a7f196 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -623,7 +623,7 @@
</dependency>
<dependency>
<groupId>org.apache.causeway.viewer</groupId>
- <artifactId>causeway-viewer-restfulobjects-jaxrsresteasy4</artifactId>
+ <artifactId>causeway-viewer-restfulobjects-jaxrsresteasy</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/extensions/core/executionoutbox/restclient/pom.xml b/extensions/core/executionoutbox/restclient/pom.xml
index fa6f386bae..acada12c4c 100644
--- a/extensions/core/executionoutbox/restclient/pom.xml
+++ b/extensions/core/executionoutbox/restclient/pom.xml
@@ -124,7 +124,7 @@
</dependency>
<dependency>
<groupId>org.apache.causeway.viewer</groupId>
- <artifactId>causeway-viewer-restfulobjects-jaxrsresteasy4</artifactId>
+ <artifactId>causeway-viewer-restfulobjects-jaxrsresteasy</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/incubator/extensions/core/commandreplay/secondary/pom.xml b/incubator/extensions/core/commandreplay/secondary/pom.xml
index 63af124faa..0d24c18ecc 100644
--- a/incubator/extensions/core/commandreplay/secondary/pom.xml
+++ b/incubator/extensions/core/commandreplay/secondary/pom.xml
@@ -77,7 +77,7 @@
<dependency>
<groupId>org.apache.causeway.viewer</groupId>
- <artifactId>causeway-viewer-restfulobjects-jaxrsresteasy4</artifactId>
+ <artifactId>causeway-viewer-restfulobjects-jaxrsresteasy</artifactId>
<scope>test</scope>
</dependency>
diff --git a/mavendeps/webapp/pom.xml b/mavendeps/webapp/pom.xml
index a35d514288..068be8192a 100644
--- a/mavendeps/webapp/pom.xml
+++ b/mavendeps/webapp/pom.xml
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.apache.causeway.viewer</groupId>
- <artifactId>causeway-viewer-restfulobjects-jaxrsresteasy4</artifactId>
+ <artifactId>causeway-viewer-restfulobjects-jaxrsresteasy</artifactId>
</dependency>
<dependency>
diff --git a/starters/pom.xml b/starters/pom.xml
index abdf9a9252..b5630085bb 100644
--- a/starters/pom.xml
+++ b/starters/pom.xml
@@ -44,7 +44,7 @@
<spring-boot.version>2.7.5</spring-boot.version>
<approvaltests.version>18.5.0</approvaltests.version>
- <resteasy.version>4.6.2.Final</resteasy.version> <!-- keep in sync with property defined in resteasy4-spring-boot-starter -->
+ <resteasy.version>5.0.0.Final</resteasy.version> <!-- keep in sync with property defined in resteasy-spring-boot-starter -->
</properties>
diff --git a/viewers/restfulobjects/jaxrs-resteasy-4/.gitignore b/viewers/restfulobjects/jaxrs-resteasy/.gitignore
similarity index 100%
rename from viewers/restfulobjects/jaxrs-resteasy-4/.gitignore
rename to viewers/restfulobjects/jaxrs-resteasy/.gitignore
diff --git a/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml b/viewers/restfulobjects/jaxrs-resteasy/pom.xml
similarity index 94%
rename from viewers/restfulobjects/jaxrs-resteasy-4/pom.xml
rename to viewers/restfulobjects/jaxrs-resteasy/pom.xml
index 853576c55e..129448815c 100644
--- a/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml
+++ b/viewers/restfulobjects/jaxrs-resteasy/pom.xml
@@ -20,16 +20,16 @@
<version>2.0.0-SNAPSHOT</version>
</parent>
- <artifactId>causeway-viewer-restfulobjects-jaxrsresteasy4</artifactId>
+ <artifactId>causeway-viewer-restfulobjects-jaxrsresteasy</artifactId>
- <name>Apache Causeway Viewer - RO (JAX-RS Resteasy v4)</name>
+ <name>Apache Causeway Viewer - RO (JAX-RS Resteasy)</name>
<description>
JAX-RS plugin using jboss resteasy.
</description>
<properties>
- <jar-plugin.automaticModuleName>org.apache.causeway.viewer.restfulobjects.jaxrsresteasy4</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/causeway/viewer.restfulobjects/jaxrsresteasy4</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.causeway.viewer.restfulobjects.jaxrsresteasy</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/causeway/viewer.restfulobjects/jaxrsresteasy</git-plugin.propertiesDir>
</properties>
<build>
diff --git a/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/CausewayModuleViewerRestfulObjectsJaxrsResteasy4.java b/viewers/restfulobjects/jaxrs-resteasy/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/CausewayModuleViewerRestfulObjectsJaxrsResteasy4.java
similarity index 100%
rename from viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/CausewayModuleViewerRestfulObjectsJaxrsResteasy4.java
rename to viewers/restfulobjects/jaxrs-resteasy/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/CausewayModuleViewerRestfulObjectsJaxrsResteasy4.java
diff --git a/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/conneg/RestfulObjectsJaxbWriterForXml.java b/viewers/restfulobjects/jaxrs-resteasy/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/conneg/RestfulObjectsJaxbWriterForXml.java
similarity index 100%
rename from viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/conneg/RestfulObjectsJaxbWriterForXml.java
rename to viewers/restfulobjects/jaxrs-resteasy/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/conneg/RestfulObjectsJaxbWriterForXml.java
diff --git a/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java b/viewers/restfulobjects/jaxrs-resteasy/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
similarity index 100%
rename from viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
rename to viewers/restfulobjects/jaxrs-resteasy/src/main/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
diff --git a/viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/Parser_forCacheControl_Test.java b/viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/Parser_forCacheControl_Test.java
similarity index 100%
rename from viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/Parser_forCacheControl_Test.java
rename to viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/Parser_forCacheControl_Test.java
diff --git a/viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/Parser_forJaxRsMediaType_Test.java b/viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/Parser_forJaxRsMediaType_Test.java
similarity index 100%
rename from viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/Parser_forJaxRsMediaType_Test.java
rename to viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/Parser_forJaxRsMediaType_Test.java
diff --git a/viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/RepresentationTypeTest_getMediaType.java b/viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/RepresentationTypeTest_getMediaType.java
similarity index 100%
rename from viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/RepresentationTypeTest_getMediaType.java
rename to viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/RepresentationTypeTest_getMediaType.java
diff --git a/viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/RepresentationTypeTest_getName.java b/viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/RepresentationTypeTest_getName.java
similarity index 100%
rename from viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/RepresentationTypeTest_getName.java
rename to viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/RepresentationTypeTest_getName.java
diff --git a/viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/RepresentationTypeTest_lookup.java b/viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/RepresentationTypeTest_lookup.java
similarity index 100%
rename from viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/RepresentationTypeTest_lookup.java
rename to viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/RepresentationTypeTest_lookup.java
diff --git a/viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/RepresentationTypeTest_parser.java b/viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/RepresentationTypeTest_parser.java
similarity index 100%
rename from viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/RepresentationTypeTest_parser.java
rename to viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/RepresentationTypeTest_parser.java
diff --git a/viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/context/ResourceContext_ensureCompatibleAcceptHeader_Test.java b/viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/context/ResourceContext_ensureCompatibleAcceptHeader_Test.java
similarity index 100%
rename from viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/context/ResourceContext_ensureCompatibleAcceptHeader_Test.java
rename to viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/context/ResourceContext_ensureCompatibleAcceptHeader_Test.java
diff --git a/viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/mappers/RestfulObjectsApplicationExceptionMapper_Test.java b/viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/mappers/RestfulObjectsApplicationExceptionMapper_Test.java
similarity index 100%
rename from viewers/restfulobjects/jaxrs-resteasy-4/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/mappers/RestfulObjectsApplicationExceptionMapper_Test.java
rename to viewers/restfulobjects/jaxrs-resteasy/src/test/java/org/apache/causeway/viewer/restfulobjects/jaxrsresteasy4/mappers/RestfulObjectsApplicationExceptionMapper_Test.java
diff --git a/viewers/restfulobjects/pom.xml b/viewers/restfulobjects/pom.xml
index 0b0702f195..78512b6a32 100644
--- a/viewers/restfulobjects/pom.xml
+++ b/viewers/restfulobjects/pom.xml
@@ -39,7 +39,7 @@
<module>rendering</module>
<module>viewer</module>
<module>testing</module>
- <module>jaxrs-resteasy-4</module>
+ <module>jaxrs-resteasy</module>
</modules>
</project>