From 01a68843379705ee9fe7999aac3e536dec470185 Mon Sep 17 00:00:00 2001 From: BJ Hargrave Date: Fri, 2 Oct 2020 13:16:02 -0400 Subject: [PATCH 1/5] ci: Update workflow to use released JDK 15 We now remove JDK 14 as it is EOL. Signed-off-by: BJ Hargrave --- .github/workflows/cibuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cibuild.yml b/.github/workflows/cibuild.yml index 36d7d37c..2647d57b 100644 --- a/.github/workflows/cibuild.yml +++ b/.github/workflows/cibuild.yml @@ -21,7 +21,7 @@ jobs: JDKxx_Matrix: strategy: matrix: - java: [ 11, 14, 15-ea ] + java: [ 11, 15 ] os: [ ubuntu-latest ] include: - os: ubuntu-latest From 767f34741215ea8f20b9b1bb013edb501467282a Mon Sep 17 00:00:00 2001 From: BJ Hargrave Date: Fri, 2 Oct 2020 13:24:17 -0400 Subject: [PATCH 2/5] build: pom formatting Signed-off-by: BJ Hargrave --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 7088283e..08a952e4 100644 --- a/pom.xml +++ b/pom.xml @@ -399,12 +399,12 @@ 4.0.1 test - + javax.security.auth.message javax.security.auth.message-api 1.1.1 - test - + test + jakarta.annotation jakarta.annotation-api From cd3a028fa9e491c95a050c830baee05bcb76a18c Mon Sep 17 00:00:00 2001 From: BJ Hargrave Date: Fri, 2 Oct 2020 13:25:18 -0400 Subject: [PATCH 3/5] build: Use --release for javac on JDK 9+ Signed-off-by: BJ Hargrave --- pom.xml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 08a952e4..79fa3586 100644 --- a/pom.xml +++ b/pom.xml @@ -25,6 +25,7 @@ 0.2.0-SNAPSHOT UTF-8 8 + 8 ${java.version} ${java.version} 5.1.2 @@ -118,11 +119,11 @@ maven-compiler-plugin 3.8.1 - ${maven.compiler.source} - ${maven.compiler.target} true true - -Xlint:unchecked + + -Xlint:unchecked + @@ -511,6 +512,15 @@ + + java-release + + [9,) + + + ${java.release} + + ossrh From 9917ac06483906b4e1b45857c19075f225269ece Mon Sep 17 00:00:00 2001 From: BJ Hargrave Date: Fri, 2 Oct 2020 13:27:45 -0400 Subject: [PATCH 4/5] build: Turn off pedantic javadoc linting Signed-off-by: BJ Hargrave --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 79fa3586..561232a8 100644 --- a/pom.xml +++ b/pom.xml @@ -180,6 +180,7 @@ false + none From 7eb1d36c82d3fdd27d82734234d45e16c8088416 Mon Sep 17 00:00:00 2001 From: BJ Hargrave Date: Fri, 2 Oct 2020 13:49:37 -0400 Subject: [PATCH 5/5] build: Clean up compiler warnings Signed-off-by: BJ Hargrave --- .../transformer/test/data/Sample_SecurityAPI_Javax.java | 2 -- .../eclipse/transformer/action/impl/ClassActionTest.java | 9 +++++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/org.eclipse.transformer.cli/src/test/java/transformer/test/data/Sample_SecurityAPI_Javax.java b/org.eclipse.transformer.cli/src/test/java/transformer/test/data/Sample_SecurityAPI_Javax.java index 92740bf5..ee200992 100644 --- a/org.eclipse.transformer.cli/src/test/java/transformer/test/data/Sample_SecurityAPI_Javax.java +++ b/org.eclipse.transformer.cli/src/test/java/transformer/test/data/Sample_SecurityAPI_Javax.java @@ -11,8 +11,6 @@ package transformer.test.data; -import javax.security.auth.message.config.AuthConfigFactory; - public class Sample_SecurityAPI_Javax { public javax.security.auth.message.config.AuthConfigFactory getSampleValue() { diff --git a/org.eclipse.transformer/src/test/java/org/eclipse/transformer/action/impl/ClassActionTest.java b/org.eclipse.transformer/src/test/java/org/eclipse/transformer/action/impl/ClassActionTest.java index de161d0e..6ad8a81b 100644 --- a/org.eclipse.transformer/src/test/java/org/eclipse/transformer/action/impl/ClassActionTest.java +++ b/org.eclipse.transformer/src/test/java/org/eclipse/transformer/action/impl/ClassActionTest.java @@ -24,6 +24,7 @@ import java.util.stream.Stream; import org.assertj.core.api.InstanceOfAssertFactories; +import org.assertj.core.api.recursive.comparison.RecursiveComparisonConfiguration; import org.eclipse.transformer.action.Action; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -129,7 +130,10 @@ public void module_transform() throws Exception { assertThat(attribute).as("transformed class module name, flags, and version") .get() - .isEqualToComparingOnlyGivenFields(originalModule, "module_name", "module_flags", "module_version"); + .usingRecursiveComparison(RecursiveComparisonConfiguration.builder() + .withIgnoredFields("requires", "exports", "opens", "uses", "provides") + .build()) + .isEqualTo(originalModule); assertThat(attribute).map(m -> m.requires) .get(InstanceOfAssertFactories.array(ModuleAttribute.Require[].class)) @@ -262,7 +266,8 @@ public void enclosing_method_transform() throws Exception { assertThat(attribute(EnclosingMethodAttribute.class, transformed)).as("transformed class enclosing method") .get() - .isEqualToComparingFieldByField(new EnclosingMethodAttribute("transformed/enclosing/Enclosing", "method", + .usingRecursiveComparison() + .isEqualTo(new EnclosingMethodAttribute("transformed/enclosing/Enclosing", "method", "(Ltransformed/param/Param1;Lpkg/other/Param2;)Ltransformed/result/Result;")); }