Skip to content

Draft: Building with Jdk 17 #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 8 commits into
base: master
Choose a base branch
from
Draft

Draft: Building with Jdk 17 #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e8f6cd3
Rename JBFileTest to JBFileTestDir
Oct 11, 2021
4f5de5f
Upgrade tool and dependency versions
Oct 12, 2021
906feaa
Needs to specify javax.xml.bind
Oct 12, 2021
c03975a
New groovy parser seems more picky
Oct 12, 2021
d74fadd
Change the groovy runtime used Library
Oct 12, 2021
348be82
Some packages need to be opened for the tests to pass
Oct 12, 2021
68cad58
Use new parameter doclint
Oct 12, 2021
ab9ff60
Upgrade failsafe plugin too
Oct 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<type>pom</type>
</dependency>

<dependency>
Expand Down Expand Up @@ -69,6 +70,12 @@
<artifactId>org.eclipse.jgit</artifactId>
</dependency>

<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.0</version>
</dependency>


<!-- JUnit test dependencies -->
<dependency>
Expand Down Expand Up @@ -112,6 +119,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<doclint>none</doclint>
</configuration>
</plugin>

<plugin>
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/groovy/noe/common/utils/Library.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -826,7 +826,7 @@ class Library {
* @return generated classpath for groovy with ant
*/
static String groovyWithAntAsClasspath(File libDir = null) {
def groovyAndAntLibs = ["groovy-all-2.2.1.jar", "ant-1.9.2.jar", "ant-launcher-1.9.2.jar"]
def groovyAndAntLibs = ["groovy-3.0.9.jar", "groovy-ant-3.0.9.jar", "ant-1.9.2.jar", "ant-launcher-1.9.2.jar"]
def libDirToUse = (libDir) ?: new File(Library.getRootPath(), "lib")
def classpath = []
if (!libDirToUse.exists()) {
Expand Down
Binary file added core/src/main/resources/lib/groovy-3.0.9.jar
View file
Open in desktop
Binary file not shown.
Binary file removed core/src/main/resources/lib/groovy-all-2.2.1.jar
View file
Open in desktop
Binary file not shown.
Binary file added core/src/main/resources/lib/groovy-ant-3.0.9.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion core/src/test/groovy/noe/common/utils/JBFileTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class JBFileTest {
static Platform platform = new Platform()
static String sep = platform.sep

static File resourceDir = new File(new File(".").getCanonicalFile(), "src${sep}test${sep}resources${sep}" + JBFileTest.class.name.replace('.', sep))
static File resourceDir = new File(new File(".").getCanonicalFile(), "src${sep}test${sep}resources${sep}" + JBFileTest.class.name.replace('.', sep)+"Dir")
static File fileLoremIpsum = new File(resourceDir, "lorem_ipsum.txt")
static File fileMd5 = new File(resourceDir, "lorem_ipsum.md5")
static File fileZip = new File(resourceDir, "lorem_ipsum.zip")
Expand Down
2 changes: 1 addition & 1 deletion core/src/test/groovy/noe/common/utils/OpenSslVersionTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class OpenSslVersionTest {
@Test
public void testCompareTo() {
// <=> calls compareTo(...) explicitly
List<Tuple<String, String>> values = new LinkedList<>()
List<Tuple> values = new LinkedList<>()
values.add(new Tuple("0.9.8", "0.9.9"))
values.add(new Tuple("0.9.8b", "0.9.8c"))
values.add(new Tuple("1.0.2c", "1.2.3a"))
Expand Down
0 ...e/common/utils/JBFileTest/lorem_ipsum.md5 → ...ommon/utils/JBFileTestDir/lorem_ipsum.md5
View file
Open in desktop
File renamed without changes.
0 ...e/common/utils/JBFileTest/lorem_ipsum.txt → ...ommon/utils/JBFileTestDir/lorem_ipsum.txt
View file
Open in desktop
File renamed without changes.
0 ...e/common/utils/JBFileTest/lorem_ipsum.zip → ...ommon/utils/JBFileTestDir/lorem_ipsum.zip
View file
Open in desktop
File renamed without changes.
0 ...mmon/utils/JBFileTest/testStructure/file1 → ...n/utils/JBFileTestDir/testStructure/file1
View file
Open in desktop
File renamed without changes.
0 ...est/testStructure/oneSubdir/oneFile/file4 → ...Dir/testStructure/oneSubdir/oneFile/file4
View file
Open in desktop
File renamed without changes.
0 ...s/JBFileTest/testStructure/twoFiles/file2 → ...BFileTestDir/testStructure/twoFiles/file2
View file
Open in desktop
File renamed without changes.
0 ...s/JBFileTest/testStructure/twoFiles/file3 → ...BFileTestDir/testStructure/twoFiles/file3
View file
Open in desktop
File renamed without changes.
24 changes: 15 additions & 9 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,9 @@
<version.findbugs-plugin>3.0.5</version.findbugs-plugin>
<version.codenarc-plugin>0.22-1</version.codenarc-plugin>
<version.source-plugin>3.2.1</version.source-plugin>
<version.javadoc-plugin>2.10.4</version.javadoc-plugin>
<version.javadoc-plugin>3.3.1</version.javadoc-plugin>
<version.release-plugin>3.0.0-M1</version.release-plugin>
<version.groovy-eclipse-compiler>3.6.0-03</version.groovy-eclipse-compiler>
<version.groovy-eclipse-compiler>3.7.0</version.groovy-eclipse-compiler>
<version.guava>29.0-jre</version.guava>
<version.jgit>5.8.0.202006091008-r</version.jgit>

Expand All @@ -101,17 +101,17 @@
<!-- https://github.com/Karm/okhttp/tree/add_cipher_suites -->
<com.squareup.okhttp3.okhttp.version>4.8.0</com.squareup.okhttp3.okhttp.version>
<org.apache.ant.version>1.10.8</org.apache.ant.version>
<version.org.apache.maven.plugins.maven-surefire-plugin>2.22.0
<version.org.apache.maven.plugins.maven-surefire-plugin>3.0.0-M5
</version.org.apache.maven.plugins.maven-surefire-plugin>
<version.org.apache.maven.plugins.maven-failsafe-plugin>2.22.0
<version.org.apache.maven.plugins.maven-failsafe-plugin>3.0.0-M5
</version.org.apache.maven.plugins.maven-failsafe-plugin>
<version.org.apache.maven.plugins.maven-deploy-plugin>2.8.2
</version.org.apache.maven.plugins.maven-deploy-plugin>
<junit.version>4.13</junit.version>
<org.codehaus.groovy.all.version>2.4.19</org.codehaus.groovy.all.version>
<org.codehaus.groovy.all.version>3.0.9</org.codehaus.groovy.all.version>
<maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
<org.codehaus.groovy.compiler.version>2.9.2-01</org.codehaus.groovy.compiler.version>
<org.codehaus.groovy.batch.compiler.version>2.4.3-01</org.codehaus.groovy.batch.compiler.version>
<org.codehaus.groovy.compiler.version>3.6.0-03</org.codehaus.groovy.compiler.version>
<org.codehaus.groovy.batch.compiler.version>3.0.8-01</org.codehaus.groovy.batch.compiler.version>
<org.codehaus.mojo.build.helper.maven.plugin.version>3.2.0</org.codehaus.mojo.build.helper.maven.plugin.version>

<version.slfj-api>1.7.30</version.slfj-api>
Expand Down Expand Up @@ -153,7 +153,7 @@
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>${org.codehaus.groovy.all.version}</version>
<type>jar</type>
<type>pom</type>
Copy link
Contributor

@jstourac jstourac Oct 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just thinking whether it wouldn't be better to change from groovy-all to groovy?

Copy link
Contributor Author

@sgala sgala Oct 13, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't do it due to verbosity and having to chase dependencies. For what I tested we depend on at least groovy-<VER>.jar and groovy-ant-<VER>.jar. Maybe more.

BTW, I ran mvn dependency:analyze-report and it looks like we have a number of undeclared dependencies (I uncovered commons-collections while testing and this is why I ran the report), and a number of unused but declared ones.

But I feel insecure proceeding further as I have not yet been able to run the integration tests. I did not arrive to mvn verify , just compile, test and package (skipping javadocs). verify needs more set up, and solving the problem with building javadocs is IMO of higher priority.

Our "analyze report" (at master HEAD):

Dependency Analysis

Used and declared dependencies

GroupId ArtifactId Version Scope Classifier Type Optional
net.java.dev.jna jna 5.6.0 compile   jar false
org.codehaus.groovy groovy-all 2.4.19 compile   jar false
net.sourceforge.htmlunit htmlunit 2.15 compile   jar false
com.google.guava guava 29.0-jre compile   jar false
org.slf4j slf4j-api 1.7.30 compile   jar false
com.squareup.okhttp3 okhttp 4.8.0 compile   jar false
com.squareup.okhttp3 okhttp-urlconnection 4.8.0 compile   jar false
org.eclipse.jgit org.eclipse.jgit 5.8.0.202006091008-r compile   jar false
junit junit 4.13 test   jar false
org.powermock powermock-module-junit4 2.0.7 test   jar false
org.powermock powermock-api-mockito2 2.0.7 test   jar false
org.wildfly.extras.creaper creaper-core 1.6.1 compile   jar false

Used but undeclared dependencies

GroupId ArtifactId Version Scope Classifier Type Optional
commons-io commons-io 2.4 compile   jar false
commons-collections commons-collections 3.2.1 compile   jar false
org.powermock powermock-core 2.0.7 test   jar false
xml-apis xml-apis 1.4.01 compile   jar false
org.apache.commons commons-lang3 3.3.2 compile   jar false

Unused but declared dependencies

GroupId ArtifactId Version Scope Classifier Type Optional
org.apache.ant ant 1.10.8 compile   jar false
ch.qos.logback logback-classic 1.2.3 compile   jar false
org.wildfly.extras.creaper creaper-commands 1.6.1 compile   jar false
org.wildfly.core wildfly-controller-client 12.0.3.Final provided   jar false
org.wildfly.core wildfly-cli 12.0.3.Final provided   jar false

</dependency>

<dependency>
Expand Down Expand Up @@ -357,6 +357,12 @@
<systemPropertyVariables combine.children="append">
<JDBCLoader.URL>http://exampleurl.com</JDBCLoader.URL>
</systemPropertyVariables>
<argLine>
--add-opens java.base/java.lang=ALL-UNNAMED
--add-opens java.base/java.lang.ref=ALL-UNNAMED
--add-opens java.base/java.util=ALL-UNNAMED
--add-opens java.xml/jdk.xml.internal=ALL-UNNAMED
</argLine>
</configuration>
<dependencies>
<dependency>
Expand Down Expand Up @@ -447,7 +453,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
<doclint>none</doclint>
</configuration>
</plugin>
</plugins>
Expand Down