From 7d00bf951f9079c4890c622ea901d4fe73a76aa1 Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Sat, 5 Apr 2025 19:02:05 +0200 Subject: [PATCH 1/8] [maven-release-plugin] prepare for next development iteration --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index bd6151d..fcaacb0 100644 --- a/pom.xml +++ b/pom.xml @@ -9,14 +9,14 @@ plexus-testing - 1.5.0 + 1.5.1-SNAPSHOT Plexus Testing scm:git:https://github.com/codehaus-plexus/plexus-testing.git ${project.scm.connection} - plexus-testing-1.5.0 + HEAD https://github.com/codehaus-plexus/plexus-testing @@ -33,7 +33,7 @@ 5.12.1 0.9.0.M3 - 2025-04-05T17:01:59Z + 2025-04-05T17:02:05Z From 29e4de60671493f341fe158d3f1f88e5d8544fb3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Apr 2025 23:51:26 +0000 Subject: [PATCH 2/8] Bump com.google.guava:guava from 33.4.6-jre to 33.4.8-jre Bumps [com.google.guava:guava](https://github.com/google/guava) from 33.4.6-jre to 33.4.8-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) --- updated-dependencies: - dependency-name: com.google.guava:guava dependency-version: 33.4.8-jre dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fcaacb0..76bd47a 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ com.google.guava guava - 33.4.6-jre + 33.4.8-jre From 73a28a21926369a167422927c53a1c014b89c5b0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 May 2025 23:21:38 +0000 Subject: [PATCH 3/8] Bump versions.eclipse.sisu from 0.9.0.M3 to 0.9.0.M4 Bumps `versions.eclipse.sisu` from 0.9.0.M3 to 0.9.0.M4. Updates `org.eclipse.sisu:org.eclipse.sisu.plexus` from 0.9.0.M3 to 0.9.0.M4 - [Release notes](https://github.com/eclipse-sisu/sisu-project/releases) - [Changelog](https://github.com/eclipse-sisu/sisu-project/blob/main/RELEASE.md) - [Commits](https://github.com/eclipse-sisu/sisu-project/compare/milestones/0.9.0.M3...milestones/0.9.0.M4) Updates `org.eclipse.sisu:org.eclipse.sisu.inject` from 0.9.0.M3 to 0.9.0.M4 - [Release notes](https://github.com/eclipse-sisu/sisu-project/releases) - [Changelog](https://github.com/eclipse-sisu/sisu-project/blob/main/RELEASE.md) - [Commits](https://github.com/eclipse-sisu/sisu-project/compare/milestones/0.9.0.M3...milestones/0.9.0.M4) --- updated-dependencies: - dependency-name: org.eclipse.sisu:org.eclipse.sisu.plexus dependency-version: 0.9.0.M4 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.sisu:org.eclipse.sisu.inject dependency-version: 0.9.0.M4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 76bd47a..df7490a 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ 5.12.1 - 0.9.0.M3 + 0.9.0.M4 2025-04-05T17:02:05Z From d7dd6c10e4f5cdcd6e4dff9736f896a3ec52d9b5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Jun 2025 23:15:01 +0000 Subject: [PATCH 4/8] Bump org.codehaus.plexus:plexus from 20 to 22 Bumps [org.codehaus.plexus:plexus](https://github.com/codehaus-plexus/plexus-pom) from 20 to 22. - [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-version: '22' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- README.md | 5 +++-- pom.xml | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 31f9749..14ce8ec 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ Plexus testing: - * [![Maven Central](https://img.shields.io/maven-central/v/org.codehaus.plexus/plexus-testing.svg?label=Maven%20Central)](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.codehaus.plexus%22%20a%3A%22plexus-testing%22) -[![Reproducible Builds](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/jvm-repo-rebuild/reproducible-central/master/content/org/codehaus/plexus/plexus-testing/badge.json)](https://github.com/jvm-repo-rebuild/reproducible-central/blob/master/content/org/codehaus/plexus/plexus-testing/README.md) +* [![Maven Central](https://img.shields.io/maven-central/v/org.codehaus.plexus/plexus-testing.svg?label=Maven%20Central)](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.codehaus.plexus%22%20a%3A%22plexus-testing%22) + [![Reproducible Builds](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/jvm-repo-rebuild/reproducible-central/master/content/org/codehaus/plexus/plexus-testing/badge.json)](https://github.com/jvm-repo-rebuild/reproducible-central/blob/master/content/org/codehaus/plexus/plexus-testing/README.md) + diff --git a/pom.xml b/pom.xml index df7490a..b946481 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.codehaus.plexus plexus - 20 + 22 plexus-testing From 1c84d0d6c87b5eed397ad2588f8157281e53c057 Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Sat, 19 Jul 2025 21:16:28 +0200 Subject: [PATCH 5/8] Downgrade Guice to 5.1.0 to be in sync with Maven 3.9 --- pom.xml | 11 +-- .../plexus/testing/PlexusTestJakartaTest.java | 46 ------------- .../plexus/testing/TestJakartaComponent.java | 67 ------------------- .../plexus/testing/TestJakartaComponent2.java | 25 ------- .../plexus/testing/TestJakartaComponent3.java | 25 ------- 5 files changed, 1 insertion(+), 173 deletions(-) delete mode 100644 src/test/java/org/codehaus/plexus/testing/PlexusTestJakartaTest.java delete mode 100644 src/test/java/org/codehaus/plexus/testing/TestJakartaComponent.java delete mode 100644 src/test/java/org/codehaus/plexus/testing/TestJakartaComponent2.java delete mode 100644 src/test/java/org/codehaus/plexus/testing/TestJakartaComponent3.java diff --git a/pom.xml b/pom.xml index b946481..3ae08b0 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,6 @@ - 5.12.1 0.9.0.M4 2025-04-05T17:02:05Z @@ -61,7 +60,7 @@ com.google.inject guice - 6.0.0 + 5.1.0 @@ -69,14 +68,6 @@ jsr305 3.0.2 - - jakarta.annotation - jakarta.annotation-api - 2.1.1 - provided - true - - org.junit.jupiter junit-jupiter-api diff --git a/src/test/java/org/codehaus/plexus/testing/PlexusTestJakartaTest.java b/src/test/java/org/codehaus/plexus/testing/PlexusTestJakartaTest.java deleted file mode 100644 index 72e39da..0000000 --- a/src/test/java/org/codehaus/plexus/testing/PlexusTestJakartaTest.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.codehaus.plexus.testing; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import jakarta.inject.Inject; -import org.junit.jupiter.api.Test; - -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; - -@PlexusTest -class PlexusTestJakartaTest { - - @Inject - private TestJakartaComponent testJakartaComponent; - - @Test - void dependencyShouldBeInjected() { - assertNotNull(testJakartaComponent); - assertNotNull(testJakartaComponent.getTestJakartaComponent2()); - // assertNotNull(testJakartaComponent.getTestJakartaComponent3Named()); - assertNull(testJakartaComponent.getTestJakartaComponent3NullableJavax()); - assertNull(testJakartaComponent.getTestJakartaComponent3NullableJakarta()); - - assertNotNull(testJakartaComponent.getTestJavaxComponent2()); - assertNotNull(testJakartaComponent.getTestJavaxComponent2()); - assertNotNull(testJakartaComponent.getTestJavaxComponent2()); - } -} diff --git a/src/test/java/org/codehaus/plexus/testing/TestJakartaComponent.java b/src/test/java/org/codehaus/plexus/testing/TestJakartaComponent.java deleted file mode 100644 index c4912a5..0000000 --- a/src/test/java/org/codehaus/plexus/testing/TestJakartaComponent.java +++ /dev/null @@ -1,67 +0,0 @@ -package org.codehaus.plexus.testing; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import jakarta.inject.Inject; -import jakarta.inject.Named; - -@Named -public class TestJakartaComponent { - @Inject - private TestJavaxComponent2 testJavaxComponent2; - - @Inject - private TestJakartaComponent2 testJakartaComponent2; - - // @Inject - // @Nonnull - // @Named("someComponent") - // private TestJakartaComponent3 testJakartaComponent3Named; - - @Inject - @javax.annotation.Nullable - @Named("someComponentNotExisting") - private TestJakartaComponent3 testJakartaComponent3NullableJavax; - - @Inject - @jakarta.annotation.Nullable - @Named("someComponentNotExisting") - private TestJakartaComponent3 testJakartaComponent3NullableJakarta; - - public TestJavaxComponent2 getTestJavaxComponent2() { - return testJavaxComponent2; - } - - public TestJakartaComponent2 getTestJakartaComponent2() { - return testJakartaComponent2; - } - - // public TestJakartaComponent3 getTestJakartaComponent3Named() { - // return testJakartaComponent3Named; - // } - - public TestJakartaComponent3 getTestJakartaComponent3NullableJavax() { - return testJakartaComponent3NullableJavax; - } - - public TestJakartaComponent3 getTestJakartaComponent3NullableJakarta() { - return testJakartaComponent3NullableJakarta; - } -} diff --git a/src/test/java/org/codehaus/plexus/testing/TestJakartaComponent2.java b/src/test/java/org/codehaus/plexus/testing/TestJakartaComponent2.java deleted file mode 100644 index 7db989d..0000000 --- a/src/test/java/org/codehaus/plexus/testing/TestJakartaComponent2.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.codehaus.plexus.testing; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import javax.inject.Named; - -@Named -public class TestJakartaComponent2 {} diff --git a/src/test/java/org/codehaus/plexus/testing/TestJakartaComponent3.java b/src/test/java/org/codehaus/plexus/testing/TestJakartaComponent3.java deleted file mode 100644 index cb0b286..0000000 --- a/src/test/java/org/codehaus/plexus/testing/TestJakartaComponent3.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.codehaus.plexus.testing; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import jakarta.inject.Named; - -@Named("someComponent") -public class TestJakartaComponent3 {} From 5041bdf78a15a83d8b5ba32143476c27a1139673 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 17 Aug 2025 17:08:48 +0000 Subject: [PATCH 6/8] Bump org.codehaus.plexus:plexus from 22 to 23 Bumps [org.codehaus.plexus:plexus](https://github.com/codehaus-plexus/plexus-pom) from 22 to 23. - [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-version: '23' 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 3ae08b0..e31722f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.codehaus.plexus plexus - 22 + 23 plexus-testing From a79893e1015935e88b8db7425eb34a3ec82d3fd6 Mon Sep 17 00:00:00 2001 From: Slawomir Jaranowski Date: Sun, 17 Aug 2025 15:48:51 +0200 Subject: [PATCH 7/8] Set Guice class loading to CHILD - avoid using terminally deprecated methods Default Guice class loading uses a terminally deprecated JDK memory-access classes. --- .../java/org/codehaus/plexus/testing/PlexusExtension.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/org/codehaus/plexus/testing/PlexusExtension.java b/src/main/java/org/codehaus/plexus/testing/PlexusExtension.java index be8ce91..b344041 100644 --- a/src/main/java/org/codehaus/plexus/testing/PlexusExtension.java +++ b/src/main/java/org/codehaus/plexus/testing/PlexusExtension.java @@ -71,6 +71,12 @@ public class PlexusExtension implements BeforeEachCallback, AfterEachCallback { private static String basedir; + static { + if (System.getProperty("guice_custom_class_loading", "").trim().isEmpty()) { + System.setProperty("guice_custom_class_loading", "CHILD"); + } + } + @Override public void beforeEach(ExtensionContext context) throws Exception { basedir = getBasedir(); From 4663dbf549a5ac8b4b653b5abe079f446d3fdb54 Mon Sep 17 00:00:00 2001 From: Slawomir Jaranowski Date: Mon, 18 Aug 2025 22:50:42 +0200 Subject: [PATCH 8/8] [maven-release-plugin] prepare release plexus-testing-1.6.0 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index e31722f..2e345f0 100644 --- a/pom.xml +++ b/pom.xml @@ -9,14 +9,14 @@ plexus-testing - 1.5.1-SNAPSHOT + 1.6.0 Plexus Testing scm:git:https://github.com/codehaus-plexus/plexus-testing.git ${project.scm.connection} - HEAD + plexus-testing-1.6.0 https://github.com/codehaus-plexus/plexus-testing @@ -32,7 +32,7 @@ 0.9.0.M4 - 2025-04-05T17:02:05Z + 2025-08-18T20:50:39Z