This is an automated email from the ASF dual-hosted git repository.
cesarhernandezgt pushed a commit to branch tomee-8.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/tomee-8.x by this push:
new 24d701b TOMEE-3647 Fixed and updated mvc-resteasy to use Server/API
Bom
new 4a6bee9 Merge pull request #830 from cesarhernandezgt/TOMEE-3647
24d701b is described below
commit 24d701bda0ed850e030cb4f2266396aa8c842694
Author: Cesar Hernandez <[email protected]>
AuthorDate: Sat Mar 26 20:37:52 2022 -0600
TOMEE-3647 Fixed and updated mvc-resteasy to use Server/API Bom
---
examples/mvc-resteasy/pom.xml | 39 ++++++++++--
.../src/test/java/org/superbiz/mvc/MVCTest.java | 2 +-
examples/mvc-resteasy/src/test/resources/a-pom.xml | 69 ++++++++++++++++++++++
3 files changed, 104 insertions(+), 6 deletions(-)
diff --git a/examples/mvc-resteasy/pom.xml b/examples/mvc-resteasy/pom.xml
index 025ed32..c26e40c 100644
--- a/examples/mvc-resteasy/pom.xml
+++ b/examples/mvc-resteasy/pom.xml
@@ -53,7 +53,7 @@
<plugin>
<groupId>org.apache.tomee.maven</groupId>
<artifactId>tomee-maven-plugin</artifactId>
- <version>8.0.11-SNAPSHOT</version>
+ <version>${tomee.version}</version>
<configuration>
<args>-Xmx512m -XX:PermSize=256m</args>
</configuration>
@@ -76,11 +76,36 @@
</plugin>
</plugins>
</build>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.arquillian</groupId>
+ <artifactId>arquillian-bom</artifactId>
+ <version>${version.arquillian}</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
+
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>javaee-api</artifactId>
- <version>8.0-5</version>
+ <groupId>org.jboss.shrinkwrap.resolver</groupId>
+ <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomee.bom</groupId>
+ <artifactId>tomee-plus</artifactId>
+ <version>${tomee.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomee.bom</groupId>
+ <artifactId>tomee-plus-api</artifactId>
+ <version>${tomee.version}</version>
<scope>provided</scope>
</dependency>
<!-- MVC 1.0(JSR 371) -->
@@ -121,7 +146,11 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>4.4.7</version>
- <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>23.6-jre</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.graphene</groupId>
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 359e430..f2c8587 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
@@ -49,7 +49,7 @@ public class MVCTest {
@Deployment
public static WebArchive createDeployment() {
File[] files = Maven.resolver()
- .loadPomFromFile("pom.xml")
+ .loadPomFromFile("src/test/resources/a-pom.xml")
.importRuntimeDependencies()
.resolve()
.withTransitivity()
diff --git a/examples/mvc-resteasy/src/test/resources/a-pom.xml
b/examples/mvc-resteasy/src/test/resources/a-pom.xml
new file mode 100644
index 0000000..ad03d18
--- /dev/null
+++ b/examples/mvc-resteasy/src/test/resources/a-pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>fake</groupId>
+ <version>fake</version>
+ <artifactId>fake</artifactId>
+
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <version.krazo>1.1.0-M1</version.krazo>
+ <resteasy.version>3.6.2.Final</resteasy.version>
+ </properties>
+
+ <build>
+ <finalName>mvc-resteasy</finalName>
+ </build>
+ <dependencies>
+ <!-- MVC 1.0(JSR 371) -->
+ <dependency>
+ <groupId>org.eclipse.krazo</groupId>
+ <artifactId>krazo-resteasy</artifactId>
+ <version>${version.krazo}</version>
+ </dependency>
+ <!-- RestEasy -->
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <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>
+ <version>${resteasy.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>4.4.7</version>
+ </dependency>
+ </dependencies>
+
+</project>
