You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rz...@apache.org on 2022/05/16 18:54:51 UTC
[tomee] branch master updated: TOMEE-3966 - Modernizes MVC-Resteasy example. Requires fix for TOMEE-3824.
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/master by this push:
new b528fdbc8d TOMEE-3966 - Modernizes MVC-Resteasy example. Requires fix for TOMEE-3824.
b528fdbc8d is described below
commit b528fdbc8d52742e735c234602e76aa3d71e3f3e
Author: Richard Zowalla <rz...@apache.org>
AuthorDate: Mon May 16 20:54:38 2022 +0200
TOMEE-3966 - Modernizes MVC-Resteasy example. Requires fix for TOMEE-3824.
---
examples/mvc-resteasy/pom.xml | 56 ++++++++++++++++------
.../java/org/superbiz/mvc/TomeeController.java | 4 +-
.../src/test/java/org/superbiz/mvc/MVCTest.java | 2 +-
3 files changed, 45 insertions(+), 17 deletions(-)
diff --git a/examples/mvc-resteasy/pom.xml b/examples/mvc-resteasy/pom.xml
index 9b1d000c2f..f6848fd000 100644
--- a/examples/mvc-resteasy/pom.xml
+++ b/examples/mvc-resteasy/pom.xml
@@ -22,33 +22,56 @@
<artifactId>mvc-resteasy</artifactId>
<packaging>war</packaging>
<name>TomEE :: Examples :: MVC (RestEasy-based)</name>
- <description>OpenEJB :: Web Examples :: MVC 1.0 - RestEasy</description>
+ <description>TomEE :: Web Examples :: MVC 2.0 - RestEasy</description>
<version>9.0.0-M8-SNAPSHOT</version>
<url>http://tomee.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<tomee.version>9.0.0-M8-SNAPSHOT</tomee.version>
- <version.krazo>1.1.0-M1</version.krazo>
- <resteasy.version>3.6.2.Final</resteasy.version>
+ <version.krazo>2.0.1</version.krazo>
+ <resteasy.version>3.15.2.Final</resteasy.version>
<version.arquillian>1.7.0.Alpha10</version.arquillian>
- <version.graphene.webdriver>2.3.1</version.graphene.webdriver>
+ <version.graphene.webdriver>3.0.0-alpha.3</version.graphene.webdriver>
</properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <!-- Override dependency resolver with test version. This must go *BEFORE*
+ the Arquillian BOM. -->
+ <dependency>
+ <groupId>org.jboss.shrinkwrap.resolver</groupId>
+ <artifactId>shrinkwrap-resolver-bom</artifactId>
+ <version>3.1.4</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+ <!-- Now pull in our server-based unit testing framework -->
+ <dependency>
+ <groupId>org.jboss.arquillian</groupId>
+ <artifactId>arquillian-bom</artifactId>
+ <version>1.7.0.Alpha10</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<build>
<finalName>mvc-resteasy</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.5.1</version>
+ <version>3.10.1</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>11</source>
+ <target>11</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>3.1.0</version>
+ <version>3.3.2</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
@@ -71,7 +94,12 @@
<version>9.1-M2-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
- <!-- MVC 1.0(JSR 371) -->
+ <!-- MVC 2.0 -->
+ <dependency>
+ <groupId>jakarta.mvc</groupId>
+ <artifactId>jakarta.mvc-api</artifactId>
+ <version>2.0.0</version>
+ </dependency>
<dependency>
<groupId>org.eclipse.krazo</groupId>
<artifactId>krazo-resteasy</artifactId>
@@ -83,11 +111,6 @@
<artifactId>resteasy-cdi</artifactId>
<version>${resteasy.version}</version>
</dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-validator-provider-11</artifactId>
- <version>${resteasy.version}</version>
- </dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-servlet-initializer</artifactId>
@@ -118,6 +141,11 @@
<type>pom</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.shrinkwrap.resolver</groupId>
+ <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/examples/mvc-resteasy/src/main/java/org/superbiz/mvc/TomeeController.java b/examples/mvc-resteasy/src/main/java/org/superbiz/mvc/TomeeController.java
index 8d111bdb01..f676c17338 100644
--- a/examples/mvc-resteasy/src/main/java/org/superbiz/mvc/TomeeController.java
+++ b/examples/mvc-resteasy/src/main/java/org/superbiz/mvc/TomeeController.java
@@ -17,8 +17,8 @@
package org.superbiz.mvc;
import jakarta.inject.Inject;
-import javax.mvc.Controller;
-import javax.mvc.Models;
+import jakarta.mvc.Controller;
+import jakarta.mvc.Models;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.QueryParam;
diff --git a/examples/mvc-resteasy/src/test/java/org/superbiz/mvc/MVCTest.java b/examples/mvc-resteasy/src/test/java/org/superbiz/mvc/MVCTest.java
index 359e4307f4..2d5b518e49 100644
--- a/examples/mvc-resteasy/src/test/java/org/superbiz/mvc/MVCTest.java
+++ b/examples/mvc-resteasy/src/test/java/org/superbiz/mvc/MVCTest.java
@@ -50,7 +50,7 @@ public class MVCTest {
public static WebArchive createDeployment() {
File[] files = Maven.resolver()
.loadPomFromFile("pom.xml")
- .importRuntimeDependencies()
+ .importCompileAndRuntimeDependencies()
.resolve()
.withTransitivity()
.asFile();