diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml deleted file mode 100644 index 477ef2ef8..000000000 --- a/.github/release-drafter.yml +++ /dev/null @@ -1,11 +0,0 @@ -tag-template: 'draft' -change-template: "* $TITLE (#$NUMBER)" -categories: - - title: 'Bug Fixes' - label: 'bug' - - title: 'Maintenance' - label: 'dependencies' -template: | - ## What’s Changed - - $CHANGES \ No newline at end of file diff --git a/.github/version-drafter.yml b/.github/version-drafter.yml deleted file mode 100644 index 981a69a54..000000000 --- a/.github/version-drafter.yml +++ /dev/null @@ -1,3 +0,0 @@ -major-labels: ['semver:major'] -minor-labels: ['semver:minor','enhancement'] -patch-labels: ['semver:patch','bug'] \ No newline at end of file diff --git a/.github/workflows/gpg.yml b/.github/workflows/gpg.yml deleted file mode 100644 index dfa2b41ca..000000000 --- a/.github/workflows/gpg.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: import-gpg - -#on: -# push: -# branches: master - -jobs: - import-gpg: - runs-on: ubuntu-latest - steps: - - - name: Checkout - uses: actions/checkout@v2 - - - name: Import GPG key - id: import_gpg - uses: crazy-max/ghaction-import-gpg@v2 - env: - GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }} - PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - - - name: GPG user IDs - run: | - echo "fingerprint: ${{ steps.import_gpg.outputs.fingerprint }}" - echo "keyid: ${{ steps.import_gpg.outputs.keyid }}" - echo "name: ${{ steps.import_gpg.outputs.name }}" - echo "email: ${{ steps.import_gpg.outputs.email }}" diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml deleted file mode 100644 index 835ba44f7..000000000 --- a/.github/workflows/maven.yml +++ /dev/null @@ -1,27 +0,0 @@ -# This workflow will build a Java project with Maven -# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven - -name: Java CI with Maven - -on: -# push: -# branches: [ master ] - pull_request: - branches: [ master ] - -jobs: - build: - runs-on: windows-latest - steps: - - name: Lockdown CI Security - uses: InstaCode/lockdown@v1 - with: - users: jason-edstrom, dependabot-preview - - uses: actions/checkout@v2 - - name: Set up JDK 11 - uses: actions/setup-java@v1 - with: - java-version: 11 - - name: Build with Maven - #run: mvn -B -Pjacoco package sonar:sonar --file pom.xml -e - run: mvn -B -Pjacoco package --file pom.xml -e diff --git a/.github/workflows/project-trigger-tag.yml b/.github/workflows/project-trigger-tag.yml deleted file mode 100644 index ffe0a3342..000000000 --- a/.github/workflows/project-trigger-tag.yml +++ /dev/null @@ -1,50 +0,0 @@ -# This is a basic workflow to help you get started with Actions - -name: Trigger tagging on project close - -# Controls when the action will run. Triggers the workflow on push or pull request -# events but only for the master branch -on: -# push: -# branches: [master] - project: - types: [closed] - -# A workflow run is made up of one or more jobs that can run sequentially or in parallel -jobs: - # This workflow contains a single job called "build" - finalize: - # The type of runner that the job will run on - runs-on: ubuntu-latest - - # Steps represent a sequence of tasks that will be executed as part of the job - steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - name: Get Draft Release - uses: actions/github-script@v1 - id: draft-release - with: - github-token: ${{secrets.GITHUB_TOKEN}} - result-encoding: string - script: | - const releases = await github.repos.listReleases({ - owner: '${{github.repository_owner}}', - repo: 'JMAQS', - }) - return releases.data.find(release => release.name === 'Draft').body - - name: Get Draft Release Notes - run: echo "${{steps.draft-release.outputs.result}}" - - name: Create a Release - uses: actions/create-release@v1 - id: jmaqs-release - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - # The name of the tag. This should come from the webhook payload, `github.GITHUB_REF` when a user pushes a new tag - tag_name: ${{github.event.project.name}} - # The name of the release. For example, `Release v1.0.1` - release_name: ${{github.event.project.name}} - # Text describing the contents of the tag. - body: ${{steps.draft-release.outputs.result}} - - diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml deleted file mode 100644 index 2c30bcdb1..000000000 --- a/.github/workflows/release-drafter.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: Release Drafter - -on: - push: - # branches to consider in the event; optional, defaults to all - branches: - - master - -jobs: - update_release_draft: - runs-on: ubuntu-latest - steps: - # Drafts your next Release notes as Pull Requests are merged into "master" - - uses: release-drafter/release-drafter@v5 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index 63a1dce81..000000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,42 +0,0 @@ -# This workflow will build a Java project with Maven -# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven - -name: Java CI with Maven - -#on: -# push: -# tags: -# -v* -on: - push: - branches: [master] - - -jobs: - build: - runs-on: windows-latest - steps: - - name: Lockdown CI Security - uses: InstaCode/lockdown@v1 - with: - users: jason-edstrom, dependabot-preview - - name: Import GPG key - id: import_gpg - uses: crazy-max/ghaction-import-gpg@v2 - env: - GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }} - PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - - uses: actions/checkout@v2 - - name: Set up JDK 11 - uses: actions/setup-java@v1 - with: - java-version: 11 - - name: Create settings file - uses: s4u/maven-settings-action@v2.1.0 - with: - sonatypeSnapshots: true - servers: '[{"id": "github", "username": "jason-edstrom", "password": "${{secrets.PACKAGES_PAT}}"}]' - override: true - githubServer: false - - name: Deploy Packages to GitHub - run: mvn -Pgithub deploy -B -e -f pom.xml -DskipTests diff --git a/.github/workflows/semantic.yml b/.github/workflows/semantic.yml deleted file mode 100644 index ee235e935..000000000 --- a/.github/workflows/semantic.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: Update Releaseinfo -on: - push: - branches: - - master - -jobs: - update_version: - runs-on: ubuntu-latest - steps: - - name: calculate next version - id: version - uses: patrickjahns/version-drafter-action@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Print Next Version Number - run: echo 'Next Version - ${{steps.version.outputs.next-version}}' - - name: Print Current Version Number - run: echo 'Current Version - ${{steps.version.outputs.current-version}}' \ No newline at end of file diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml deleted file mode 100644 index cbd10884d..000000000 --- a/.github/workflows/snapshot.yml +++ /dev/null @@ -1,30 +0,0 @@ -# This workflow will build a package using Maven and then publish it to GitHub packages when a release is created -# For more information see: https://github.com/actions/setup-java#apache-maven-with-a-settings-path - -name: Maven Package Snapshot - -on: - release: - types: [created] - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - name: Set up JDK 11 - uses: actions/setup-java@v1 - with: - java-version: 11 - server-id: github # Value of the distributionManagement/repository/id field of the pom.xml - settings-path: ${{ github.workspace }} # location for the settings.xml file - - - name: Build with Maven - run: mvn -B package --file pom.xml - - - name: Publish to GitHub Packages Apache Maven - run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml - env: - GITHUB_TOKEN: ${{ github.token }} diff --git a/jmaqs-appium/pom.xml b/jmaqs-appium/pom.xml index 1395e07c4..3c9926537 100644 --- a/jmaqs-appium/pom.xml +++ b/jmaqs-appium/pom.xml @@ -2,16 +2,17 @@ 4.0.0 + com.magenic.jmaqs.appium + jmaqs-appium + JMAQS Appium Testing Module + com.magenic.jmaqs jmaqs-framework - ${revision} + 2.0.1-SNAPSHOT + ../pom.xml - com.magenic.jmaqs.appium - jmaqs-appium - JMAQS Appium Testing Module - UTF-8 7.3.0 diff --git a/jmaqs-base/pom.xml b/jmaqs-base/pom.xml index 6b50d8b44..b35d5f60d 100644 --- a/jmaqs-base/pom.xml +++ b/jmaqs-base/pom.xml @@ -4,7 +4,8 @@ com.magenic.jmaqs jmaqs-framework - ${revision} + 2.0.1-SNAPSHOT + ../pom.xml com.magenic.jmaqs.base diff --git a/jmaqs-database/pom.xml b/jmaqs-database/pom.xml index e382e8eb4..c2e7c460f 100644 --- a/jmaqs-database/pom.xml +++ b/jmaqs-database/pom.xml @@ -4,7 +4,7 @@ com.magenic.jmaqs jmaqs-framework - ${revision} + 2.0.1-SNAPSHOT com.magenic.jmaqs.database jmaqs-database diff --git a/jmaqs-jacoco-reporting/pom.xml b/jmaqs-jacoco-reporting/pom.xml index 2dc259bee..9dc2991e7 100644 --- a/jmaqs-jacoco-reporting/pom.xml +++ b/jmaqs-jacoco-reporting/pom.xml @@ -9,7 +9,7 @@ jmaqs-framework com.magenic.jmaqs - ${revision} + 2.0.1-SNAPSHOT 4.0.0 diff --git a/jmaqs-selenium/pom.xml b/jmaqs-selenium/pom.xml index 56bf1dfdc..3c5f8ae20 100644 --- a/jmaqs-selenium/pom.xml +++ b/jmaqs-selenium/pom.xml @@ -4,13 +4,15 @@ com.magenic.jmaqs jmaqs-framework - ${revision} + 2.0.1-SNAPSHOT + ../pom.xml com.magenic.jmaqs.selenium jmaqs-selenium JMAQS Selenium Testing Module jar + http://maven.apache.org UTF-8 diff --git a/jmaqs-utilities/pom.xml b/jmaqs-utilities/pom.xml index 3ad045a28..d5cc069ef 100644 --- a/jmaqs-utilities/pom.xml +++ b/jmaqs-utilities/pom.xml @@ -4,11 +4,12 @@ com.magenic.jmaqs jmaqs-framework - ${revision} + 2.0.1-SNAPSHOT com.magenic.jmaqs.utilities jmaqs-utilities JMAQS Testing Utilities Module + http://maven.apache.org 2.7 1.9.4 diff --git a/jmaqs-webservices-jdk11/pom.xml b/jmaqs-webservices-jdk11/pom.xml index 88da3101b..75ff7e535 100644 --- a/jmaqs-webservices-jdk11/pom.xml +++ b/jmaqs-webservices-jdk11/pom.xml @@ -5,7 +5,7 @@ jmaqs-framework com.magenic.jmaqs - ${revision} + 2.0.1-SNAPSHOT 4.0.0 diff --git a/jmaqs-webservices-jdk8/pom.xml b/jmaqs-webservices-jdk8/pom.xml index 51f1995be..538d685ec 100644 --- a/jmaqs-webservices-jdk8/pom.xml +++ b/jmaqs-webservices-jdk8/pom.xml @@ -6,11 +6,12 @@ com.magenic.jmaqs jmaqs-framework - ${revision} + 2.0.1-SNAPSHOT com.magenic.jmaqs.webservices jmaqs-webservices-jdk8 JMAQS JDK8 WebServices Testing Module + http://maven.apache.org 2.10.2 2.11.0 diff --git a/pom.xml b/pom.xml index d99b68274..29824cdb5 100644 --- a/pom.xml +++ b/pom.xml @@ -1,3 +1,7 @@ + + @@ -5,9 +9,9 @@ com.magenic.jmaqs jmaqs-framework - ${revision} + 2.0.1-SNAPSHOT JMAQS Framework - A collection of testing libraries and convenience classes to accelerate startup + A collection of testing libraries and conveince classes to accelerate startup automation efforts pom @@ -46,6 +50,7 @@ HEAD + jmaqs-utilities jmaqs-base @@ -56,45 +61,26 @@ + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + WIP - false + true jmaqs-webservices-jdk11 - - ossrh - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - - - github - - - github - https://maven.pkg.github.com/InstaCode/JMAQS - - - github - https://maven.pkg.github.com/InstaCode/JMAQS - true - - - jacoco @@ -126,6 +112,12 @@ release-sign-artifacts + + + performRelease + true + + @@ -141,7 +133,6 @@ - -Dgpg.passphrase=${gpg.passphrase} --pinentry-mode loopback @@ -155,7 +146,6 @@ - 2.0.1-SNAPSHOT 2.17 3.2.0 3.8.1 @@ -191,31 +181,6 @@ - - org.codehaus.mojo - flatten-maven-plugin - 1.1.0 - - true - resolveCiFriendliesOnly - - - - flatten - process-resources - - flatten - - - - flatten.clean - clean - - clean - - - - org.sonatype.plugins nexus-staging-maven-plugin @@ -227,38 +192,31 @@ true - org.apache.maven.plugins - maven-scm-plugin - 1.11.2 + maven-release-plugin + 2.5.3 - v${project.version} + true + true + false + forked-path + -Dgpg.passphrase=${gpg.passphrase} + + + org.apache.maven.scm + maven-scm-provider-gitexe + 1.11.2 + + + org.apache.maven.scm + maven-scm-api + 1.11.2 + + + org.apache.maven.plugins maven-compiler-plugin @@ -302,6 +260,9 @@ jar + + + @@ -318,6 +279,7 @@ org.apache.maven.plugins maven-deploy-plugin + ${maven-deploy-plugin.version} org.apache.maven.plugins @@ -327,7 +289,7 @@ com.puppycrawl.tools checkstyle - ${puppycheckstyle.plugin.version} + 8.29