Merge branch 'main' into dependabot/github_actions/actions/checkout-4

.github/actions/buildtest/action.yml

@@ -8,9 +8,6 @@ inputs:
   bt-param: # id of input
     description: 'Build and test params'
     required: true
-  artifact-name: # id of input
-    description: 'Artifact name'
-    required: true
   module-name: # id of module
       description: 'module namespace'
       required: true

.github/actions/preinstall/action.yml

@@ -8,9 +8,6 @@ inputs:
   bt-param: # id of input
     description: 'Build and test params'
     required: true
-  artifact-name: # id of input
-    description: 'Artifact name'
-    required: true
   version:
     description: 'version number'
     required: true
@@ -34,5 +31,4 @@ runs:
     - id: random-number-generator
       run: echo "::set-output name=random-id::123"
 #      run: echo "random-id=123" >> GITHUB_OUTPUT
-      shell: bash
-
+      shell: bash

.github/actions/startdeps/action.yml

@@ -9,16 +9,15 @@ runs:
   using: "composite"
   steps:
     - name: Setup DotNet
-      if: inputs.module-name == 'openmaqs-webservices'
+      if: inputs.module-name == 'openmaqs-webservices' || inputs.module-name == 'openmaqs-cucumber'
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: |
-          3.1.x
           6.x.x
     - name: Start MAQS test services container
-      if: inputs.module-name == 'openmaqs-webservices'
+      if: inputs.module-name == 'openmaqs-webservices' || inputs.module-name == 'openmaqs-cucumber'
       shell: pwsh
-      #run:  docker-compose -f docker/MAQSService/docker-compose.yml -p OpenMAQS/maqs-java up -d
+#      run:  docker-compose -f docker/MAQSService/docker-compose.yml -p OpenMAQS/openmaqs-java up -d
       run: Start-Process -FilePath "dotnet" -ArgumentList "run --project docker/MAQSService/MainTestService/MainTestService.csproj"
     - name: Build the docker-compose stack
       if: inputs.module-name == 'openmaqs-database'

.github/workflows/maven.yml

@@ -64,13 +64,13 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK 17
-        uses: actions/setup-java@v3.13.0
+        uses: actions/setup-java@v4.2.1
         with:
           distribution: zulu
           java-version: 17
           cache: maven
       - name: Restore Local Maven Cache
-        uses: actions/[email protected].1
+        uses: actions/[email protected].2
         with:
           path: ~/.m2
           key: ${{runner.os}}-m2
@@ -153,7 +153,7 @@ jobs:
           bt-param: '-fae -B -e -Dtesting=solo -T 1C'
           version: ${{ github.sha }}
       - name: Test Reporting
-        if: always() && github.actor != 'dependabot[bot]'
+        if: always()
         id: test-report
         uses: phoenix-actions/test-reporting@v12
         with:
@@ -193,7 +193,7 @@ jobs:
         with:
           path: ${{github.workspace}}/artifacts/
       - name: Set up JDK 17
-        uses: actions/setup-java@v3.13.0
+        uses: actions/setup-java@v4.2.1
         with:
           distribution: zulu
           java-version: 17
@@ -205,7 +205,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Restore Local Maven Cache
-        uses: actions/[email protected].1
+        uses: actions/[email protected].2
         with:
           path: ~/.m2
           key: ${{ runner.os }}-maven-${{github.sha}}.${{github.run_number}}
@@ -225,13 +225,13 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK 17
-        uses: actions/setup-java@v3.13.0
+        uses: actions/setup-java@v4.2.1
         with:
           distribution: zulu
           java-version: 17
           cache: maven
       - name: Restore Local Maven Cache
-        uses: actions/[email protected].1
+        uses: actions/[email protected].2
         with:
           path: ~/.m2
           key: ${{runner.os}}-m2
@@ -240,7 +240,6 @@ jobs:
 
   labels:
     name: Pull Request Labels
-    if: github.actor != 'dependabot[bot]'
     runs-on: ubuntu-latest
     steps:
       - name: Label Pull Request
@@ -257,13 +256,13 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK 11
-        uses: actions/setup-java@v3.13.0
+        uses: actions/setup-java@v4.2.1
         with:
           distribution: zulu
           java-version: 11
           cache: maven
       - name: Restore Local Maven Cache
-        uses: actions/[email protected].1
+        uses: actions/[email protected].2
         with:
           path: ~/.m2
           key: ${{runner.os}}-m2
