Skip to content
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.

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

Support of Java11 #1154

Merged
merged 62 commits into from
May 14, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
bf6eb9a
Upgraded Maven plugins to most recent version
tfr42 Oct 2, 2018
b63139a
Updated SourceVersion to RELEASE_8 with older versions compile will fail
tfr42 Feb 15, 2019
2366c73
#857 added JAXB 2.3.1 to dependencies
tfr42 Nov 25, 2020
fe48874
#857 added javax annotation API
tfr42 Nov 25, 2020
5ab3cda
#857 upgrade maven dependency and assembly plugins
tfr42 Nov 25, 2020
eb60fc0
#857 added dependencies to JAXB, JAX-WS and javax.annotations
tfr42 Nov 25, 2020
cc0ecbc
#857 fixed unit test failure due to precision issue with jdk 11
tfr42 Nov 25, 2020
032ebcd
#857 fixed unit test failure due to precision issue with jdk 11
tfr42 Nov 25, 2020
0333044
#857 migrated from javax. to jakarta. groupId
tfr42 Nov 25, 2020
851c5d9
#857 upgraded maven plugins surefire, failsafe, pmd, checkstyle, enfo…
tfr42 Nov 25, 2020
83cd4bf
#857 upgraded mockito to 2.28.2 and powermock to 2.0.9 supporting Jav…
tfr42 Nov 25, 2020
f327133
#857 removed duplicate dependencies junit and mockito
tfr42 Nov 25, 2020
ebac568
#857 fixed and improved unit tests testing equals on xml output in WM…
tfr42 Nov 26, 2020
34cbc4d
#857 disabled integration tests in deegree-workspace-tests due to unr…
tfr42 Nov 26, 2020
24c5783
#857 upgraded maven plugins site, war, javadoc, asciidoctor supportin…
tfr42 Nov 26, 2020
d324c8e
#857 migrated findbugs plugin to spotbugs plugin
tfr42 Nov 26, 2020
c3cabd2
#857 upgraded antlr maven plugin to recent version supporting java 11…
tfr42 Nov 27, 2020
8b24311
#857 upgraded antlr to 3.5.2
tfr42 Nov 27, 2020
8eae1ee
#857 added missing used dependencies to deegree-wmts-tests module
tfr42 Nov 27, 2020
c832923
#857 fixed error in antlr grammar since 3.5.2 is more stricter
tfr42 Nov 27, 2020
df4d0c5
#857 removed unused generated code fixed grammar, extracted property …
tfr42 Nov 27, 2020
52938af
#857 added missing used dependency to deegree-workspace-csw module
tfr42 Nov 27, 2020
ab3484a
#6895 execute acceptance test and deploy to nexus
tfr42 Nov 29, 2020
21a59d7
#6895 added profile integration-tests to execute acceptance tests
tfr42 Nov 30, 2020
ecffebe
#6895 added enforcer rules for duplicate classes
tfr42 Nov 30, 2020
6c30578
#6895 removed check for redundant throws from checkstyle
tfr42 Nov 30, 2020
28bd01b
#857 upgraded tomcat to 9.0.40 and set classifier to jdk11
tfr42 Dec 3, 2020
b882f3c
deegree#857 upgraded jar an resources plugin
lgoltz May 10, 2021
d07f52c
#857 upgraded dependencies saxon, jettison and reflections
tfr42 Jan 6, 2021
d6749f3
#857 removed unused filtering section
tfr42 Jan 6, 2021
b051319
#857 removed unused filtering and fixed path
tfr42 Jan 12, 2021
cd7a6da
#857 - fixed parent version
lgoltz May 11, 2021
075a036
#857 - removed classifier jdk11
lgoltz May 11, 2021
abe8825
#857 - upgrade poi-ooxml (soapui-maven-plugin)
lgoltz May 12, 2021
64dca4c
#857 - fixed SoapUI tests
lgoltz May 12, 2021
0b0f919
#857 - added REST API tests
lgoltz May 12, 2021
b770591
Merge remote-tracking branch 'deegree/master' into java11-857
lgoltz Jun 28, 2021
0ec7cf5
#857 - enabled test-workspaces goal in deegree-workspace-test
lgoltz Jun 28, 2021
632c0f8
#857 - removed acceptance-tests (part of PR #1153)
lgoltz Jun 28, 2021
fed8883
Revert "#857 migrated findbugs plugin to spotbugs plugin"
lgoltz Jun 28, 2021
aff4c1f
#857 - fixed merge, removed deegree-csw-bkg
lgoltz Jun 28, 2021
7bea1fb
#857 - reset changes on Jenkinsfile
lgoltz Jun 28, 2021
512556b
#857 - use Java 11
lgoltz Jun 29, 2021
de6fdc9
Merge remote-tracking branch 'deegree/master' into java11-857
lgoltz Aug 16, 2021
4244355
removed deegree-wms-remoteows-tests (like in deegree master)
lgoltz Aug 16, 2021
ccb9300
Merge remote-tracking branch 'deegree/master' into java11-857
lgoltz Oct 12, 2021
5ae51d7
upgrade maven to 3.8
lgoltz Nov 24, 2021
c6a1ba8
Merge branch 'deegree:master' into java11-857
tfr42 Nov 25, 2021
256a8f6
#857 - removed resources section from pom
lgoltz Nov 25, 2021
10d301b
Merge remote-tracking branch 'deegree/master' into java11-857
lgoltz Dec 2, 2021
6d7c0d6
#857 (#7897) - excluded spring-jcl, ignore javax.annotation.
lgoltz Dec 2, 2021
e2954e8
use the featuretype name as key, the featureType classes does not imp…
lgoltz Dec 8, 2021
e51d799
Merge remote-tracking branch 'deegree/master' into java11-857
lgoltz Jan 4, 2022
9cb833d
Merge remote-tracking branch 'deegree/master' into java11-857
lgoltz Jan 10, 2022
96f2ca4
Merge remote-tracking branch 'deegree/master' into java11-857
lgoltz Jan 21, 2022
8f006ea
Merge remote-tracking branch 'deegree/master' into java11-857
lgoltz Feb 24, 2022
66c8098
Merge branch 'deegree:master' into java11-857
lgoltz Mar 3, 2022
70c679f
Merge branch 'deegree:master' into java11-857
lgoltz Mar 17, 2022
e93653e
Merge branch 'deegree:master' into java11-857
lgoltz Mar 31, 2022
7662ace
Merge remote-tracking branch 'deegree/master' into java11-857
lgoltz May 13, 2022
9619c2e
ignore oracle.xml.*
lgoltz May 13, 2022
20d6675
Merge branch 'deegree:master' into java11-857
lgoltz May 13, 2022
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
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ pipeline {
disableConcurrentBuilds()
}
tools {
maven 'maven-3.6'
jdk 'adoptopenjdk-jdk8'
maven 'maven-3.8'
jdk 'adoptopenjdk-jdk11'
}
environment {
MAVEN_OPTS='-Djava.awt.headless=true -Xmx4096m'
Expand Down
3 changes: 0 additions & 3 deletions checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@
<module name='RedundantModifier'>
<property name="severity" value="warning" />
</module>
<module name='RedundantThrows'>
<property name="severity" value="warning" />
</module>
</module>
<module name='FileLength' />
<module name='NewlineAtEndOfFile'>
Expand Down
4 changes: 4 additions & 0 deletions deegree-client/deegree-wps-webclient/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
</parent>

<dependencies>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-protocol-commons</artifactId>
Expand Down
8 changes: 8 additions & 0 deletions deegree-core/deegree-core-commons/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,14 @@
</build>

<dependencies>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
<dependency>
<groupId>org.deegree</groupId>
<artifactId>deegree-core-workspace</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ even returns [OddEven even]:
link returns [Link link]:
LinkStart Colon pref = url TagClose
{
if(pref.text == null) $link = new Link(pref.url);
else $link = new Link(pref.url, pref.text);
if($pref.text == null) $link = new Link($pref.url);
else $link = new Link($pref.url, $pref.text);
}
;

Expand Down
Loading