Skip to content

Commit

Permalink
Remove CXF from testsuite and TCK
Browse files Browse the repository at this point in the history 
Be aware that the Liberty profile is only commented out, as we will
support this server again, as soon as they use RESTEasy. Because of
this, the archive creator is adapted to use RESTEasy, so later we only
need to remove the comments from the profiles and adapt the dependecies
within the pom.xml.

Signed-off-by: Erdle, Tobias <tobi.erdle@gmail.com>
  • Loading branch information
@erdlet
erdlet committed Apr 12, 2021
1 parent 486d08c commit f0b3e32
Show file tree
Hide file tree
Showing 6 changed files with 83 additions and 213 deletions.
98 changes: 46 additions & 52 deletions tck/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,6 @@
<artifactId>krazo-resteasy</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.krazo</groupId>
<artifactId>krazo-cxf</artifactId>
<version>${project.version}</version>
</dependency>

</dependencies>
</dependencyManagement>

Expand Down Expand Up @@ -266,53 +260,53 @@
</profile>

<!-- Run TCK against Open Liberty -->
<profile>
<id>tck-liberty</id>
<activation>
<property>
<name>tck-env</name>
<value>liberty</value>
</property>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<dependenciesToScan>jakarta.mvc.tck:mvc-tck-tests</dependenciesToScan>
<systemPropertyVariables>
<arquillian.launch>liberty</arquillian.launch>
<jakarta.mvc.tck.api.BaseArchiveProvider>
org.eclipse.krazo.tck.liberty.LibertyArchiveProvider
</jakarta.mvc.tck.api.BaseArchiveProvider>
</systemPropertyVariables>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>io.openliberty.arquillian</groupId>
<artifactId>arquillian-liberty-managed-jakarta</artifactId>
<version>2.0.0-M1</version>
<scope>test</scope>
</dependency>
</dependencies>
<!-- <profile> -->
<!-- <id>tck-liberty</id> -->
<!-- <activation> -->
<!-- <property> -->
<!-- <name>tck-env</name> -->
<!-- <value>liberty</value> -->
<!-- </property> -->
<!-- </activation> -->
<!-- <build> -->
<!-- <plugins> -->
<!-- <plugin> -->
<!-- <artifactId>maven-surefire-plugin</artifactId> -->
<!-- <configuration> -->
<!-- <dependenciesToScan>jakarta.mvc.tck:mvc-tck-tests</dependenciesToScan> -->
<!-- <systemPropertyVariables> -->
<!-- <arquillian.launch>liberty</arquillian.launch> -->
<!-- <jakarta.mvc.tck.api.BaseArchiveProvider> -->
<!-- org.eclipse.krazo.tck.liberty.LibertyArchiveProvider -->
<!-- </jakarta.mvc.tck.api.BaseArchiveProvider> -->
<!-- </systemPropertyVariables> -->
<!-- </configuration> -->
<!-- </plugin> -->
<!-- </plugins> -->
<!-- </build> -->
<!-- <dependencies> -->
<!-- <dependency> -->
<!-- <groupId>io.openliberty.arquillian</groupId> -->
<!-- <artifactId>arquillian-liberty-managed-jakarta</artifactId> -->
<!-- <version>2.0.0-M1</version> -->
<!-- <scope>test</scope> -->
<!-- </dependency> -->
<!-- </dependencies> -->

<repositories>
<repository>
<id>sonatype-oss-snapshots</id>
<name>Sonatype OSS Nexus Snapshots</name>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
</profile>
<!-- <repositories> -->
<!-- <repository> -->
<!-- <id>sonatype-oss-snapshots</id> -->
<!-- <name>Sonatype OSS Nexus Snapshots</name> -->
<!-- <url>https://oss.sonatype.org/content/repositories/snapshots/</url> -->
<!-- <releases> -->
<!-- <enabled>false</enabled> -->
<!-- </releases> -->
<!-- <snapshots> -->
<!-- <enabled>true</enabled> -->
<!-- </snapshots> -->
<!-- </repository> -->
<!-- </repositories> -->
<!-- </profile> -->

</profiles>

