From e02de7f72b7778b65a87cb8bdb73840d752dd4d2 Mon Sep 17 00:00:00 2001
From: Jason Edstrom <jason@instacode.io>
Date: Thu, 16 Feb 2023 20:01:30 -0600
Subject: [PATCH 1/6] #29 Setting up pipeline for Browserstack

---
 .github/workflows/maven.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 6e11a442..d02730cd 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -118,6 +118,11 @@ jobs:
           echo Cannot run Appium tests when build was triggered by dependabot
           exit 1  
       - uses: actions/checkout@v3
+      - name: BrowserStack Env Setup
+        uses: browserstack/github-actions/setup-env@master'
+        with:
+          username: ${{ secrets.BROWSERSTACK_USERNAME }}
+          access-key: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
       - uses: actions/setup-node@v3
         if: matrix.module-name == 'openmaqs-playwright'
         with:
@@ -261,7 +266,7 @@ jobs:
           gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
           passphrase: ${{ secrets.GPG_PASSPHRASE }}
       - name: Deploy Release v${{ needs.getVersion.outputs.buildNumber }} to OSSRH
-        run: mvn -Drevision=${{ needs.getVersion.outputs.buildNumber }} deploy
+        run: mvn -Drevision=${{ needs.getVersion.outputs.buildNumber }} -B -e deploy
       - name: Publish GitHub release v${{ needs.getVersion.outputs.buildNumber }}
         uses: actions/github-script@v6
         with:

From 3c6d8697224c61b1fdb65b6c062165630b48071f Mon Sep 17 00:00:00 2001
From: Jason Edstrom <jason@instacode.io>
Date: Thu, 16 Feb 2023 20:02:46 -0600
Subject: [PATCH 2/6] #29 Setting up pipeline for Browserstack

---
 .github/workflows/maven.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index d02730cd..72949c0f 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -246,7 +246,6 @@ jobs:
         with:
           distribution: zulu
           java-version: 11
-          cache: maven
       - name: Restore Local Maven Cache
         uses: actions/cache@v3.2.4
         with:
@@ -256,7 +255,7 @@ jobs:
         uses: whelk-io/maven-settings-xml-action@v20
         with:
           profiles: '[{"id": "gpg", "properties": { "gpg.keyname": "${{secrets.GPG_KEYNAME_ID}}", "gpg.passphrase": "${{secrets.GPG_PASSPHRASE}}" }}]'
-          servers: '[{"id": "ossrh", "username": "${{secrets.DEPLOY_PACKAGE_USERNAME}}", "password": "${{secrets.DEPLOY_PACKAGE_PASSWORD}}"}]'
+          servers: '[{"id": "ossrh", "username": "${{vars.DEPLOY_PACKAGE_USERNAME}}", "password": "${{secrets.DEPLOY_PACKAGE_PASSWORD}}"}]'
           active_profiles: >
             [ "ossrh", "release", "gpg" ]
       - name: Import GPG key

From 81eeeb205b9ba11064490511140283d1eb8d6d6c Mon Sep 17 00:00:00 2001
From: Jason Edstrom <jason@instacode.io>
Date: Tue, 21 Feb 2023 19:38:58 -0600
Subject: [PATCH 3/6] #29 Tests do work locally through TestNG.  Testing
 pipeline

---
 .github/workflows/maven.yml        |  2 +-
 openmaqs-selenium/browserstack.yml | 12 +++++++
 openmaqs-selenium/config.xml       | 13 +++----
 openmaqs-selenium/pom.xml          | 54 +++++++++++++++++++++++++++++-
 4 files changed, 70 insertions(+), 11 deletions(-)
 create mode 100644 openmaqs-selenium/browserstack.yml

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 72949c0f..f100de78 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -164,7 +164,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [test-modules, getVersion]
     env:
-      SONAR_ORG: "OpenMAQS"
+      SONAR_ORG: "openmaqs"
       SONAR_PROJECT: "OpenMAQS_openmaqs-java"
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       SONAR_TOKEN: ${{secrets.SONAR_TOKEN}}
diff --git a/openmaqs-selenium/browserstack.yml b/openmaqs-selenium/browserstack.yml
new file mode 100644
index 00000000..e863ecee
--- /dev/null
+++ b/openmaqs-selenium/browserstack.yml
@@ -0,0 +1,12 @@
+framework: testng
+platforms:
+  - os: Windows
+    osVersion: 11
+    browserName: Chrome
+    browserVersion: latest
+parallelsPerPlatform: 5
+browserstackLocal: false
+buildIdentifier: ${BUILD_NUMBER}
+debug: true
+networkLogs: false
+consoleLogs: errors
\ No newline at end of file
diff --git a/openmaqs-selenium/config.xml b/openmaqs-selenium/config.xml
index 533810ee..2bd394bb 100644
--- a/openmaqs-selenium/config.xml
+++ b/openmaqs-selenium/config.xml
@@ -39,17 +39,17 @@
         <Browser>Firefox</Browser>
         <Browser>Edge</Browser>
         <Browser>HEADLESSCHROME</Browser>-->
