Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range 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: Philzen/rewrite-TestNG-to-JUnit5
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 158ceca9398934b052f741e7673590a8eeb4500a
Choose a base ref
..
head repository: Philzen/rewrite-TestNG-to-JUnit5
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 10e1ab0a9d8aa27c94187451a29696dae5ab2860
Choose a head ref
Showing with 28 additions and 490 deletions.
  1. +1 −1 .github/workflows/analyse.yml
  2. +1 −1 .github/workflows/ci.yml
  3. +0 −19 .mvn/wrapper/maven-wrapper.properties
  4. +1 −1 .sdkmanrc
  5. +9 −11 build.gradle.kts
  6. +0 −259 mvnw
  7. +0 −149 mvnw.cmd
  8. +15 −48 pom.xml
  9. +1 −1 src/main/java/org/philzen/oss/testng/UpdateTestAnnotationToJunit5.java
2 changes: 1 addition & 1 deletion .github/workflows/analyse.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: SonarCloud
name: Maven build & SonarCloud analysis
on:
push:
branches: [main]
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: Build
name: Gradle build

on:
push:
19 changes: 0 additions & 19 deletions .mvn/wrapper/maven-wrapper.properties

This file was deleted.

2 changes: 1 addition & 1 deletion .sdkmanrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
gradle=8.8
java=21.0.3-tem
maven=3.9.7
maven=3.9.8
20 changes: 9 additions & 11 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -31,8 +31,6 @@ dependencies {

implementation("org.openrewrite:rewrite-java")
implementation("org.openrewrite.recipe:rewrite-java-dependencies")
implementation("org.openrewrite:rewrite-yaml")
implementation("org.assertj:assertj-core:3.24.2")
runtimeOnly("org.openrewrite:rewrite-java-8")
runtimeOnly("org.openrewrite:rewrite-java-17")

@@ -48,19 +46,19 @@ dependencies {
// Need to have a slf4j binding to see any output enabled from the parser.
runtimeOnly("ch.qos.logback:logback-classic:1.2.+")

// Our recipe converts Guava's `Lists` type
testRuntimeOnly("com.google.guava:guava:latest.release")
testRuntimeOnly("org.apache.commons:commons-lang3:latest.release")
testRuntimeOnly("org.springframework:spring-core:latest.release")

// Contains the OpenRewriteBestPractices recipe, which you can apply to your recipes
rewrite("org.openrewrite.recipe:rewrite-recommendations:latest.release")

// ↓ Classpath resource for MigrateTestNg* recipes
testRuntimeOnly("org.testng:testng:7.5.1") // 7.5.x is the last Java 8 compatible version: https://github.com/testng-team/testng/issues/2775

// ↓ to allow using testing recipes in our recipe list
// ↓ Dependencies specific to this project
testRuntimeOnly("org.testng:testng:7.5.1") {
because("7.5.x is the last Java 8 compatible version: https://github.com/testng-team/testng/issues/2775")
}
testRuntimeOnly("org.junit.jupiter:junit-jupiter-api:latest.release")
testImplementation("org.apiguardian:apiguardian-api:latest.release") {
because("Non-essential annotations on JUnit 5 implementations, provided here to avoid 'unknown enum constant Status.STABLE' warning on gradle CI build")
}
testRuntimeOnly("org.openrewrite.recipe:rewrite-testing-frameworks:latest.release") {
because("Provides essential recipes for usage in this project's recipe list")
exclude("org.testcontainers", "testcontainers")
}
}
259 changes: 0 additions & 259 deletions mvnw

This file was deleted.

Loading