Merge pull request #76 from adarro/master

Dep Catch up

.circleci/config.yml

@@ -1,61 +1,61 @@
-# Scala CircleCI 2.0 configuration file
-# See: https://circleci.com/docs/2.0/sample-config/
-version: 2.1
-orbs: 
-  gradle: circleci/gradle@2.2.0
-  codecov: codecov/codecov@3.2.3
-  coverage-reporter: codacy/coverage-reporter@13.9.17
-# Define a job to be invoked later in a workflow.
-# See: https://circleci.com/docs/2.0/configuration-reference/#jobs
-jobs:
-  build_and_test:
-    # Specify the execution environment. You can specify an image from Dockerhub or use one of our Convenience Images from CircleCI's Developer Hub.
-    # See: https://circleci.com/docs/2.0/configuration-reference/#docker-machine-macos-windows-executor
-    docker:
-      # specify the version you desire here
-      - image: cimg/openjdk:11.0
-        auth:
-          username: $docker_user
-          password: $docker_token
-
-      # Specify service dependencies here if necessary
-      # CircleCI maintains a library of pre-built images
-      # documented at https://circleci.com/docs/2.0/circleci-images/
-      # - image: circleci/postgres:9.4
-
-    working_directory: ~/repo
-
-    environment:
-      # Customize the JVM maximum heap limit
-      JVM_OPTS: -Xmx3200m
-      TERM: dumb
-
-    # Add steps to the job
-    # See: https://circleci.com/docs/2.0/configuration-reference/#steps
-    steps:
-      - checkout
-      - run: ./gradlew assemble
-      - run: cat /dev/null | ./gradlew reportScoverage aggregateAllTestReports
-      - run: if [ -e ./gradlew ]; then ./gradlew reportScoverage --continue;else gradle reportScoverage --continue;fi
-      - codecov/upload
-      - coverage-reporter/send_report:
-          coverage-reports: 'report.xml,coverage.info'
-          project-token: $CODACY_PROJECT_TOKEN
-      # Download and cache dependencies
-      - restore_cache:
-          keys:
-            - v1-dependencies-{{ checksum "build.gradle.kts" }}
-            # fallback to using the latest cache if no exact match is found
-            - v1-dependencies-
-
-      - save_cache:
-          paths:
-            - ~/.gradle
-          key: v1-dependencies--{{ checksum "build.gradle.kts" }}
-workflows:
-  example-workflow:
-    jobs:
-      - build_and_test:
-          context:
-          - docker_creds
-      # run tests!
+# Scala CircleCI 2.0 configuration file
+# See: https://circleci.com/docs/2.0/sample-config/
+version: 2.1
+orbs:
+    gradle: circleci/gradle@2.2.0
+    codecov: codecov/codecov@3.2.3
+    coverage-reporter: codacy/coverage-reporter@13.9.17
+# Define a job to be invoked later in a workflow.
+# See: https://circleci.com/docs/2.0/configuration-reference/#jobs
+jobs:
+    build_and_test:
+        # Specify the execution environment. You can specify an image from Dockerhub or use one of our Convenience Images from CircleCI's Developer Hub.
+        # See: https://circleci.com/docs/2.0/configuration-reference/#docker-machine-macos-windows-executor
+        docker:
+            # specify the version you desire here
+            - image: cimg/openjdk:11.0
+              auth:
+                  username: $docker_user
+                  password: $docker_token
+
+            # Specify service dependencies here if necessary
+            # CircleCI maintains a library of pre-built images
+            # documented at https://circleci.com/docs/2.0/circleci-images/
+            # - image: circleci/postgres:9.4
+
+        working_directory: ~/repo
+
+        environment:
+            # Customize the JVM maximum heap limit
+            JVM_OPTS: -Xmx3200m
+            TERM: dumb
+
+        # Add steps to the job
+        # See: https://circleci.com/docs/2.0/configuration-reference/#steps
+        steps:
+            - checkout
+            - run: ./gradlew assemble
+            - run: cat /dev/null | ./gradlew reportScoverage aggregateAllTestReports
+            - run: if [ -e ./gradlew ]; then ./gradlew reportScoverage aggregateAllTestReports --continue;else gradle reportScoverage aggregateAllTestReports --continue;fi
+            - codecov/upload
+            - coverage-reporter/send_report:
+                  coverage-reports: report.xml,coverage.info
+                  project-token: $CODACY_PROJECT_TOKEN
+            # Download and cache dependencies
+            - restore_cache:
+                  keys:
+                      - v1-dependencies-{{ checksum "build.gradle.kts" }}
+                      # fallback to using the latest cache if no exact match is found
+                      - v1-dependencies-
+
+            - save_cache:
+                  paths:
+                      - ~/.gradle
+                  key: v1-dependencies--{{ checksum "build.gradle.kts" }}
+workflows:
+    example-workflow:
+        jobs:
+            - build_and_test:
+                  context:
+                      - docker_creds
+            # run tests!

.github/workflows/gradle.yml