-        <Browser>HEADLESSCHROME</Browser>
+        <Browser>REMOTE</Browser>
 
         <!--Remote browser settings-->
         <RemoteBrowser>Chrome</RemoteBrowser>
-        <HubUrl>http://ondemand.saucelabs.com:80/wd/hub</HubUrl>
+        <HubUrl>https://hub.browserstack.com/wd/hub</HubUrl>
         <WebSiteBase>https://openmaqs.github.io/TestingSite/Automation/</WebSiteBase>
         <BrowserWaitTime>1000</BrowserWaitTime>
         <BrowserTimeout>20000</BrowserTimeout>
         <RemoteBrowserName>Chrome</RemoteBrowserName>
-        <RemotePlatform>OS X 10.11</RemotePlatform>
-        <RemoteVersion>54.0</RemoteVersion>
+        <!--        <RemotePlatform>OS X 10.11</RemotePlatform>-->
+        <!--        <RemoteVersion>54.0</RemoteVersion>-->
 
         <!--Browser Resize settings
         <BrowserSize>MAXIMIZE</BrowserSize>
@@ -62,10 +62,5 @@
     </SeleniumMaqs>
 
     <RemoteSeleniumCapsMaqs>
-        <username>Sauce_Labs_Username</username>
-        <accessKey>Sauce_Labs_Accesskey</accessKey>
-        <browserName>Chrome</browserName>
-        <platform>OS X 10.11</platform>
-        <version>54.0</version>
     </RemoteSeleniumCapsMaqs>
 </configuration>
\ No newline at end of file
diff --git a/openmaqs-selenium/pom.xml b/openmaqs-selenium/pom.xml
index 6a117a72..172c58a5 100644
--- a/openmaqs-selenium/pom.xml
+++ b/openmaqs-selenium/pom.xml
@@ -1,4 +1,6 @@
-<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">
+<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>
@@ -18,6 +20,51 @@
         <commonsio.version>2.11.0</commonsio.version>
     </properties>
 
+    <profiles>
+        <profile>
+            <id>testing</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <version>3.3.0</version>
+                        <executions>
+                            <execution>
+                                <id>getClasspathFilenames</id>
+                                <goals>
+                                    <goal>properties</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <version>${surefire.plugin.version}</version>
+                        <configuration>
+                            <parallel>methods</parallel>
+                            <threadCount>5</threadCount>
+                            <argLine>
+                                -javaagent:${com.browserstack:browserstack-java-sdk:jar}
+                            </argLine>
+                        </configuration>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.apache.maven.surefire</groupId>
+                                <artifactId>surefire-testng</artifactId>
+                                <version>${surefire.plugin.version}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
     <dependencies>
         <dependency>
             <groupId>io.github.openmaqs.utilities</groupId>
@@ -95,5 +142,10 @@
             <version>1.7.32</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.browserstack</groupId>
+            <artifactId>browserstack-java-sdk</artifactId>
+            <version>1.2.1</version>
+        </dependency>
     </dependencies>
 </project>

From 78cc85a52383ed8c2089b0ba3436e0cd2e8f32ca Mon Sep 17 00:00:00 2001
From: Jason Edstrom <jason@instacode.io>
Date: Tue, 21 Feb 2023 19:48:19 -0600
Subject: [PATCH 4/6] #29 Tests do work locally through TestNG.  Testing
 pipeline.  Bad character

---
 .github/workflows/maven.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index f100de78..9c90ed87 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -119,7 +119,7 @@ jobs:
           exit 1  
       - uses: actions/checkout@v3
       - name: BrowserStack Env Setup
-        uses: browserstack/github-actions/setup-env@master'
+        uses: browserstack/github-actions/setup-env@master
         with:
           username: ${{ secrets.BROWSERSTACK_USERNAME }}
           access-key: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}

From 09c0d80d50edc54fec1e3540009db28b8fb4fdf8 Mon Sep 17 00:00:00 2001
From: Jason Edstrom <jason@instacode.io>
Date: Tue, 21 Feb 2023 19:55:25 -0600
Subject: [PATCH 5/6] #29 Added back the argline

