Skip to content

Commit

Permalink
chore: initial commit of ee10 migration
Browse files Browse the repository at this point in the history
  • Loading branch information
hantsy committed Oct 22, 2023
2 parents ff13ff7 + e04f4ed commit b639771
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 96 deletions.
44 changes: 0 additions & 44 deletions .circleci/config.yml

This file was deleted.

9 changes: 8 additions & 1 deletion .github/workflows/arq-glassfish-managed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,13 @@ jobs:
docker ps -a
- name: Build with Maven
run: |
mvn -B -q clean verify -Parq-glassfish-managed
mvn -B -q clean package
mvn -B -q verify -Parq-glassfish-managed,coverage jacoco:report \
org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
-Dsonar.host.url=https://sonarcloud.io \
-Dsonar.login=$SONAR_TOKEN \
-Dsonar.organization=hantsy \
-Dsonar.projectKey=hantsy_cargotracker \
-Dsonar.coverage.exclusions=**/dto/*,**/*Configuration.*,**/SampleDataGenerator.*
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
![Integration Test with Arquillian WildFly Managed Container](https://github.com/hantsy/cargotracker/workflows/arq-wildfly-managed/badge.svg)
![Integration Test with Arquillian WildFly Remote Container](https://github.com/hantsy/cargotracker/workflows/arq-wildfly-remote/badge.svg)


[![CircleCI](https://circleci.com/gh/hantsy/cargotracker.svg?style=svg)](https://circleci.com/gh/hantsy/cargotracker)
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=hantsy_cargotracker&metric=alert_status)](https://sonarcloud.io/dashboard?id=hantsy_cargotracker)
[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=hantsy_cargotracker&metric=coverage)](https://sonarcloud.io/dashboard?id=hantsy_cargotracker)

Expand Down
78 changes: 29 additions & 49 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
<wildfly-arquillian.version>5.0.1.Final</wildfly-arquillian.version>
<!-- aligned to Wildfly version. -->
<resteasy.version>6.2.5.Final</resteasy.version>
<undertow-websockets-jsr.version>2.3.10.Final</undertow-websockets-jsr.version>

<!-- Application properties -->
<webapp.databaseTempDir>/tmp</webapp.databaseTempDir>
Expand Down Expand Up @@ -532,6 +533,13 @@
<version>${jersey.version}</version>
<scope>test</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/org.glassfish.tyrus.bundles/tyrus-standalone-client -->
<dependency>
<groupId>org.glassfish.tyrus.bundles</groupId>
<artifactId>tyrus-standalone-client</artifactId>
<version>2.1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.hantsy.arquillian-container-glassfish-jakarta</groupId>
<artifactId>arquillian-glassfish-managed-jakarta</artifactId>
Expand Down Expand Up @@ -644,6 +652,14 @@
<version>${jersey.version}</version>
<scope>test</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/org.glassfish.tyrus.bundles/tyrus-standalone-client -->
<dependency>
<groupId>org.glassfish.tyrus.bundles</groupId>
<artifactId>tyrus-standalone-client</artifactId>
<version>2.1.3</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.github.hantsy.arquillian-container-glassfish-jakarta</groupId>
<artifactId>arquillian-glassfish-remote-jakarta</artifactId>
Expand Down Expand Up @@ -689,18 +705,14 @@
<serverRoot>${project.build.directory}/wildfly-${wildfly.version}</serverRoot>
</properties>
<dependencies>
<!--<dependency>
<groupId>io.undertow</groupId>
<artifactId>undertow-websockets-jsr</artifactId>
<version>${undertow-websockets-jsr.version}</version>
<!-- https://mvnrepository.com/artifact/org.glassfish.tyrus.bundles/tyrus-standalone-client -->
<dependency>
<groupId>org.glassfish.tyrus.bundles</groupId>
<artifactId>tyrus-standalone-client</artifactId>
<version>2.1.3</version>
<scope>test</scope>
</dependency>-->
</dependency>

<!-- TESTS -->
<!-- JAXRS test need the dependency:resteasy-client -->
<!-- Import the RestEasy Client and jackson2/json-binding/json-p provider, we use
test scope
as we need that for test purposes -->
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-client</artifactId>
Expand All @@ -713,26 +725,6 @@
<version>${resteasy.version}</version>
<scope>test</scope>
</dependency>

<!-- use Jersey client instead -->
<!--<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-binding</artifactId>
<version>${jersey.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
<version>${jersey.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<version>${jersey.version}</version>
<scope>test</scope>
</dependency>-->
<dependency>
<groupId>org.wildfly.arquillian</groupId>
<artifactId>wildfly-arquillian-container-managed</artifactId>
Expand Down Expand Up @@ -809,6 +801,13 @@
<skip.integration.tests>false</skip.integration.tests>
</properties>
<dependencies>
<!-- https://mvnrepository.com/artifact/org.glassfish.tyrus.bundles/tyrus-standalone-client -->
<dependency>
<groupId>org.glassfish.tyrus.bundles</groupId>
<artifactId>tyrus-standalone-client</artifactId>
<version>2.1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-client</artifactId>
Expand All @@ -821,25 +820,6 @@
<version>${resteasy.version}</version>
<scope>test</scope>
</dependency>
<!-- use Jersey client instead -->
<!--<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-binding</artifactId>
<version>${jersey.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
<version>${jersey.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<version>${jersey.version}</version>
<scope>test</scope>
</dependency>-->

<dependency>
<groupId>org.wildfly.arquillian</groupId>
Expand Down

0 comments on commit b639771

Please sign in to comment.