Expand Down
4 changes: 0 additions & 4 deletions tck/src/main/java/org/eclipse/krazo/tck/AbstractArchiveProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,6 @@ protected File[] resolveKrazoRestEasy() {
return resolveKrazoModule("org.eclipse.krazo", "krazo-resteasy");
}

protected File[] resolveKrazoCxf() {
return resolveKrazoModule("org.eclipse.krazo", "krazo-cxf");
}

protected File[] resolveKrazoCore() {
return resolveKrazoModule("org.eclipse.krazo", "krazo-core");
}
Expand Down
2 changes: 1 addition & 1 deletion tck/src/main/java/org/eclipse/krazo/tck/liberty/LibertyArchiveProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public class LibertyArchiveProvider extends AbstractArchiveProvider {
public WebArchive getBaseArchive() {
return ShrinkWrap.create(WebArchive.class)
.addAsLibraries(resolveMvcSpecJar())
.addAsLibraries(resolveKrazoCxf());
.addAsLibraries(resolveKrazoRestEasy());
}

}
36 changes: 0 additions & 36 deletions tck/src/main/java/org/eclipse/krazo/tck/tomee/TomeeArchiveProvider.java
View file

This file was deleted.

47 changes: 0 additions & 47 deletions tck/src/main/java/org/eclipse/krazo/tck/tomee/TomeeDevArchiveProvider.java
View file

This file was deleted.

109 changes: 36 additions & 73 deletions testsuite/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -335,79 +335,42 @@
</plugins>
</build>
</profile>
<profile>
<id>testsuite-tomee</id>

<properties>
<skipITs>false</skipITs>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>arquillian-tomee-remote</artifactId>
<version>8.0.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.krazo</groupId>
<artifactId>krazo-cxf</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<skipITs>false</skipITs>
<systemProperties>
<arquillian.launch>tomee</arquillian.launch>
<testsuite.profile>testsuite-tomee</testsuite.profile>
</systemProperties>
</configuration>
</plugin>
</plugins>
</build>
</profile>

<profile>
<id>testsuite-liberty</id>

<properties>
<skipITs>false</skipITs>
</properties>

<dependencies>
<dependency>
<groupId>io.openliberty.arquillian</groupId>
<artifactId>arquillian-liberty-managed</artifactId>
<version>1.0.6</version>
</dependency>
<dependency>
<groupId>org.eclipse.krazo</groupId>
<artifactId>krazo-cxf</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<skipITs>false</skipITs>
<systemProperties>
<arquillian.launch>liberty</arquillian.launch>
<testsuite.profile>testsuite-liberty</testsuite.profile>
</systemProperties>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<!-- <profile> -->
<!-- <id>testsuite-liberty</id> -->

<!-- <properties> -->
<!-- <skipITs>false</skipITs> -->
<!-- </properties> -->

<!-- <dependencies> -->
<!-- <dependency> -->
<!-- <groupId>io.openliberty.arquillian</groupId> -->
<!-- <artifactId>arquillian-liberty-managed</artifactId> -->
<!-- <version>1.0.6</version> -->
<!-- </dependency> -->
<!-- <dependency> -->
<!-- <groupId>org.eclipse.krazo</groupId> -->
<!-- <artifactId>krazo-cxf</artifactId> -->
<!-- <version>${project.version}</version> -->
<!-- <scope>runtime</scope> -->
<!-- </dependency> -->
<!-- </dependencies> -->

<!-- <build> -->
<!-- <plugins> -->
<!-- <plugin> -->
<!-- <artifactId>maven-failsafe-plugin</artifactId> -->
<!-- <configuration> -->
<!-- <skipITs>false</skipITs> -->
<!-- <systemProperties> -->
<!-- <arquillian.launch>liberty</arquillian.launch> -->
<!-- <testsuite.profile>testsuite-liberty</testsuite.profile> -->
<!-- </systemProperties> -->
<!-- </configuration> -->
<!-- </plugin> -->
<!-- </plugins> -->
<!-- </build> -->
<!-- </profile> -->
</profiles>
</project>

0 comments on commit f0b3e32

Please sign in to comment.