From 3bfaba28411c1a922a017819000a4d36c45f029c Mon Sep 17 00:00:00 2001 From: jainadc9 <93383550+jainadc9@users.noreply.github.com> Date: Tue, 9 Aug 2022 13:54:02 +0530 Subject: [PATCH 1/8] Migrated travis jobs to github actions (#51) * Created main.yml to migrate from travis to github actions * Fixed failing tests and removed travis configuration --- .github/workflows/main.yml | 60 ++++++++++++++++++++++++++++++++++++++ .travis.yml | 54 ---------------------------------- 2 files changed, 60 insertions(+), 54 deletions(-) create mode 100644 .github/workflows/main.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 00000000..e6dcbf06 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,60 @@ +# This is a basic workflow to help you get started with Actions + +name: CI + +# Controls when the workflow will run +on: + # Triggers the workflow on push or pull request events but only for the master branch + push: + branches: [ master ] + pull_request: + branches: [ master ] + + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +# 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" + allTests: + if: github.repository == 'eiffel-community/eiffel-commons' + # 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 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 + with: + distribution: 'corretto' + java-version: '8' + + - name: Run All tests + run: mvn test -B + + reportCoverage: + if: github.repository == 'eiffel-community/eiffel-commons' && github.event_name == 'push' + # 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 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 + with: + distribution: 'corretto' + java-version: '8' + + - name: Run cobertura + shell: bash + run: | + mvn cobertura:cobertura -Dcobertura.report.format=xml -B + + # Generating test coverage report and publishing to Codacy + - name: Run report coverage + uses: codacy/codacy-coverage-reporter-action@v1 + with: + project-token: e47987d1f0e94f809b08d26cfe24e90f + coverage-reports: target/site/cobertura/coverage.xml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index eff1a22d..00000000 --- a/.travis.yml +++ /dev/null @@ -1,54 +0,0 @@ -sudo: required - -dist: xenial - -language: java - -# services: -# - docker - -env: - - JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64 - -# Run before every job -before_install: - - sudo apt-get update - - sudo apt-get install -y openjdk-8-jdk - - PATH=$(echo "$PATH" | sed -e 's/:\/usr\/local\/lib\/jvm\/openjdk11\/bin//') - - java -version - - uname -a - - chmod +x pom.xml - - -# This is only run before integrationTests job -# To ensure docker containers are fully up and running we sleep 20s -# before_script: -# - cd src/main/docker/ -# - source env.bash -# - docker-compose up -d -# - sleep 60 -# - cd ../../../ - - -# Generate site documentation using mvn site plugin -# before_deploy: -# - rm -rf docs -# - mvn site -B - - -# Using default stage 'test' for all our test jobs, and only running deploy stage -# (after merge) to master branch -stages: - - test -# - name: deploy -# if: branch = master - - -# List of jobs to run, tied to specific stages -jobs: - include: - - stage: test - name: AllTests - before_script: skip - script: - - mvn test -B From e14e6a13aa7e1458c2577d1329c23a1e6c8ca244 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 25 Nov 2022 13:31:28 +0100 Subject: [PATCH 2/8] Bump junit from 4.12 to 4.13.1 (#46) * Bump junit from 4.12 to 4.13.1 Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * Bump junit from 4.12 to 4.13.1 Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * Bump junit from 4.12 to 4.13.1 Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ae7fe2e0..dce3c760 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.github.ericsson eiffel-commons-java - 0.0.15 + 0.0.16 eiffel commons java A shared library for eiffel components @@ -46,7 +46,7 @@ junit junit - 4.12 + 4.13.1 test From 1473f58e889c93f0d6ff97d783f46944e5d004ee Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Dec 2022 14:59:36 +0100 Subject: [PATCH 3/8] Bump commons-io from 2.6 to 2.7 (#48) * Bump commons-io from 2.6 to 2.7 Bumps commons-io from 2.6 to 2.7. Signed-off-by: dependabot[bot] * Migrated travis jobs to github actions (#51) * Created main.yml to migrate from travis to github actions * Fixed failing tests and removed travis configuration * Bump junit from 4.12 to 4.13.1 (#46) * Bump junit from 4.12 to 4.13.1 Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * Bump junit from 4.12 to 4.13.1 Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * Bump junit from 4.12 to 4.13.1 Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump commons-io from 2.6 to 2.7 Bumps commons-io from 2.6 to 2.7. Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: jainadc9 <93383550+jainadc9@users.noreply.github.com> Co-authored-by: z-sztrom <106370045+z-sztrom@users.noreply.github.com> --- pom.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index dce3c760..ee2c7cf8 100644 --- a/pom.xml +++ b/pom.xml @@ -4,8 +4,7 @@ 4.0.0 com.github.ericsson eiffel-commons-java - 0.0.16 - + 0.0.17 eiffel commons java A shared library for eiffel components @@ -24,7 +23,7 @@ commons-io commons-io - 2.6 + 2.7 org.apache.httpcomponents From 96f73c72ac80546d82c19571c50e8e144872f9d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 Dec 2022 13:49:28 +0100 Subject: [PATCH 4/8] Bump httpclient from 4.5.3 to 4.5.13 (#49) * Bump httpclient from 4.5.3 to 4.5.13 Bumps httpclient from 4.5.3 to 4.5.13. --- updated-dependencies: - dependency-name: org.apache.httpcomponents:httpclient dependency-type: direct:production ... Signed-off-by: dependabot[bot] * Migrated travis jobs to github actions (#51) * Created main.yml to migrate from travis to github actions * Fixed failing tests and removed travis configuration * Bump junit from 4.12 to 4.13.1 (#46) * Bump junit from 4.12 to 4.13.1 Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * Bump junit from 4.12 to 4.13.1 Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * Bump junit from 4.12 to 4.13.1 Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump commons-io from 2.6 to 2.7 (#48) * Bump commons-io from 2.6 to 2.7 Bumps commons-io from 2.6 to 2.7. Signed-off-by: dependabot[bot] * Migrated travis jobs to github actions (#51) * Created main.yml to migrate from travis to github actions * Fixed failing tests and removed travis configuration * Bump junit from 4.12 to 4.13.1 (#46) * Bump junit from 4.12 to 4.13.1 Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * Bump junit from 4.12 to 4.13.1 Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] * Bump junit from 4.12 to 4.13.1 Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump commons-io from 2.6 to 2.7 Bumps commons-io from 2.6 to 2.7. Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: jainadc9 <93383550+jainadc9@users.noreply.github.com> Co-authored-by: z-sztrom <106370045+z-sztrom@users.noreply.github.com> * Bump httpclient from 4.5.3 to 4.5.13 Bumps httpclient from 4.5.3 to 4.5.13. --- updated-dependencies: - dependency-name: org.apache.httpcomponents:httpclient dependency-type: direct:production ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: jainadc9 <93383550+jainadc9@users.noreply.github.com> Co-authored-by: z-sztrom <106370045+z-sztrom@users.noreply.github.com> --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ee2c7cf8..c8bfb526 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.github.ericsson eiffel-commons-java - 0.0.17 + 0.0.18 eiffel commons java A shared library for eiffel components @@ -28,7 +28,7 @@ org.apache.httpcomponents httpclient - 4.5.3 + 4.5.13 org.projectlombok From 1f072c47e700682a0efffa2b2ef2fe1d313fddda Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Aug 2023 16:42:57 +0530 Subject: [PATCH 5/8] Bump json from 20190722 to 20230227 (#52) Bumps [json](https://github.com/douglascrockford/JSON-java) from 20190722 to 20230227. - [Release notes](https://github.com/douglascrockford/JSON-java/releases) - [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md) - [Commits](https://github.com/douglascrockford/JSON-java/commits) --- updated-dependencies: - dependency-name: org.json:json dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c8bfb526..3ce6c9d7 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ org.json json - 20180130 + 20190722 From d445420997f55a5a85830f4361595129f69a77c4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 5 Jun 2024 17:11:56 +0530 Subject: [PATCH 6/8] Bump actions/checkout from 3 to 4 (#56) Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e6dcbf06..f2ef2657 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -24,7 +24,7 @@ jobs: # 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 - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-java@v3 with: distribution: 'corretto' @@ -41,7 +41,7 @@ jobs: # 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 - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-java@v3 with: distribution: 'corretto' From 98db5e5fac6d281101e1a4720160573811f1f87d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 5 Jun 2024 17:22:50 +0530 Subject: [PATCH 7/8] Bump actions/setup-java from 3 to 4 (#55) * Bump actions/setup-java from 3 to 4 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3 to 4. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * Update main.yml --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: jainadc9 <93383550+jainadc9@users.noreply.github.com> --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f2ef2657..e70624e6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,9 +23,9 @@ jobs: # 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 + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v4 - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: distribution: 'corretto' java-version: '8' @@ -42,7 +42,7 @@ jobs: steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v4 - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: distribution: 'corretto' java-version: '8' From 9c725a61ff2a4636c064de6a39f6e714e1fd3b1d Mon Sep 17 00:00:00 2001 From: jainadc9 <93383550+jainadc9@users.noreply.github.com> Date: Wed, 19 Mar 2025 11:09:56 +0000 Subject: [PATCH 8/8] Prepare patched release for openjdk8 version --- .github/workflows/main.yml | 4 ++-- pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e70624e6..d3026d50 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -6,9 +6,9 @@ name: CI on: # Triggers the workflow on push or pull request events but only for the master branch push: - branches: [ master ] + branches: [ 0.0.15-openjdk8 ] pull_request: - branches: [ master ] + branches: [ 0.0.15-openjdk8 ] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: diff --git a/pom.xml b/pom.xml index 3ce6c9d7..1488e7e5 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.github.ericsson eiffel-commons-java - 0.0.18 + 0.0.15-openjdk8 eiffel commons java A shared library for eiffel components