chore: initial commit of ee10 migration

hantsy · Oct 22, 2023 · ebec34c · ebec34c
2 parents ff13ff7 + e04f4ed
commit ebec34c
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 99 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.github/workflows/arq-glassfish-managed.yml b/.github/workflows/arq-glassfish-managed.yml
@@ -32,7 +32,7 @@ jobs:
         sleep 5 
         docker ps -a
     - name: Build with Maven
-      run: |
-        mvn -B -q clean verify -Parq-glassfish-managed
+      run: mvn -B -q clean verify -Parq-glassfish-managed
+
 
 
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -47,4 +47,32 @@ jobs:
           java-version: '21'
           cache: 'maven'
       - name: Build with Maven
-        run: mvn clean package --file pom.xml
+        run: | 
+          mvn clean package --file pom.xml
+
+  coverage:
+    runs-on: ubuntu-latest
+    needs: [ formatting, build ]
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Java
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '21'
+          cache: 'maven'
+      - name: Set up Database
+        run: |
+          docker-compose up -d postgres 
+          sleep 5 
+          docker ps -a
+      - name: Build with Maven
+        run: |
+          mvn -B -q clean package
+          mvn -B -q verify -Parq-wildfly-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.*
diff --git a/README.md b/README.md
@@ -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)
 

diff --git a/pom.xml b/pom.xml
@@ -61,6 +61,7 @@
         <glassfish.version>7.0.9</glassfish.version>
         <jersey.version>3.1.3</jersey.version>
         <eclipselink.version>4.0.1</eclipselink.version>
+        <tyrus.version>2.1.3</tyrus.version>
         <arquillian-glassfish-jakarta.version>7.0.9</arquillian-glassfish-jakarta.version>
 
         <!-- Wildfly server -->
@@ -69,6 +70,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>
@@ -532,6 +534,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>${tyrus.version}</version>
+                    <scope>test</scope>
+                </dependency>
                 <dependency>
                     <groupId>com.github.hantsy.arquillian-container-glassfish-jakarta</groupId>
                     <artifactId>arquillian-glassfish-managed-jakarta</artifactId>
@@ -644,6 +653,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>${tyrus.version}</version>
+                    <scope>test</scope>
+                </dependency>
+
                 <dependency>
                     <groupId>com.github.hantsy.arquillian-container-glassfish-jakarta</groupId>
                     <artifactId>arquillian-glassfish-remote-jakarta</artifactId>
@@ -689,18 +706,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>${tyrus.version}</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>
@@ -713,26 +726,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>
@@ -809,6 +802,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>${tyrus.version}</version>
+                    <scope>test</scope>
+                </dependency>
                 <dependency>
                     <groupId>org.jboss.resteasy</groupId>
                     <artifactId>resteasy-client</artifactId>
@@ -821,25 +821,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>

diff --git a/src/test/arq-glassfish-managed/arquillian.xml b/src/test/arq-glassfish-managed/arquillian.xml
@@ -37,7 +37,7 @@ under the License.
             <!--<property name="adminPassword">adminadmin</property>-->
             <!-- default is empty -->
             <property name="adminPassword"></property>
-            <property name="enableDerby">${enableDerby:true}</property>
+            <property name="enableDerby">${enableDerby:false}</property>
             <property name="allowConnectingToRunningServer">false</property>
             <property name="outputToConsole">true</property>
             <!-- true enables verbose logging of the jaxrs requests -->