From f82b1519afbfacbd138f9b245d17b0f32067e68b Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Sat, 21 Oct 2023 19:27:26 +0200 Subject: [PATCH 1/8] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 937ffbc..b49651d 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ plexus-testing - 1.2.0 + 1.2.1-SNAPSHOT Plexus Testing @@ -31,7 +31,7 @@ - 2023-10-21T17:25:06Z + 2023-10-21T17:27:26Z From 3e3529b9707c94bacaa984920345a74e7a756337 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Nov 2023 23:26:41 +0000 Subject: [PATCH 2/8] 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] --- .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 e1cce45..688f085 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -36,7 +36,7 @@ jobs: uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: ${{ matrix.jdk }} java-version: ${{ matrix.java }} From 0076758e3b52358020261757a662100ea698d1f1 Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Sat, 2 Dec 2023 10:30:00 +0100 Subject: [PATCH 3/8] Reuse plexus-pom action for CI --- .github/workflows/maven.yml | 34 ++++++++-------------------------- 1 file changed, 8 insertions(+), 26 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 688f085..09feae4 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -21,29 +21,11 @@ on: [push, pull_request] jobs: build: - - strategy: - matrix: - os: [ubuntu-latest,windows-latest, macOS-latest] - java: [8, 11, 17, 20] - jdk: [temurin] - fail-fast: false - - runs-on: ${{ matrix.os }} - - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Set up JDK - uses: actions/setup-java@v4 - with: - distribution: ${{ matrix.jdk }} - java-version: ${{ matrix.java }} - cache: 'maven' - - - name: Build with Maven - run: mvn install javadoc:javadoc -e -B -V - - - name: Build with Maven and target Java level - ${{ matrix.java }} - run: mvn clean install javadoc:javadoc -e -DjavaVersion=${{ matrix.java }} + name: Build it + uses: codehaus-plexus/.github/.github/workflows/maven.yml@master + + deploy: + name: Deploy + needs: build + uses: codehaus-plexus/.github/.github/workflows/maven-deploy.yml@master + secrets: inherit From 8e5a9afebc29d60f5c218e05d29167954c527882 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Dec 2023 23:38:20 +0000 Subject: [PATCH 4/8] Bump org.codehaus.plexus:plexus from 15 to 16 Bumps [org.codehaus.plexus:plexus](https://github.com/codehaus-plexus/plexus-pom) from 15 to 16. - [Release notes](https://github.com/codehaus-plexus/plexus-pom/releases) - [Commits](https://github.com/codehaus-plexus/plexus-pom/commits) --- updated-dependencies: - dependency-name: org.codehaus.plexus:plexus dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b49651d..8844909 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.codehaus.plexus plexus - 15 + 16 plexus-testing From e8e1d0bce0b1cb534040968c2dbd626497d92724 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Wed, 13 Dec 2023 22:37:07 +0100 Subject: [PATCH 5/8] Update dependencies (#57) Changes: * update parent POM to 16 * update plexus-shim to 0.9.0.M2 * drop junit engine, surefire pulls it in automatically --- pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 8844909..f9fa1ed 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,12 @@ org.eclipse.sisu org.eclipse.sisu.plexus - 0.3.5 + 0.9.0.M2 + + + org.eclipse.sisu + org.eclipse.sisu.inject + 0.9.0.M2 com.google.inject @@ -49,11 +54,6 @@ org.junit.jupiter junit-jupiter-api - - org.junit.jupiter - junit-jupiter-engine - test - From a3714984dc16e5a60d04ab30ba46208e0b346690 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Thu, 14 Dec 2023 00:14:19 +0100 Subject: [PATCH 6/8] Add an PlexusExtension#setContext protected method --- .../java/org/codehaus/plexus/testing/PlexusExtension.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/codehaus/plexus/testing/PlexusExtension.java b/src/main/java/org/codehaus/plexus/testing/PlexusExtension.java index 893b85d..be8ce91 100644 --- a/src/main/java/org/codehaus/plexus/testing/PlexusExtension.java +++ b/src/main/java/org/codehaus/plexus/testing/PlexusExtension.java @@ -74,7 +74,8 @@ public class PlexusExtension implements BeforeEachCallback, AfterEachCallback { @Override public void beforeEach(ExtensionContext context) throws Exception { basedir = getBasedir(); - this.context = context; + + setContext(context); getContainer().addComponent(getContainer(), PlexusContainer.class.getName()); @@ -83,6 +84,10 @@ public void beforeEach(ExtensionContext context) throws Exception { Collections.emptyList(), binder -> binder.requestInjection(context.getRequiredTestInstance())); } + protected void setContext(ExtensionContext context) { + this.context = context; + } + @SuppressWarnings("ResultOfMethodCallIgnored") protected void setupContainer() { // ---------------------------------------------------------------------------- From 1694b5c6a134b17430f1f0499c4476dcfe04111e Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Thu, 14 Dec 2023 14:10:21 +0100 Subject: [PATCH 7/8] Use https instead of ssh --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f9fa1ed..fdb500f 100644 --- a/pom.xml +++ b/pom.xml @@ -14,8 +14,8 @@ Plexus Testing - scm:git:git@github.com:codehaus-plexus/plexus-testing.git - scm:git:git@github.com:codehaus-plexus/plexus-testing.git + scm:git:https://github.com/codehaus-plexus/plexus-testing.git + ${project.scm.connection} plexus-testing-1.2.0 https://github.com/codehaus-plexus/plexus-testing From dc8018b0b0dc9d364a270af0695bd15a9981db12 Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Thu, 14 Dec 2023 14:10:38 +0100 Subject: [PATCH 8/8] [maven-release-plugin] prepare release plexus-testing-1.3.0 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index fdb500f..cecb041 100644 --- a/pom.xml +++ b/pom.xml @@ -9,14 +9,14 @@ plexus-testing - 1.2.1-SNAPSHOT + 1.3.0 Plexus Testing scm:git:https://github.com/codehaus-plexus/plexus-testing.git ${project.scm.connection} - plexus-testing-1.2.0 + plexus-testing-1.3.0 https://github.com/codehaus-plexus/plexus-testing @@ -31,7 +31,7 @@ - 2023-10-21T17:27:26Z + 2023-12-14T13:10:34Z