Skip to content

Commit

Permalink
Fix tests for EAP8 rules
Browse files Browse the repository at this point in the history 
Signed-off-by: Juan Manuel Leflet Estrada <[email protected]>
  • Loading branch information
@jmle
jmle committed Mar 25, 2024
1 parent 8d5aa62 commit ff06e52
Show file tree
Hide file tree
Showing 11 changed files with 148 additions and 50 deletions.
4 changes: 4 additions & 0 deletions rules/rules-reviewed/eap8/eap6/tests/data/faces/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>faces-test</artifactId>
<groupId>org.faces.test</groupId>
<version>0.0.1-SNAPSHOT</version>
<packaging>war</packaging>
<name>faces-test</name>
<description>This project imports faces dependencies</description>
Expand All @@ -21,11 +23,13 @@
<dependency>
<groupId>org.jboss.spec.javax.faces</groupId>
<artifactId>jboss-jsf-api_2.3_spec</artifactId>
<version>3.1.0.SP02</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-api</artifactId>
<version>2.1</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
51 changes: 25 additions & 26 deletions rules/rules-reviewed/eap8/eap6/tests/data/resteasy/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
JBoss, Home of Professional Open Source
Copyright 2015, Red Hat, Inc. and/or its affiliates, and individual
contributors by the @authors tag. See the copyright.txt in the
distribution for a full listing of individual contributors.
Licensed 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>
<parent>
<groupId>org.jboss.eap.quickstarts</groupId>
<artifactId>quickstart-parent</artifactId>
<!--
Maintain separation between the artifact id and the version to help prevent
merge conflicts between commits changing the GA and those changing the V.
-->
<version>7.4.0.GA</version>
<relativePath>../pom.xml</relativePath>
</parent>
<!-- <parent>-->
<!-- <groupId>org.jboss.eap.quickstarts</groupId>-->
<!-- <artifactId>quickstart-parent</artifactId>-->
<!-- &lt;!&ndash;-->
<!-- Maintain separation between the artifact id and the version to help prevent-->
<!-- merge conflicts between commits changing the GA and those changing the V.-->
<!-- &ndash;&gt;-->
<!-- <version>7.4.0.GA</version>-->
<!-- <relativePath>../pom.xml</relativePath>-->
<!-- </parent>-->

<groupId>org.jboss.eap</groupId>
<version>0.0.1-SNAPSHOT</version>
<artifactId>spring-resteasy</artifactId>
<packaging>war</packaging>
<name>Quickstart: spring-resteasy</name>
Expand Down Expand Up @@ -64,67 +50,80 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.0.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs</artifactId>
<version>3.15.1.Final</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-spring</artifactId>
<version>3.15.6.Final</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jettison-provider</artifactId>
<version>3.7.0.Final</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-yaml-provider</artifactId>
<version>3.15.0.Final</version>
</dependency>


<!-- Bring in the Servlet jars to avoid errors while compiling with jdt. -->
<dependency>
<groupId>org.jboss.spec.javax.servlet</groupId>
<artifactId>jboss-servlet-api_4.0_spec</artifactId>
<version>2.0.0.Final</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.servlet.jsp</groupId>
<artifactId>jboss-jsp-api_2.3_spec</artifactId>
<version>1.0.3.Final</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.ws.rs</groupId>
<artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
<version>2.0.1.Final</version>
<scope>provided</scope>
</dependency>

<!-- Spring -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>3.1.0.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>3.1.0.RELEASE</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
<version>1.6.0.Final</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-depchain</artifactId>
<version>3.1.4</version>
<type>pom</type>
<scope>test</scope>
</dependency>
Expand Down
6 changes: 5 additions & 1 deletion rules/rules-reviewed/eap8/eap6/tests/data/xml-binding/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,15 @@
<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/maven-v4_0_0.xsd">

<modelVersion>4.0.0</modelVersion>
<artifactId>jaxb-test</artifactId>
<packaging>war</packaging>
<name>jaxb-test</name>
<description>This project imports jaxb dependencies</description>

<groupId>org.test</groupId>
<version>0.0.1-SNAPSHOT</version>
<artifactId>jaxb-test</artifactId>