@@ -1,39 +1,36 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
-
-name: Java CI with Gradle
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 11
-      uses: actions/setup-java@v2
-      with:
-        java-version: '11'
-        distribution: 'adopt'
-    - name: Build with Gradle
-      uses: gradle/gradle-build-action@4137be6a8bf7d7133955359dbd952c0ca73b1021
-      with:
-        arguments: build
-    - name: Run Test and Reports
-      run: ./gradlew reportScoverage aggregateAllTestReports
-    - uses: actions/checkout@master
-    - uses: codecov/codecov-action@v2
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
-        name: codecov-umbrella # optional
-        verbose: true # optional (default = false)
+name: Run Gradle on PRs
+
+on: 
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  gradle:
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-java@v3
+      with:
+        distribution: adopt
+        java-version: 11
+
+    - name: Setup Gradle
+      uses: gradle/gradle-build-action@v2
+      with:
+        gradle-version: wrapper
+        arguments: build --scan
+    - name: Run test and Coverage  
+      uses: gradle/gradle-build-action@v2
+      with:
+          gradle-version: wrapper
+          arguments: reportScoverage aggregateAllTestReports
+      uses: codecov/codecov-action@v2
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
+        name: codecov-umbrella # optional 
+        verbose: true # optional (default = false)

.trunk/.gitignore

@@ -0,0 +1,8 @@
+*out
+*logs
+*actions
+*notifications
+plugins
+user_trunk.yaml
+user.yaml
+shims

.trunk/configs/.markdownlint.yaml

@@ -0,0 +1,10 @@
+# Autoformatter friendly markdownlint config (all formatting rules disabled)
+default: true
+blank_lines: false
+bullet: false
+html: false
+indentation: false
+line_length: false
+spaces: false
+url: false
+whitespace: false

.trunk/configs/.shellcheckrc

@@ -0,0 +1,7 @@
+enable=all
+source-path=SCRIPTDIR
+disable=SC2154
+
+# If you're having issues with shellcheck following source, disable the errors via:
+# disable=SC1090
+# disable=SC1091

.trunk/configs/.yamllint.yaml

@@ -0,0 +1,10 @@
+rules:
+    quoted-strings:
+        required: only-when-needed
+        extra-allowed: ["{|}"]
+    empty-values:
+        forbid-in-block-mappings: true
+        forbid-in-flow-mappings: true
+    key-duplicates: {}
+    octal-values:
+        forbid-implicit-octal: true

.trunk/trunk.yaml

@@ -0,0 +1,36 @@
+version: 0.1
+cli:
+    version: 1.9.1
+plugins:
+    sources:
+        - id: trunk
+          ref: v0.0.17
+          uri: https://github.com/trunk-io/plugins
+lint:
+    enabled:
+        - actionlint@1.6.24
+        - dotenv-linter@3.3.0
+        - git-diff-check
+        - gitleaks@8.16.3
+        - ktlint@0.49.0
+        - markdownlint@0.34.0
+        - oxipng@8.0.0
+        - prettier@2.8.8
+        - renovate@35.71.6
+        - scalafmt@3.7.3
+        - shellcheck@0.9.0
+        - shfmt@3.5.0
+        - yamllint@1.31.0
+runtimes:
+    enabled:
+        - go@1.19.5
+        - java@11.0.13
+        - node@18.12.1
+        - python@3.10.8
+actions:
+    disabled:
+        - trunk-announce
+        - trunk-check-pre-push
+        - trunk-fmt-pre-commit
+    enabled:
+        - trunk-upgrade-available

gradle.properties

@@ -72,7 +72,7 @@ concordionExtCollapseOutputVersion=1.0.0
 
 # Build configuration @see settings.gradle.kts
 projectFolderDelimiter=,
-projectFolders=generated,profiles,docs,subprojects,incubating
+projectFolders=generated,profiles,docs,subprojects
 
 # system properties
 # concordion

pom.xml

@@ -109,7 +109,7 @@
         <spring.boot.version>1.5.0.RELEASE</spring.boot.version>
 		<!-- Misc Utilities -->
 		<!-- Web Scraping -->
-        <scalascraper.version>1.2.0</scalascraper.version>
+        <scalascraper.version>3.1.0</scalascraper.version>
 		<!-- Deployment / Deploy / Stage -->
         <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
 		<!-- Analytics -->
@@ -244,7 +244,7 @@
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-classic</artifactId>
-                <version>1.3.0</version>
+                <version>1.4.5</version>
             </dependency>
 			<!-- Configuration Management -->
             <dependency>
@@ -381,7 +381,7 @@
             <dependency>
                 <groupId>org.testng</groupId>
                 <artifactId>testng</artifactId>
-                <version>6.13.1</version>
+                <version>7.7.1</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
@@ -501,7 +501,7 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>versions-maven-plugin</artifactId>
-                    <version>2.2</version>
+                    <version>2.15.0</version>
                 </plugin>
 
                 <plugin>
@@ -1280,7 +1280,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>versions-maven-plugin</artifactId>
-                <version>2.2</version>
+                <version>2.15.0</version>
                 <reportSets>
                     <reportSet>
                         <reports>