---
 openmaqs-selenium/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openmaqs-selenium/pom.xml b/openmaqs-selenium/pom.xml
index 172c58a5..248a308c 100644
--- a/openmaqs-selenium/pom.xml
+++ b/openmaqs-selenium/pom.xml
@@ -49,7 +49,7 @@
                             <parallel>methods</parallel>
                             <threadCount>5</threadCount>
                             <argLine>
-                                -javaagent:${com.browserstack:browserstack-java-sdk:jar}
+                                ${argLine} -javaagent:${com.browserstack:browserstack-java-sdk:jar}
                             </argLine>
                         </configuration>
                         <dependencies>

From 1908b49cdec9ae7ba97021278fa0916554a4b4d3 Mon Sep 17 00:00:00 2001
From: Jason Edstrom <jason@instacode.io>
Date: Wed, 22 Feb 2023 00:03:34 -0600
Subject: [PATCH 6/6] #29 openmaqs-appium transition

---
 openmaqs-appium/browserstack.yml | 12 ++++++++
 openmaqs-appium/config.xml       |  2 +-
 openmaqs-appium/pom.xml          | 52 ++++++++++++++++++++++++++++++++
 openmaqs-selenium/pom.xml        |  2 +-
 4 files changed, 66 insertions(+), 2 deletions(-)
 create mode 100644 openmaqs-appium/browserstack.yml

diff --git a/openmaqs-appium/browserstack.yml b/openmaqs-appium/browserstack.yml
new file mode 100644
index 00000000..b45cffb3
--- /dev/null
+++ b/openmaqs-appium/browserstack.yml
@@ -0,0 +1,12 @@
+framework: testng
+platforms:
+  - deviceName: Google Pixel 7 Pro
+    osVersion: 13.0
+    browserName: android
+    deviceOrientation: portrait
+parallelsPerPlatform: 5
+browserstackLocal: false
+buildIdentifier: ${BUILD_NUMBER}
+debug: true
+networkLogs: false
+consoleLogs: errors
\ No newline at end of file
diff --git a/openmaqs-appium/config.xml b/openmaqs-appium/config.xml
index 14607a7d..522b6d5c 100644
--- a/openmaqs-appium/config.xml
+++ b/openmaqs-appium/config.xml
@@ -39,7 +39,7 @@
         <DeviceName>Android GoogleAPI Emulator</DeviceName>
 
         <!-- Appium or grid connection -->
-        <MobileHubUrl>http://ondemand.saucelabs.com:80/wd/hub</MobileHubUrl>
+        <MobileHubUrl>https://hub.browserstack.com/wd/hub</MobileHubUrl>
 
         <!-- Command time-out in milliseconds -->
         <MobileCommandTimeout>122000</MobileCommandTimeout>
diff --git a/openmaqs-appium/pom.xml b/openmaqs-appium/pom.xml
index a320822a..aa672862 100644
--- a/openmaqs-appium/pom.xml
+++ b/openmaqs-appium/pom.xml
@@ -66,4 +66,56 @@
             <version>${selenium.version}</version>
         </dependency>
     </dependencies>
+    <profiles>
+        <profile>
+            <id>testing</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <version>3.3.0</version>
+                        <executions>
+                            <execution>
+                                <id>getClasspathFilenames</id>
+                                <goals>
+                                    <goal>properties</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <version>${surefire.plugin.version}</version>
+                        <configuration>
+                            <parallel>methods</parallel>
+                            <threadCount>5</threadCount>
+                            <argLine>
+                                ${argLine} -javaagent:@{com.browserstack:browserstack-java-sdk:jar}
+                            </argLine>
+                        </configuration>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.apache.maven.surefire</groupId>
+                                <artifactId>surefire-testng</artifactId>
+                                <version>${surefire.plugin.version}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                </plugins>
+            </build>
+            <dependencies>
+                <dependency>
+                    <groupId>com.browserstack</groupId>
+                    <artifactId>browserstack-java-sdk</artifactId>
+                    <version>1.2.1</version>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+
 </project>
diff --git a/openmaqs-selenium/pom.xml b/openmaqs-selenium/pom.xml
index 248a308c..897e7e0e 100644
--- a/openmaqs-selenium/pom.xml
+++ b/openmaqs-selenium/pom.xml
@@ -49,7 +49,7 @@
                             <parallel>methods</parallel>
                             <threadCount>5</threadCount>
                             <argLine>
-                                ${argLine} -javaagent:${com.browserstack:browserstack-java-sdk:jar}
+                                ${argLine} -javaagent:@{com.browserstack:browserstack-java-sdk:jar}
                             </argLine>
                         </configuration>
                         <dependencies>