<licenses>
<license>
Expand Down
10 changes: 5 additions & 5 deletions rules/rules-reviewed/eap8/eap7/hibernate-search.windup.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1347,8 +1347,8 @@
<rule id="hibernate-search-00960">
<when>
<or>
<javaclass references="org.hibernate.search.{*}Facet{*}"/>
<javaclass references="org.hibernate.search.{*}facet{*}"/>
<javaclass references="org.hibernate.search.{*}.Facet{*}"/>
<javaclass references="org.hibernate.search.{*}.facet{*}"/>
</or>
</when>
<perform>
Expand All @@ -1363,8 +1363,8 @@
<rule id="hibernate-search-00970">
<when>
<or>
<javaclass references="org.hibernate.search.{*}ErrorHandl{*}"/>
<javaclass references="org.hibernate.search.{*}errorhandl{*}"/>
<javaclass references="org.hibernate.search.{*}.ErrorHandl{*}"/>
<javaclass references="org.hibernate.search.{*}.errorhandl{*}"/>
</or>
</when>
<perform>
Expand Down Expand Up @@ -1429,7 +1429,7 @@

<rule id="hibernate-search-01010">
<when>
<javaclass references="org.hibernate.search.{*}SearchFactory"/>
<javaclass references="org.hibernate.search.{*}.SearchFactory"/>
</when>
<perform>
<hint title="SearchFactory is no longer available" category-id="mandatory" effort="3">
Expand Down
45 changes: 39 additions & 6 deletions rules/rules-reviewed/eap8/eap7/tests/data/dependencies/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,158 +1,191 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.eap</groupId>
<version>0.0.1-SNAPSHOT</version>
<artifactId>spring-resteasy</artifactId>

<dependencies>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.faces</artifactId>
<version>2.4.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<version>8.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-web-api</artifactId>
<version>8.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>javax.activation-api</artifactId>
<version>1.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.batch</groupId>
<artifactId>javax.batch-api</artifactId>
<version>1.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.ejb</groupId>
<artifactId>javax.ejb-api</artifactId>
<version>3.2.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.el</groupId>
<artifactId>javax.el-api</artifactId>
<version>3.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.enterprise.concurrent</groupId>
<artifactId>javax.enterprise.concurrent-api</artifactId>
<version>1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.enterprise.deploy</groupId>
<artifactId>javax.enterprise.deploy-api</artifactId>
<version>1.7</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>javax.faces-api</artifactId>
<version>2.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.interceptor</groupId>
<artifactId>javax.interceptor-api</artifactId>
<version>3.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.jms</groupId>
<artifactId>javax.jms-api</artifactId>
<version>2.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.jws</groupId>
<artifactId>javax.jws-api</artifactId>
<version>1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>javax.mail-api</artifactId>
<version>1.6.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.management.j2ee</groupId>
<artifactId>javax.management.j2ee-api</artifactId>
<version>1.1.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.resource</groupId>
<artifactId>javax.resource-api</artifactId>
<version>1.7</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.security-auth-message</groupId>
<artifactId>javax.security-auth-message-api</artifactId>
<groupId>javax.security.auth.message</groupId>
<artifactId>javax.security.auth.message-api</artifactId>
<version>1.1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.security-jacc</groupId>
<artifactId>javax.security-jacc-api</artifactId>
<groupId>javax.security.jacc</groupId>
<artifactId>javax.security.jacc-api</artifactId>
<version>1.6</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>javax.servlet.jsp-api</artifactId>
<version>2.3.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet.jsp.jstl</groupId>
<artifactId>javax.servlet.jsp.jstl-api</artifactId>
<version>1.2.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.transaction</groupId>
<artifactId>javax.transaction-api</artifactId>
<version>1.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.websocket</groupId>
<artifactId>javax.websocket-api</artifactId>
<version>1.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<version>2.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.xml.registry</groupId>
<artifactId>javax.xml.registry-api</artifactId>
<version>1.0.8</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.xml.rpc</groupId>
<artifactId>javax.xml.rpc-api</artifactId>
<version>1.1.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.xml.soap</groupId>
<artifactId>javax.xml.soap-api</artifactId>
<version>1.4.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.xml.ws</groupId>
<artifactId>javax.xml.ws-api</artifactId>
<scope>provided</scope>
<artifactId>jaxws-api</artifactId>
<version>2.3.1</version>
</dependency>

</dependencies>

</project>
Loading

0 comments on commit ff06e52

Please sign in to comment.