From e0ffe8288f485b5a961122a3e8c920b9e7bc0938 Mon Sep 17 00:00:00 2001 From: Martin Monperrus Date: Wed, 7 Aug 2024 07:18:33 +0200 Subject: [PATCH 1/4] up --- .github/workflows/mvn-build-dspot-action.yml | 4 ++-- .../workflows/mvn-build-dspot-diff-test-selection-action.yml | 4 ++-- .github/workflows/mvn-build-dspot-mvn-action.yml | 4 ++-- .github/workflows/mvn-build-dspot-prettifier.yml | 4 ++-- .github/workflows/mvn-checkstyle-action.yml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/mvn-build-dspot-action.yml b/.github/workflows/mvn-build-dspot-action.yml index cd9519553..6078b6d92 100644 --- a/.github/workflows/mvn-build-dspot-action.yml +++ b/.github/workflows/mvn-build-dspot-action.yml @@ -8,10 +8,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 8 + - name: Set up JDK uses: actions/setup-java@v2 with: - java-version: '8' + java-version: '17' distribution: 'adopt' - name: Build with Maven run: mvn install -DskipTests diff --git a/.github/workflows/mvn-build-dspot-diff-test-selection-action.yml b/.github/workflows/mvn-build-dspot-diff-test-selection-action.yml index a8fefc745..a5936abd4 100644 --- a/.github/workflows/mvn-build-dspot-diff-test-selection-action.yml +++ b/.github/workflows/mvn-build-dspot-diff-test-selection-action.yml @@ -8,10 +8,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 8 + - name: Set up JDK uses: actions/setup-java@v2 with: - java-version: '8' + java-version: '17' distribution: 'adopt' - name: Build with Maven run: mvn install -DskipTests diff --git a/.github/workflows/mvn-build-dspot-mvn-action.yml b/.github/workflows/mvn-build-dspot-mvn-action.yml index b9be988bc..79a04c78f 100644 --- a/.github/workflows/mvn-build-dspot-mvn-action.yml +++ b/.github/workflows/mvn-build-dspot-mvn-action.yml @@ -8,10 +8,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 8 + - name: Set up JDK uses: actions/setup-java@v2 with: - java-version: '8' + java-version: '17' distribution: 'adopt' - name: Build with Maven run: mvn install -DskipTests diff --git a/.github/workflows/mvn-build-dspot-prettifier.yml b/.github/workflows/mvn-build-dspot-prettifier.yml index 87a8e7f49..3875765e0 100644 --- a/.github/workflows/mvn-build-dspot-prettifier.yml +++ b/.github/workflows/mvn-build-dspot-prettifier.yml @@ -8,10 +8,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 8 + - name: Set up JDK uses: actions/setup-java@v2 with: - java-version: '8' + java-version: '17' distribution: 'adopt' - uses: actions/checkout@v2 - name: Set up Python diff --git a/.github/workflows/mvn-checkstyle-action.yml b/.github/workflows/mvn-checkstyle-action.yml index 94014600e..6348f31fb 100644 --- a/.github/workflows/mvn-checkstyle-action.yml +++ b/.github/workflows/mvn-checkstyle-action.yml @@ -8,10 +8,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 8 + - name: Set up JDK uses: actions/setup-java@v2 with: - java-version: '8' + java-version: '17' distribution: 'adopt' - name: Build with Maven run: mvn install -DskipTests From 25e23d111d4c9b738c1fecd0f402ea1a6445c0e0 Mon Sep 17 00:00:00 2001 From: Martin Monperrus Date: Wed, 7 Aug 2024 07:21:57 +0200 Subject: [PATCH 2/4] up --- dspot-maven/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dspot-maven/pom.xml b/dspot-maven/pom.xml index 5d41a8079..ac1313841 100644 --- a/dspot-maven/pom.xml +++ b/dspot-maven/pom.xml @@ -60,7 +60,7 @@ fr.inria.gforge.spoon spoon-maven-plugin - 3.2 + 3.8.0 generate-sources From 19ebfd123f94b334042afa16f7845bb41ca71080 Mon Sep 17 00:00:00 2001 From: Martin Monperrus Date: Wed, 7 Aug 2024 07:29:07 +0200 Subject: [PATCH 3/4] up --- dspot-maven/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dspot-maven/pom.xml b/dspot-maven/pom.xml index ac1313841..54689b287 100644 --- a/dspot-maven/pom.xml +++ b/dspot-maven/pom.xml @@ -62,12 +62,12 @@ spoon-maven-plugin 3.8.0 - + From c4cd22e341d8085e6c5ca78ff63b4e6dbac4fc9b Mon Sep 17 00:00:00 2001 From: Martin Monperrus Date: Wed, 7 Aug 2024 07:33:13 +0200 Subject: [PATCH 4/4] up --- .../main/java/eu/stamp_project/DSpotMojo.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dspot-maven/src/main/java/eu/stamp_project/DSpotMojo.java b/dspot-maven/src/main/java/eu/stamp_project/DSpotMojo.java index ede6bb910..af254fb73 100644 --- a/dspot-maven/src/main/java/eu/stamp_project/DSpotMojo.java +++ b/dspot-maven/src/main/java/eu/stamp_project/DSpotMojo.java @@ -16,20 +16,20 @@ public class DSpotMojo extends AbstractMojo { @Override public void execute() { - if (!targetModule.isEmpty()) { - if (this.mavenProject.getBasedir().getAbsolutePath().endsWith(targetModule)) { - this.absolutePathToProjectRoot = - this.mavenProject.getBasedir().getAbsolutePath().substring(0, - this.mavenProject.getBasedir().getAbsolutePath().length() - this.targetModule.length() - ); - } else { - return; - } - } else { - this.absolutePathToProjectRoot = this.mavenProject.getBasedir().getAbsolutePath(); - } - final String[] args = DSpotMojo.removeBlank(new String[]{}); - Main.main(args); + // if (!targetModule.isEmpty()) { + // if (this.mavenProject.getBasedir().getAbsolutePath().endsWith(targetModule)) { + // this.absolutePathToProjectRoot = + // this.mavenProject.getBasedir().getAbsolutePath().substring(0, + // this.mavenProject.getBasedir().getAbsolutePath().length() - this.targetModule.length() + // ); + // } else { + // return; + // } + // } else { + // this.absolutePathToProjectRoot = this.mavenProject.getBasedir().getAbsolutePath(); + // } + // final String[] args = DSpotMojo.removeBlank(new String[]{}); + // Main.main(args); } private String absolutePathToProjectRoot;