From ff06e52cd68f78b5a68d94d27f4e1cbe89fccda2 Mon Sep 17 00:00:00 2001 From: Juan Manuel Leflet Estrada Date: Mon, 25 Mar 2024 15:45:31 +0100 Subject: [PATCH] Fix tests for EAP8 rules Signed-off-by: Juan Manuel Leflet Estrada --- .../eap8/eap6/tests/data/faces/pom.xml | 4 ++ .../eap8/eap6/tests/data/resteasy/pom.xml | 51 +++++++++---------- .../eap8/eap6/tests/data/xml-binding/pom.xml | 6 ++- .../eap8/eap7/hibernate-search.windup.xml | 10 ++-- .../eap8/eap7/tests/data/dependencies/pom.xml | 45 +++++++++++++--- .../tests/data/jboss-dependencies/pom.xml | 40 ++++++++++++--- .../packages/CompleteDukeApplication.java | 30 +++++++++++ ...vaee-to-jakarta-namespaces.windup.test.xml | 2 +- ...ax-to-jakarta-dependencies.windup.test.xml | 4 +- .../javax-to-jakarta-package.windup.test.xml | 4 +- .../tests/jboss-dependencies.windup.test.xml | 2 +- 11 files changed, 148 insertions(+), 50 deletions(-) create mode 100644 rules/rules-reviewed/eap8/eap7/tests/data/packages/CompleteDukeApplication.java diff --git a/rules/rules-reviewed/eap8/eap6/tests/data/faces/pom.xml b/rules/rules-reviewed/eap8/eap6/tests/data/faces/pom.xml index bc8c55c28..39c86ae83 100644 --- a/rules/rules-reviewed/eap8/eap6/tests/data/faces/pom.xml +++ b/rules/rules-reviewed/eap8/eap6/tests/data/faces/pom.xml @@ -5,6 +5,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 faces-test + org.faces.test + 0.0.1-SNAPSHOT war faces-test This project imports faces dependencies @@ -21,11 +23,13 @@ org.jboss.spec.javax.faces jboss-jsf-api_2.3_spec + 3.1.0.SP02 provided com.sun.faces jsf-api + 2.1 provided diff --git a/rules/rules-reviewed/eap8/eap6/tests/data/resteasy/pom.xml b/rules/rules-reviewed/eap8/eap6/tests/data/resteasy/pom.xml index 63544a40a..12343ff05 100644 --- a/rules/rules-reviewed/eap8/eap6/tests/data/resteasy/pom.xml +++ b/rules/rules-reviewed/eap8/eap6/tests/data/resteasy/pom.xml @@ -1,33 +1,19 @@ - 4.0.0 - - org.jboss.eap.quickstarts - quickstart-parent - - 7.4.0.GA - ../pom.xml - + + + + + + + + + + + org.jboss.eap + 0.0.1-SNAPSHOT spring-resteasy war Quickstart: spring-resteasy @@ -64,30 +50,36 @@ junit junit + 3.7 test org.apache.httpcomponents httpclient + 4.0.2 test org.jboss.resteasy resteasy-jaxrs + 3.15.1.Final provided org.jboss.resteasy resteasy-spring + 3.15.6.Final provided org.jboss.resteasy resteasy-jettison-provider + 3.7.0.Final org.jboss.resteasy resteasy-yaml-provider + 3.15.0.Final @@ -95,16 +87,19 @@ org.jboss.spec.javax.servlet jboss-servlet-api_4.0_spec + 2.0.0.Final provided org.jboss.spec.javax.servlet.jsp jboss-jsp-api_2.3_spec + 1.0.3.Final provided org.jboss.spec.javax.ws.rs jboss-jaxrs-api_2.1_spec + 2.0.1.Final provided @@ -112,19 +107,23 @@ org.springframework spring-context + 3.1.0.RELEASE org.springframework spring-web + 3.1.0.RELEASE org.jboss.arquillian.junit arquillian-junit-container + 1.6.0.Final test org.jboss.shrinkwrap.resolver shrinkwrap-resolver-depchain + 3.1.4 pom test diff --git a/rules/rules-reviewed/eap8/eap6/tests/data/xml-binding/pom.xml b/rules/rules-reviewed/eap8/eap6/tests/data/xml-binding/pom.xml index 0261185a7..fa2539edf 100644 --- a/rules/rules-reviewed/eap8/eap6/tests/data/xml-binding/pom.xml +++ b/rules/rules-reviewed/eap8/eap6/tests/data/xml-binding/pom.xml @@ -3,11 +3,15 @@ + 4.0.0 - jaxb-test war jaxb-test This project imports jaxb dependencies + + org.test + 0.0.1-SNAPSHOT + jaxb-test diff --git a/rules/rules-reviewed/eap8/eap7/hibernate-search.windup.xml b/rules/rules-reviewed/eap8/eap7/hibernate-search.windup.xml index 460c6c310..ecae02928 100644 --- a/rules/rules-reviewed/eap8/eap7/hibernate-search.windup.xml +++ b/rules/rules-reviewed/eap8/eap7/hibernate-search.windup.xml @@ -1347,8 +1347,8 @@ - - + + @@ -1363,8 +1363,8 @@ - - + + @@ -1429,7 +1429,7 @@ - + diff --git a/rules/rules-reviewed/eap8/eap7/tests/data/dependencies/pom.xml b/rules/rules-reviewed/eap8/eap7/tests/data/dependencies/pom.xml index 1512cd489..cad197950 100644 --- a/rules/rules-reviewed/eap8/eap7/tests/data/dependencies/pom.xml +++ b/rules/rules-reviewed/eap8/eap7/tests/data/dependencies/pom.xml @@ -1,158 +1,191 @@ 4.0.0 + org.jboss.eap + 0.0.1-SNAPSHOT + spring-resteasy org.glassfish javax.faces + 2.4.0 provided javax javaee-api + 8.0 provided javax javaee-web-api + 8.0 provided javax.activation javax.activation-api + 1.2.0 provided javax.annotation javax.annotation-api + 1.3.2 provided javax.batch javax.batch-api + 1.0.1 provided javax.ejb javax.ejb-api + 3.2.2 provided javax.el javax.el-api + 3.0.0 provided javax.enterprise.concurrent javax.enterprise.concurrent-api + 1.1 provided javax.enterprise.deploy javax.enterprise.deploy-api + 1.7 provided javax.faces javax.faces-api + 2.3 provided javax.interceptor javax.interceptor-api + 3.1 provided javax.jms javax.jms-api + 2.0.1 provided javax.jws javax.jws-api + 1.1 provided javax.mail javax.mail-api + 1.6.2 provided javax.management.j2ee javax.management.j2ee-api + 1.1.2 provided javax.resource javax.resource-api + 1.7 provided - javax.security-auth-message - javax.security-auth-message-api + javax.security.auth.message + javax.security.auth.message-api + 1.1.1 provided - javax.security-jacc - javax.security-jacc-api + javax.security.jacc + javax.security.jacc-api + 1.6 provided javax.servlet javax.servlet-api + 3.1.0 provided javax.servlet.jsp javax.servlet.jsp-api + 2.3.1 provided javax.servlet.jsp.jstl javax.servlet.jsp.jstl-api + 1.2.2 provided javax.transaction javax.transaction-api + 1.3 provided javax.websocket javax.websocket-api + 1.1 provided javax.ws.rs javax.ws.rs-api + 2.1 provided javax.xml.registry javax.xml.registry-api + 1.0.8 provided javax.xml.bind jaxb-api + 2.3.1 provided javax.xml.rpc javax.xml.rpc-api + 1.1.2 provided javax.xml.soap javax.xml.soap-api + 1.4.0 provided javax.xml.ws - javax.xml.ws-api - provided + jaxws-api + 2.3.1 + diff --git a/rules/rules-reviewed/eap8/eap7/tests/data/jboss-dependencies/pom.xml b/rules/rules-reviewed/eap8/eap7/tests/data/jboss-dependencies/pom.xml index afb1735c1..9fea29017 100644 --- a/rules/rules-reviewed/eap8/eap7/tests/data/jboss-dependencies/pom.xml +++ b/rules/rules-reviewed/eap8/eap7/tests/data/jboss-dependencies/pom.xml @@ -1,6 +1,9 @@ 4.0.0 + org.jboss.eap + 0.0.1-SNAPSHOT + test-artifact 1.0.1.Final @@ -12,7 +15,7 @@ org.jboss.bom jboss-eap-jakartaee8 - ${version.bom} + 7.3.4.GA pom import @@ -20,7 +23,7 @@ org.jboss.bom jboss-eap-jakartaee8-with-tools - ${version.bom} + 7.3.1.GA pom import @@ -28,14 +31,14 @@ org.jboss.spec jboss-jakartaee-8.0 - ${version.bom} + 1.0.1.Final pom import org.jboss.spec jboss-jakartaee-web-8.0 - ${version.bom} + 1.0.0.Final pom import @@ -43,7 +46,7 @@ org.jboss.bom eap-runtime-artifacts - ${version.bom} + 7.3.1.GA pom import @@ -51,7 +54,7 @@ org.jboss.bom wildfly-ejb-client-legacy-bom - ${version.bom} + 26.1.3.Final pom import @@ -62,102 +65,127 @@ com.sun.activation jakarta.activation + 1.2.2 org.jboss.spec.javax.annotation jboss-annotations-api_1.3_spec + 1.0.0.Final org.jboss.spec.javax.security.auth.message jboss-jaspi-api_1.0_spec + 1.0.1.Final org.jboss.spec.javax.security.jacc jboss-jacc-api_1.5_spec + 1.0.2.Final org.jboss.spec.javax.batch jboss-batch-api_1.0_spec + 1.0.1.Final org.jboss.spec.javax.ejb jboss-ejb-api_3.2_spec + 2.0.0.Final org.jboss.spec.javax.el jboss-el-api_3.0_spec + 2.0.0.Final org.jboss.spec.javax.enterprise.concurrent jboss-concurrency-api_1.0_spec + 1.0.1.Final org.jboss.spec.javax.faces jboss-jsf-api_2.3_spec + 3.1.0.SP02 org.jboss.spec.javax.interceptor jboss-interceptors-api_1.2_spec + 1.0.1.Final org.jboss.spec.javax.jms jboss-jms-api_2.0_spec + 2.0.0.Final com.sun.mail jakarta.mail + 1.6.6 org.jboss.spec.javax.resource jboss-connector-api_1.7_spec + 1.0.1.Final org.jboss.spec.javax.servlet jboss-servlet-api_4.0_spec + 1.0.0.Final org.jboss.spec.javax.servlet.jsp jboss-jsp-api_2.3_spec + 2.0.0.Final org.apache.taglibs taglibs-standard-spec + 1.2.5 org.jboss.spec.javax.transaction jboss-transaction-api_1.3_spec + 2.0.0.Final org.jboss.spec.javax.xml.bind jboss-jaxb-api_2.3_spec + 2.0.0.Final javax.jws jsr181-api + 1.0-MR1 org.jboss.spec.javax.xml.ws jboss-jaxws-api_2.3_spec + 2.0.0.Final org.jboss.spec.javax.websocket jboss-websocket-api_1.1_spec + 2.0.0.Final org.jboss.spec.javax.ws.rs jboss-jaxrs-api_2.1_spec + 2.0.1.Final org.jboss.spec.javax.xml.soap jboss-saaj-api_1.4_spec + 1.0.2.Final org.hibernate hibernate-core + 5.4.32.Final org.hibernate hibernate-jpamodelgen + 5.3.20.Final diff --git a/rules/rules-reviewed/eap8/eap7/tests/data/packages/CompleteDukeApplication.java b/rules/rules-reviewed/eap8/eap7/tests/data/packages/CompleteDukeApplication.java new file mode 100644 index 000000000..60a5dc392 --- /dev/null +++ b/rules/rules-reviewed/eap8/eap7/tests/data/packages/CompleteDukeApplication.java @@ -0,0 +1,30 @@ +package eu.agilejava.dukes; + +import javax.activation; +import javax.annotation.*; +import javax.batch.*; +import javax.decorator; +import javax.ejb.*; +import javax.el; +import javax.enterprise.*; +import javax.faces.*; +import javax.inject; +import javax.interceptor; +import javax.jms; +import javax.json.*; +import javax.jws.*; +import javax.mail.*; +import javax.persistence.*; +import javax.resource.*; +import javax.security.*; +import javax.servlet.*; +import javax.transaction; +import javax.validation.*; +import javax.websocket.*; +import javax.ws.*; +import javax.xml.*; + + +@ApplicationPath("") +public class CompleteDukeApplication extends Application { +} diff --git a/rules/rules-reviewed/eap8/eap7/tests/javaee-to-jakarta-namespaces.windup.test.xml b/rules/rules-reviewed/eap8/eap7/tests/javaee-to-jakarta-namespaces.windup.test.xml index b2e178d03..51ca9fa23 100644 --- a/rules/rules-reviewed/eap8/eap7/tests/javaee-to-jakarta-namespaces.windup.test.xml +++ b/rules/rules-reviewed/eap8/eap7/tests/javaee-to-jakarta-namespaces.windup.test.xml @@ -10,7 +10,7 @@ - + diff --git a/rules/rules-reviewed/eap8/eap7/tests/javax-to-jakarta-dependencies.windup.test.xml b/rules/rules-reviewed/eap8/eap7/tests/javax-to-jakarta-dependencies.windup.test.xml index b7258e299..ec98b1759 100644 --- a/rules/rules-reviewed/eap8/eap7/tests/javax-to-jakarta-dependencies.windup.test.xml +++ b/rules/rules-reviewed/eap8/eap7/tests/javax-to-jakarta-dependencies.windup.test.xml @@ -3,7 +3,7 @@ xmlns="http://windup.jboss.org/schema/jboss-ruleset" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://windup.jboss.org/schema/jboss-ruleset http://windup.jboss.org/schema/jboss-ruleset/windup-jboss-ruleset.xsd"> - data/dependencies/pom.xml + data/dependencies ../javax-to-jakarta-dependencies.windup.xml @@ -23,7 +23,7 @@ - + diff --git a/rules/rules-reviewed/eap8/eap7/tests/javax-to-jakarta-package.windup.test.xml b/rules/rules-reviewed/eap8/eap7/tests/javax-to-jakarta-package.windup.test.xml index 0621f4c44..9baa3d89c 100644 --- a/rules/rules-reviewed/eap8/eap7/tests/javax-to-jakarta-package.windup.test.xml +++ b/rules/rules-reviewed/eap8/eap7/tests/javax-to-jakarta-package.windup.test.xml @@ -3,14 +3,14 @@ xmlns="http://windup.jboss.org/schema/jboss-ruleset" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://windup.jboss.org/schema/jboss-ruleset http://windup.jboss.org/schema/jboss-ruleset/windup-jboss-ruleset.xsd"> - data + data/packages ../javax-to-jakarta-package.windup.xml - + diff --git a/rules/rules-reviewed/eap8/eap7/tests/jboss-dependencies.windup.test.xml b/rules/rules-reviewed/eap8/eap7/tests/jboss-dependencies.windup.test.xml index 20a5b0e25..3712fc692 100644 --- a/rules/rules-reviewed/eap8/eap7/tests/jboss-dependencies.windup.test.xml +++ b/rules/rules-reviewed/eap8/eap7/tests/jboss-dependencies.windup.test.xml @@ -3,7 +3,7 @@ xmlns="http://windup.jboss.org/schema/jboss-ruleset" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://windup.jboss.org/schema/jboss-ruleset http://windup.jboss.org/schema/jboss-ruleset/windup-jboss-ruleset.xsd"> - data/jboss-dependencies/pom.xml + data/jboss-dependencies ../jboss-dependencies.windup.xml