diff --git a/.editorconfig b/.editorconfig index 7241129..590e58c 100644 --- a/.editorconfig +++ b/.editorconfig @@ -9,5 +9,5 @@ charset = utf-8 indent_style = space indent_size = 4 -[.github/workflows/*.yml] +[*.yml] indent_size = 2 diff --git a/.github/dependabot.yml b/.github/dependabot.yml index a217b34..e3f81b9 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,7 +1,7 @@ version: 2 updates: -- package-ecosystem: maven - directory: "/" - schedule: - interval: daily - open-pull-requests-limit: 10 + - package-ecosystem: maven + directory: "/" + schedule: + interval: daily + open-pull-requests-limit: 10 diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index a6982b4..5f48dfd 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -13,10 +13,9 @@ jobs: with: distribution: temurin java-version: '17' - cache: maven + cache: gradle - name: 🏗️ Build & test run: | - mvn -version - export MAVEN_HOME="$(whereis mvn)" - mvn clean verify -Dorg.slf4j.simpleLogger.showDateTime=true "-Dorg.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss" + ./gradlew --version --no-daemon + ./gradlew clean publishToMavenLocal -i --no-daemon --warning-mode all diff --git a/.gitignore b/.gitignore index 3a261a6..42c179a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +# Maven target/ pom.xml.tag pom.xml.releaseBackup @@ -10,6 +11,10 @@ buildNumber.properties # https://github.com/takari/maven-wrapper#usage-without-binary-jar .mvn/wrapper/maven-wrapper.jar +# Gradle +.gradle/ +build/ + # IntelliJ .idea/ *.iml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 24530ef..0000000 --- a/.travis.yml +++ /dev/null @@ -1,21 +0,0 @@ -language: java - -cache: - directories: - - "$HOME/.m2" - -before_install: - - "export M2_HOME=/usr/local/maven" - -script: "mvn verify" - -after_success: - - bash <(curl -s https://codecov.io/bash) - - openssl aes-256-cbc -pass pass:$ENCRYPTION_PASSWORD -in $GPG_DIR/pubring.gpg.enc - -out $GPG_DIR/pubring.gpg -d -a - - openssl aes-256-cbc -pass pass:$ENCRYPTION_PASSWORD -in $GPG_DIR/secring.gpg.enc - -out $GPG_DIR/secring.gpg -d -a - - "$GPG_DIR/publish.sh" -env: - global: - - GPG_DIR="`pwd`/deploy" diff --git a/README.md b/README.md index 8b58129..10c3ba3 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # Classpath modification extension for JUnit5 + [![Build Status](https://travis-ci.com/fridujo/classpath-junit-extension.svg?branch=master)](https://travis-ci.com/fridujo/classpath-junit-extension) [![Coverage Status](https://codecov.io/gh/fridujo/classpath-junit-extension/branch/master/graph/badge.svg)](https://codecov.io/gh/fridujo/classpath-junit-extension/) [![Maven Central](https://img.shields.io/maven-central/v/com.github.fridujo/classpath-junit-extension.svg)](https://search.maven.org/#search|ga|1|a:"classpath-junit-extension") @@ -48,21 +49,28 @@ void amqp_basic_get() { ``` ## Alternatives -Use the `maven-invoker-plugin` with **pom.xml** template (see an example [here](https://github.com/fridujo/rabbitmq-mock/blob/78cd20380ea46089193dfbf5e29efd55798343ee/pom.xml#L163)). + +Use the `maven-invoker-plugin` with **pom.xml** template (see an +example [here](https://github.com/fridujo/rabbitmq-mock/blob/78cd20380ea46089193dfbf5e29efd55798343ee/pom.xml#L163)). ## Roadmap -Currently this extension uses a _workaround_ to get things done, but it is waiting for [JUnit5 #201](https://github.com/junit-team/junit5/issues/201) to get a cleaner approach at this. + +Currently this extension uses a _workaround_ to get things done, but it is waiting +for [JUnit5 #201](https://github.com/junit-team/junit5/issues/201) to get a cleaner approach at this. Next things to do: + * Replace dependencies by other ones (different versions or implementations) * Support other **Build Tools** (Gradle, SBT, Ivy, etc.) * Make the annotation - * available at class level - * work in `@Nested` tests - * work in conjunction with **injection** / **test-templates** (may require **the classloader extension**) - * repeatable, so that the same test can be expected to work against various classpath (different version of a library per se) + * available at class level + * work in `@Nested` tests + * work in conjunction with **injection** / **test-templates** (may require **the classloader extension**) + * repeatable, so that the same test can be expected to work against various classpath (different version of a + library per se) ## Contribute + Any contribution is greatly appreciated. [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#github.com/fridujo/classpath-junit-extension.git) @@ -70,7 +78,9 @@ Any contribution is greatly appreciated. ## Getting Started ### Maven + Add the following dependency to your **pom.xml** + ```xml com.github.fridujo @@ -81,7 +91,9 @@ Add the following dependency to your **pom.xml** ``` ### Gradle + Add the following dependency to your **build.gradle** + ```groovy repositories { mavenCentral() @@ -98,7 +110,9 @@ dependencies { ### Building from Source -You need [JDK-8+](http://jdk.java.net/8/) (at least) to build this extension. The project can be built with Maven using the following command. +You need [JDK-8+](http://jdk.java.net/8/) (at least) to build this extension. The project can be built with Maven using +the following command. + ``` mvn clean package ``` @@ -106,6 +120,7 @@ mvn clean package ### Installing in the Local Maven Repository The project can be installed in a local Maven Repository for usage in other projects via the following command. + ``` mvn clean install ``` @@ -115,6 +130,7 @@ mvn clean install The master of the project pushes SNAPSHOTs in Sonatype's repo. To use the latest master build add Sonatype OSS snapshot repository, for Maven: + ``` ... @@ -126,6 +142,7 @@ To use the latest master build add Sonatype OSS snapshot repository, for Maven: ``` For Gradle: + ```groovy repositories { // ... diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..434a780 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,34 @@ +group = "com.github.fridujo" +version = "1.0.1-SNAPSHOT" +description = "classpath-junit-extension" + +allprojects { + repositories { + mavenLocal() + mavenCentral() + } + + apply { + plugin("base") + } + + tasks.withType { + options.encoding = "UTF-8" + } + + tasks.withType { + options.encoding = "UTF-8" + (options as CoreJavadocOptions).addStringOption("Xdoclint:all,-missing", "-quiet") + } + + tasks.withType { + useJUnitPlatform() + } +} + +subprojects { + apply { + plugin("java") + plugin("java-library") + } +} diff --git a/classpath-junit-extension/build.gradle.kts b/classpath-junit-extension/build.gradle.kts new file mode 100644 index 0000000..8fe56cf --- /dev/null +++ b/classpath-junit-extension/build.gradle.kts @@ -0,0 +1,35 @@ +plugins { + `maven-publish` +} + +group = "com.github.fridujo" +version = "1.0.1-SNAPSHOT" + +java { + withSourcesJar() + withJavadocJar() +} + +publishing { + publications.create("maven") { + from(components["java"]) + } +} + +dependencies { + compileOnly(libs.org.apache.maven.resolver.maven.resolver.api) + compileOnly(libs.org.apache.maven.resolver.maven.resolver.spi) + compileOnly(libs.org.apache.maven.resolver.maven.resolver.impl) + compileOnly(libs.org.junit.jupiter.junit.jupiter.api) + + api(libs.ch.qos.logback.logback.classic) + api(libs.eu.maveniverse.maven.mima.context) + api(libs.com.fasterxml.jackson.dataformat.jackson.dataformat.xml) + + runtimeOnly(libs.eu.maveniverse.maven.mima.runtime.standalone.static) + + testImplementation(libs.org.junit.jupiter.junit.jupiter) + testImplementation(libs.org.assertj.assertj.core) + testImplementation(libs.org.mockito.mockito.core) + testImplementation(libs.com.google.guava.guava) +} diff --git a/src/main/java/com/github/fridujo/classpath/junit/extension/Classpath.java b/classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/Classpath.java similarity index 100% rename from src/main/java/com/github/fridujo/classpath/junit/extension/Classpath.java rename to classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/Classpath.java diff --git a/src/main/java/com/github/fridujo/classpath/junit/extension/Configuration.java b/classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/Configuration.java similarity index 100% rename from src/main/java/com/github/fridujo/classpath/junit/extension/Configuration.java rename to classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/Configuration.java diff --git a/src/main/java/com/github/fridujo/classpath/junit/extension/Gav.java b/classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/Gav.java similarity index 100% rename from src/main/java/com/github/fridujo/classpath/junit/extension/Gav.java rename to classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/Gav.java diff --git a/src/main/java/com/github/fridujo/classpath/junit/extension/GavReplacement.java b/classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/GavReplacement.java similarity index 100% rename from src/main/java/com/github/fridujo/classpath/junit/extension/GavReplacement.java rename to classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/GavReplacement.java diff --git a/src/main/java/com/github/fridujo/classpath/junit/extension/NoMatchingClasspathElementFoundException.java b/classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/NoMatchingClasspathElementFoundException.java similarity index 100% rename from src/main/java/com/github/fridujo/classpath/junit/extension/NoMatchingClasspathElementFoundException.java rename to classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/NoMatchingClasspathElementFoundException.java diff --git a/src/main/java/com/github/fridujo/classpath/junit/extension/PathElement.java b/classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/PathElement.java similarity index 96% rename from src/main/java/com/github/fridujo/classpath/junit/extension/PathElement.java rename to classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/PathElement.java index 409f1c2..b4f58d3 100644 --- a/src/main/java/com/github/fridujo/classpath/junit/extension/PathElement.java +++ b/classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/PathElement.java @@ -19,6 +19,8 @@ private PathElement(String rawPath) { public static PathElement create(String rawPath) { String normalizedRawPath = rawPath; + normalizedRawPath = normalizedRawPath.replace("\\\\", "\\"); + boolean directory = Files.isDirectory(Paths.get(rawPath)); boolean alreadyHasTerminalSlash = rawPath.trim().endsWith(File.separator); if (directory && !alreadyHasTerminalSlash) { diff --git a/src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/Artifact.java b/classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/Artifact.java similarity index 100% rename from src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/Artifact.java rename to classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/Artifact.java diff --git a/src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/BuildTool.java b/classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/BuildTool.java similarity index 100% rename from src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/BuildTool.java rename to classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/BuildTool.java diff --git a/src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/BuildToolFactory.java b/classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/BuildToolFactory.java similarity index 100% rename from src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/BuildToolFactory.java rename to classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/BuildToolFactory.java diff --git a/src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/BuildToolResolver.java b/classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/BuildToolResolver.java similarity index 100% rename from src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/BuildToolResolver.java rename to classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/BuildToolResolver.java diff --git a/src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/NoBuildToolFoundException.java b/classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/NoBuildToolFoundException.java similarity index 100% rename from src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/NoBuildToolFoundException.java rename to classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/NoBuildToolFoundException.java diff --git a/src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/RuntimeDependencyResolutionException.java b/classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/RuntimeDependencyResolutionException.java similarity index 100% rename from src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/RuntimeDependencyResolutionException.java rename to classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/RuntimeDependencyResolutionException.java diff --git a/src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/maven/DependencyDescriptor.java b/classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/maven/DependencyDescriptor.java similarity index 100% rename from src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/maven/DependencyDescriptor.java rename to classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/maven/DependencyDescriptor.java diff --git a/src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/maven/Maven.java b/classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/maven/Maven.java similarity index 100% rename from src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/maven/Maven.java rename to classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/maven/Maven.java diff --git a/src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/maven/MavenResolver.java b/classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/maven/MavenResolver.java similarity index 100% rename from src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/maven/MavenResolver.java rename to classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/maven/MavenResolver.java diff --git a/src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/maven/SimplePom.java b/classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/maven/SimplePom.java similarity index 100% rename from src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/maven/SimplePom.java rename to classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/maven/SimplePom.java diff --git a/src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/package-info.java b/classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/package-info.java similarity index 100% rename from src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/package-info.java rename to classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/buildtool/package-info.java diff --git a/src/main/java/com/github/fridujo/classpath/junit/extension/jupiter/AbstractClasspathExtension.java b/classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/jupiter/AbstractClasspathExtension.java similarity index 100% rename from src/main/java/com/github/fridujo/classpath/junit/extension/jupiter/AbstractClasspathExtension.java rename to classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/jupiter/AbstractClasspathExtension.java diff --git a/src/main/java/com/github/fridujo/classpath/junit/extension/jupiter/BuildToolLocator.java b/classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/jupiter/BuildToolLocator.java similarity index 100% rename from src/main/java/com/github/fridujo/classpath/junit/extension/jupiter/BuildToolLocator.java rename to classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/jupiter/BuildToolLocator.java diff --git a/src/main/java/com/github/fridujo/classpath/junit/extension/jupiter/CompatibilityTestWithClasspath.java b/classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/jupiter/CompatibilityTestWithClasspath.java similarity index 100% rename from src/main/java/com/github/fridujo/classpath/junit/extension/jupiter/CompatibilityTestWithClasspath.java rename to classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/jupiter/CompatibilityTestWithClasspath.java diff --git a/src/main/java/com/github/fridujo/classpath/junit/extension/jupiter/CompatibleWithDependenciesExecutor.java b/classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/jupiter/CompatibleWithDependenciesExecutor.java similarity index 100% rename from src/main/java/com/github/fridujo/classpath/junit/extension/jupiter/CompatibleWithDependenciesExecutor.java rename to classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/jupiter/CompatibleWithDependenciesExecutor.java diff --git a/src/main/java/com/github/fridujo/classpath/junit/extension/jupiter/CompatibleWithDependenciesExtension.java b/classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/jupiter/CompatibleWithDependenciesExtension.java similarity index 100% rename from src/main/java/com/github/fridujo/classpath/junit/extension/jupiter/CompatibleWithDependenciesExtension.java rename to classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/jupiter/CompatibleWithDependenciesExtension.java diff --git a/src/main/java/com/github/fridujo/classpath/junit/extension/jupiter/CompatibleWithDependenciesInvocationContext.java b/classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/jupiter/CompatibleWithDependenciesInvocationContext.java similarity index 100% rename from src/main/java/com/github/fridujo/classpath/junit/extension/jupiter/CompatibleWithDependenciesInvocationContext.java rename to classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/jupiter/CompatibleWithDependenciesInvocationContext.java diff --git a/src/main/java/com/github/fridujo/classpath/junit/extension/jupiter/CurrentClasspathInvocationContext.java b/classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/jupiter/CurrentClasspathInvocationContext.java similarity index 100% rename from src/main/java/com/github/fridujo/classpath/junit/extension/jupiter/CurrentClasspathInvocationContext.java rename to classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/jupiter/CurrentClasspathInvocationContext.java diff --git a/src/main/java/com/github/fridujo/classpath/junit/extension/jupiter/DependencyWithVersionRange.java b/classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/jupiter/DependencyWithVersionRange.java similarity index 100% rename from src/main/java/com/github/fridujo/classpath/junit/extension/jupiter/DependencyWithVersionRange.java rename to classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/jupiter/DependencyWithVersionRange.java diff --git a/src/main/java/com/github/fridujo/classpath/junit/extension/jupiter/ModifiedClasspath.java b/classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/jupiter/ModifiedClasspath.java similarity index 99% rename from src/main/java/com/github/fridujo/classpath/junit/extension/jupiter/ModifiedClasspath.java rename to classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/jupiter/ModifiedClasspath.java index 78cb5fd..8e3143d 100644 --- a/src/main/java/com/github/fridujo/classpath/junit/extension/jupiter/ModifiedClasspath.java +++ b/classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/jupiter/ModifiedClasspath.java @@ -27,7 +27,6 @@ *
  • groupId:artifactId:version
    • * *

    - *

    * In opposition to {@link #excludeDependencies()}, their will be no attempt to list and exclude dependencies. */ String[] excludeJars() default {}; diff --git a/src/main/java/com/github/fridujo/classpath/junit/extension/jupiter/ModifiedClasspathExtension.java b/classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/jupiter/ModifiedClasspathExtension.java similarity index 100% rename from src/main/java/com/github/fridujo/classpath/junit/extension/jupiter/ModifiedClasspathExtension.java rename to classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/jupiter/ModifiedClasspathExtension.java diff --git a/src/main/java/com/github/fridujo/classpath/junit/extension/utils/PathUtils.java b/classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/utils/PathUtils.java similarity index 100% rename from src/main/java/com/github/fridujo/classpath/junit/extension/utils/PathUtils.java rename to classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/utils/PathUtils.java diff --git a/src/main/java/com/github/fridujo/classpath/junit/extension/utils/Processes.java b/classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/utils/Processes.java similarity index 100% rename from src/main/java/com/github/fridujo/classpath/junit/extension/utils/Processes.java rename to classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/utils/Processes.java diff --git a/src/main/java/com/github/fridujo/classpath/junit/extension/utils/Streams.java b/classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/utils/Streams.java similarity index 100% rename from src/main/java/com/github/fridujo/classpath/junit/extension/utils/Streams.java rename to classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/utils/Streams.java diff --git a/src/main/java/com/github/fridujo/classpath/junit/extension/utils/SystemVariables.java b/classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/utils/SystemVariables.java similarity index 100% rename from src/main/java/com/github/fridujo/classpath/junit/extension/utils/SystemVariables.java rename to classpath-junit-extension/src/main/java/com/github/fridujo/classpath/junit/extension/utils/SystemVariables.java diff --git a/src/main/resources/META-INF/services/com.github.fridujo.classpath.junit.extension.buildtool.BuildToolResolver b/classpath-junit-extension/src/main/resources/META-INF/services/com.github.fridujo.classpath.junit.extension.buildtool.BuildToolResolver similarity index 100% rename from src/main/resources/META-INF/services/com.github.fridujo.classpath.junit.extension.buildtool.BuildToolResolver rename to classpath-junit-extension/src/main/resources/META-INF/services/com.github.fridujo.classpath.junit.extension.buildtool.BuildToolResolver diff --git a/src/main/resources/logback.xml b/classpath-junit-extension/src/main/resources/logback.xml similarity index 100% rename from src/main/resources/logback.xml rename to classpath-junit-extension/src/main/resources/logback.xml diff --git a/src/test/java/com/github/fridujo/classpath/junit/extension/ClasspathAdditionTests.java b/classpath-junit-extension/src/test/java/com/github/fridujo/classpath/junit/extension/ClasspathAdditionTests.java similarity index 100% rename from src/test/java/com/github/fridujo/classpath/junit/extension/ClasspathAdditionTests.java rename to classpath-junit-extension/src/test/java/com/github/fridujo/classpath/junit/extension/ClasspathAdditionTests.java diff --git a/src/test/java/com/github/fridujo/classpath/junit/extension/ClasspathExclusionTests.java b/classpath-junit-extension/src/test/java/com/github/fridujo/classpath/junit/extension/ClasspathExclusionTests.java similarity index 97% rename from src/test/java/com/github/fridujo/classpath/junit/extension/ClasspathExclusionTests.java rename to classpath-junit-extension/src/test/java/com/github/fridujo/classpath/junit/extension/ClasspathExclusionTests.java index 4ca1a88..ec71521 100644 --- a/src/test/java/com/github/fridujo/classpath/junit/extension/ClasspathExclusionTests.java +++ b/classpath-junit-extension/src/test/java/com/github/fridujo/classpath/junit/extension/ClasspathExclusionTests.java @@ -24,7 +24,7 @@ void exclusion_of_multiple_gavs_and_their_dependencies() { } @Test - @ModifiedClasspath(excludeDependencies = "guava:guava") + @ModifiedClasspath(excludeDependencies = "com.google.guava:guava") void exclusion_of_one_gav_and_its_dependencies() { assertThatExceptionOfType(ClassNotFoundException.class) .isThrownBy(() -> Class.forName("com.google.common.collect.Maps")); diff --git a/src/test/java/com/github/fridujo/classpath/junit/extension/ClasspathMatrixTests.java b/classpath-junit-extension/src/test/java/com/github/fridujo/classpath/junit/extension/ClasspathMatrixTests.java similarity index 100% rename from src/test/java/com/github/fridujo/classpath/junit/extension/ClasspathMatrixTests.java rename to classpath-junit-extension/src/test/java/com/github/fridujo/classpath/junit/extension/ClasspathMatrixTests.java diff --git a/src/test/java/com/github/fridujo/classpath/junit/extension/GavTest.java b/classpath-junit-extension/src/test/java/com/github/fridujo/classpath/junit/extension/GavTest.java similarity index 100% rename from src/test/java/com/github/fridujo/classpath/junit/extension/GavTest.java rename to classpath-junit-extension/src/test/java/com/github/fridujo/classpath/junit/extension/GavTest.java diff --git a/src/test/java/com/github/fridujo/classpath/junit/extension/PathElementTest.java b/classpath-junit-extension/src/test/java/com/github/fridujo/classpath/junit/extension/PathElementTest.java similarity index 100% rename from src/test/java/com/github/fridujo/classpath/junit/extension/PathElementTest.java rename to classpath-junit-extension/src/test/java/com/github/fridujo/classpath/junit/extension/PathElementTest.java diff --git a/src/test/java/com/github/fridujo/classpath/junit/extension/buildtool/ArtifactTest.java b/classpath-junit-extension/src/test/java/com/github/fridujo/classpath/junit/extension/buildtool/ArtifactTest.java similarity index 100% rename from src/test/java/com/github/fridujo/classpath/junit/extension/buildtool/ArtifactTest.java rename to classpath-junit-extension/src/test/java/com/github/fridujo/classpath/junit/extension/buildtool/ArtifactTest.java diff --git a/src/test/java/com/github/fridujo/classpath/junit/extension/buildtool/maven/MavenTest.java b/classpath-junit-extension/src/test/java/com/github/fridujo/classpath/junit/extension/buildtool/maven/MavenTest.java similarity index 100% rename from src/test/java/com/github/fridujo/classpath/junit/extension/buildtool/maven/MavenTest.java rename to classpath-junit-extension/src/test/java/com/github/fridujo/classpath/junit/extension/buildtool/maven/MavenTest.java diff --git a/src/test/java/com/github/fridujo/classpath/junit/extension/utils/Reflections.java b/classpath-junit-extension/src/test/java/com/github/fridujo/classpath/junit/extension/utils/Reflections.java similarity index 100% rename from src/test/java/com/github/fridujo/classpath/junit/extension/utils/Reflections.java rename to classpath-junit-extension/src/test/java/com/github/fridujo/classpath/junit/extension/utils/Reflections.java diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..a55547c --- /dev/null +++ b/gradle.properties @@ -0,0 +1 @@ +sourceCompatibility=17 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..9c18328 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,30 @@ +# This file was generated by the Gradle 'init' task. +# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format + +[versions] +ch-qos-logback-logback-classic = "1.5.3" +com-fasterxml-jackson-dataformat-jackson-dataformat-xml = "2.17.0" +com-google-guava-guava = "32.1.2-jre" +eu-maveniverse-maven-mima-context = "2.4.10" +eu-maveniverse-maven-mima-runtime-standalone-static = "2.4.10" +org-apache-maven-resolver-maven-resolver-api = "1.9.18" +org-apache-maven-resolver-maven-resolver-impl = "1.9.18" +org-apache-maven-resolver-maven-resolver-spi = "1.9.18" +org-assertj-assertj-core = "3.25.3" +org-junit-jupiter-junit-jupiter = "5.10.2" +org-junit-jupiter-junit-jupiter-api = "5.10.2" +org-mockito-mockito-core = "5.11.0" + +[libraries] +ch-qos-logback-logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "ch-qos-logback-logback-classic" } +com-fasterxml-jackson-dataformat-jackson-dataformat-xml = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-xml", version.ref = "com-fasterxml-jackson-dataformat-jackson-dataformat-xml" } +com-google-guava-guava = { module = "com.google.guava:guava", version.ref = "com-google-guava-guava" } +eu-maveniverse-maven-mima-context = { module = "eu.maveniverse.maven.mima:context", version.ref = "eu-maveniverse-maven-mima-context" } +eu-maveniverse-maven-mima-runtime-standalone-static = { module = "eu.maveniverse.maven.mima.runtime:standalone-static", version.ref = "eu-maveniverse-maven-mima-runtime-standalone-static" } +org-apache-maven-resolver-maven-resolver-api = { module = "org.apache.maven.resolver:maven-resolver-api", version.ref = "org-apache-maven-resolver-maven-resolver-api" } +org-apache-maven-resolver-maven-resolver-impl = { module = "org.apache.maven.resolver:maven-resolver-impl", version.ref = "org-apache-maven-resolver-maven-resolver-impl" } +org-apache-maven-resolver-maven-resolver-spi = { module = "org.apache.maven.resolver:maven-resolver-spi", version.ref = "org-apache-maven-resolver-maven-resolver-spi" } +org-assertj-assertj-core = { module = "org.assertj:assertj-core", version.ref = "org-assertj-assertj-core" } +org-junit-jupiter-junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "org-junit-jupiter-junit-jupiter" } +org-junit-jupiter-junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "org-junit-jupiter-junit-jupiter-api" } +org-mockito-mockito-core = { module = "org.mockito:mockito-core", version.ref = "org-mockito-mockito-core" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e644113 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..b82aa23 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..1aa94a4 --- /dev/null +++ b/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed 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 +# +# https://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. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..47a0255 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,3 @@ +rootProject.name = "classpath-junit-extension" + +include("classpath-junit-extension")