@@ -287,7 +286,7 @@ jobs:
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |
-            const result = await github.rest.repos.listReleases({
+            const result = await github.action.repos.listReleases({
               owner: context.repo.owner,
               repo: context.repo.repo
             })
@@ -296,7 +295,7 @@ jobs:
             for(var key in data){ 
                 if(data[key].tag_name == "v${{ needs.getVersion.outputs.buildNumber }}" && data[key].draft == true)
                 {
-                    github.rest.repos.updateRelease({
+                    github.action.repos.updateRelease({
                     release_id: data[key].id,
                     "draft": false,
                     owner: context.repo.owner,

.github/workflows/release.yml

@@ -38,11 +38,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK 17
-        uses: actions/setup-java@v3.13.0
+        uses: actions/setup-java@v4.2.1
         with:
           java-version: 17
       - name: Maven Cache
-        uses: actions/[email protected].1
+        uses: actions/[email protected].2
         with:
           path: ~/.m2
           key: ${{runner.os}}-m2
@@ -96,11 +96,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK 17
-        uses: actions/setup-java@v3.13.0
+        uses: actions/setup-java@v4.2.1
         with:
             java-version: 17
       - name: Maven Cache
-        uses: actions/[email protected].1
+        uses: actions/[email protected].2
         with:
           path: ~/.m2
           key: ${{runner.os}}-m2

.github/workflows/snapshot.yml

@@ -33,11 +33,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK ${{env.JDK}}
-        uses: actions/setup-java@v3.13.0
+        uses: actions/setup-java@v4.2.1
         with:
           java-version: ${{env.JDK}}
       - name: Maven Cache
-        uses: actions/[email protected].1
+        uses: actions/[email protected].2
         with:
           path: ~/.m2
           key: ${{runner.os}}-m2
@@ -88,11 +88,11 @@ jobs:
 #     steps:
 #       - uses: actions/checkout@v4
 #       - name: Set up JDK ${{env.JDK}}
-#         uses: actions/setup-java@v3.13.0
+#         uses: actions/setup-java@v4.2.1
 #         with:
 #             java-version: ${{env.JDK}}
 #       - name: Maven Cache
-#         uses: actions/[email protected].1
+#         uses: actions/[email protected].2
 #         with:
 #           path: ~/.m2
 #           key: ${{runner.os}}-m2

.gitignore

@@ -526,3 +526,4 @@ MigrationBackup/
 FodyWeavers.xsd
 
 *.zip
+.DS_Store

openmaqs-cucumber/config.xml

@@ -45,7 +45,7 @@
         <!--<Browser>REMOTE</Browser>-->
         <RemoteBrowser>Chrome</RemoteBrowser>
         <HubUrl>http://ondemand.saucelabs.com:80/wd/hub</HubUrl>
-        <WebSiteBase>http://magenicautomation.azurewebsites.net/</WebSiteBase>
+        <WebSiteBase>https://openmaqs.github.io/TestingSite/Automation/</WebSiteBase>
         <BrowserWaitTime>1000</BrowserWaitTime>
         <BrowserTimeout>20000</BrowserTimeout>
         <RemoteBrowserName>Chrome</RemoteBrowserName>
@@ -72,7 +72,7 @@
 
     <WebServiceMaqs>
         <!-- Web service root -->
-        <WebServiceUri>http://magenicautomation.azurewebsites.net</WebServiceUri>
+        <WebServiceUri>http://127.0.0.1:5026</WebServiceUri>
 
         <!-- Time-out in milliseconds -->
         <WebServiceTimeout>10000</WebServiceTimeout>

openmaqs-cucumber/src/test/java/stepdefs/selenium/SeleniumSteps.java

@@ -6,12 +6,13 @@
 
 import io.github.openmaqs.cucumber.steps.BaseSeleniumStep;
 import io.cucumber.java.en.Given;
+import io.github.openmaqs.selenium.SeleniumConfig;
 
 public class SeleniumSteps extends BaseSeleniumStep {
 
     @Given("^Selenium Step$")
     public void Step() {
-        this.getDriver().navigate().to("https://magenicautomation.azurewebsites.net/");
+        this.getDriver().navigate().to(SeleniumConfig.getWebSiteBase());
         this.getLogger().logMessage("info");
     }
 }

openmaqs-utilities/pom.xml

@@ -17,7 +17,7 @@
 
     <properties>
         <commons.io.version>2.11.0</commons.io.version>
-        <commons.configuration2.version>2.8.0</commons.configuration2.version>
+        <commons.configuration2.version>2.10.1</commons.configuration2.version>
         <commons.bean-utils.version>1.9.4</commons.bean-utils.version>
         <apache.commons-text.version>1.10.0</apache.commons-text.version>
         <jsoup.version>1.15.3</jsoup.version>

pom.xml

@@ -249,7 +249,7 @@
         <jacoco.version>0.8.7</jacoco.version>
         <testng.version>7.8.0</testng.version>
         <selenium.version>4.14.1</selenium.version>
-        <webdrivermanager.version>5.6.0</webdrivermanager.version>
+        <webdrivermanager.version>5.8.0</webdrivermanager.version>
 
         <release.plugin.profiles>release</release.plugin.profiles>
         <release.plugin.goals>deploy</release.plugin.goals>