Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: codehaus-plexus/plexus-testing
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: plexus-testing-1.2.0
Choose a base ref
...
head repository: codehaus-plexus/plexus-testing
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: plexus-testing-1.3.0
Choose a head ref
  • 8 commits
  • 3 files changed
  • 5 contributors

Commits on Oct 21, 2023

  1. [maven-release-plugin] prepare for next development iteration

    @slachiewicz
    slachiewicz committed Oct 21, 2023
    Copy the full SHA
    f82b151 View commit details

Commits on Nov 30, 2023

  1. 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](actions/setup-java@v3...v4)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
    @dependabot @slachiewicz
    dependabot[bot] authored and slachiewicz committed Nov 30, 2023
    Copy the full SHA
    3e3529b View commit details

Commits on Dec 2, 2023

  1. Reuse plexus-pom action for CI

    @slachiewicz
    slachiewicz committed Dec 2, 2023
    Copy the full SHA
    0076758 View commit details

Commits on Dec 12, 2023

  1. 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] <[email protected]>
    @dependabot @slachiewicz
    dependabot[bot] authored and slachiewicz committed Dec 12, 2023
    Copy the full SHA
    8e5a9af View commit details

Commits on Dec 13, 2023

  1. 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
    @cstamas
    cstamas authored Dec 13, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e8e1d0b View commit details

  2. Add an PlexusExtension#setContext protected method

    @gnodet
    gnodet committed Dec 13, 2023
    Copy the full SHA
    a371498 View commit details

Commits on Dec 14, 2023

  1. Use https instead of ssh

    @gnodet
    gnodet committed Dec 14, 2023
    Copy the full SHA
    1694b5c View commit details

  2. [maven-release-plugin] prepare release plexus-testing-1.3.0

    @gnodet
    gnodet committed Dec 14, 2023
    Copy the full SHA
    dc8018b View commit details
Showing with 26 additions and 39 deletions.
  1. +8 −26 .github/workflows/maven.yml
  2. +12 −12 pom.xml
  3. +6 −1 src/main/java/org/codehaus/plexus/testing/PlexusExtension.java
34 changes: 8 additions & 26 deletions .github/workflows/maven.yml
View file
Original file line number Diff line number Diff line change
@@ -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@v3
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
24 changes: 12 additions & 12 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -5,18 +5,18 @@
<parent>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus</artifactId>
<version>15</version>
<version>16</version>
</parent>

<artifactId>plexus-testing</artifactId>
<version>1.2.0</version>
<version>1.3.0</version>

<name>Plexus Testing</name>

<scm>
<connection>scm:git:git@github.com:codehaus-plexus/plexus-testing.git</connection>
<developerConnection>scm:git:git@github.com:codehaus-plexus/plexus-testing.git</developerConnection>
<tag>plexus-testing-1.2.0</tag>
<connection>scm:git:https://github.com/codehaus-plexus/plexus-testing.git</connection>
<developerConnection>${project.scm.connection}</developerConnection>
<tag>plexus-testing-1.3.0</tag>
<url>https://github.com/codehaus-plexus/plexus-testing</url>
</scm>
<issueManagement>
@@ -31,14 +31,19 @@
</distributionManagement>

<properties>
<project.build.outputTimestamp>2023-10-21T17:25:06Z</project.build.outputTimestamp>
<project.build.outputTimestamp>2023-12-14T13:10:34Z</project.build.outputTimestamp>
</properties>

<dependencies>
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId>
<version>0.3.5</version>
<version>0.9.0.M2</version>
</dependency>
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.inject</artifactId>
<version>0.9.0.M2</version>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
@@ -49,11 +54,6 @@
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

</project>
7 changes: 6 additions & 1 deletion src/main/java/org/codehaus/plexus/testing/PlexusExtension.java
View file
Original file line number Diff line number Diff line change
@@ -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() {
// ----------------------------------------------------------------------------