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.

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

chore(project): switch to jdk 11 source code level #3691

Merged
merged 26 commits into from
Sep 18, 2023
Merged

chore(project): switch to jdk 11 source code level #3691

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
a41279e
chore(project): switch to jdk 11 source code level
yanavasileva Aug 21, 2023
112d597
wip
yanavasileva Aug 21, 2023
08d3b04
cleanup/update jdk 8 related profiles
yanavasileva Aug 21, 2023
bd7f2cb
TODOs
yanavasileva Aug 21, 2023
e83deed
5.1.1
yanavasileva Aug 21, 2023
bfdb207
test
yanavasileva Aug 22, 2023
fa746dc
remove version
yanavasileva Aug 22, 2023
1d04621
ci: set jdk 11 as default JDK version
yanavasileva Aug 22, 2023
e0c29cc
instance migration requires jdk 8 for the previous fixtures
yanavasileva Aug 25, 2023
b8146fc
to revert
yanavasileva Aug 25, 2023
24ae288
change source code level for instance-migration
yanavasileva Aug 25, 2023
6790062
bump arquillian tomcat version
yanavasileva Aug 28, 2023
4ea062a
revert migration jdk 8 changes
yanavasileva Aug 28, 2023
7156463
to revert
yanavasileva Aug 29, 2023
5865ebb
update to h2 1.4.200
yanavasileva Aug 29, 2023
516dc94
revert comments
yanavasileva Aug 29, 2023
e585cde
to revert: test daily
yanavasileva Aug 30, 2023
9c8545a
readme and comments
yanavasileva Aug 31, 2023
317c4e8
remove dependency not needed anymore after building with JDK 11/17
yanavasileva Aug 31, 2023
9f79a2b
remove todos
yanavasileva Aug 31, 2023
c66bd11
change the jdk variable name
yanavasileva Sep 1, 2023
a795b25
revert tmp changes
yanavasileva Sep 8, 2023
072c1e0
Update pom.xml
yanavasileva Sep 12, 2023
7d69366
cleanup
yanavasileva Sep 12, 2023
59676ea
remove shared library branch
yanavasileva Sep 14, 2023
543c51c
clean up jdk 11 profiles
yanavasileva Sep 14, 2023
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
Prev Previous commit
Next Next commit
TODOs
  • Loading branch information
@yanavasileva
yanavasileva committed Sep 12, 2023
commit bd7f2cb6e701eae5ee8abf3b527e7ecc2ad12a7f
3 changes: 2 additions & 1 deletion distro/run/core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@
<artifactId>camunda-bpm-spring-boot-starter-rest</artifactId>
</dependency>

<!-- jersey-server (transitive dependency of camunda-bpm-spring-boot-starter-rest)
<!-- TODO
jersey-server (transitive dependency of camunda-bpm-spring-boot-starter-rest)
requires JAXB API and Activation API
to be present; Its pom has an optional profile
(activated by Java 11+) that adds these dependencies.
Expand Down
5 changes: 3 additions & 2 deletions engine-rest/engine-rest/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,10 @@
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<!--
<!-- TODO
* Since version 2.10.0 this dependency comes with transitive Jakarta dependencies
* These trans-deps are directly included in JDKs <= Java 8 * For Java >= 9 compatible containers, we make sure to include these dependencies
* These trans-deps are directly included in JDKs <= Java 8
* For Java >= 9 compatible containers, we make sure to include these dependencies
-->
<exclusions>
<exclusion>
Expand Down
3 changes: 2 additions & 1 deletion internal-dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@
<artifactId>HikariCP</artifactId>
<version>${version.hikaricp}</version>
<exclusions>
<!-- When building with Java 8, hikari has a dependency to SLF4j 1.7.
<!-- TODO
When building with Java 8, hikari has a dependency to SLF4j 1.7.
When building with Java 11 or higher, Hikari has a dependency to SLF4j
2.0.0-alpha1 instead. We are therefore excluding this dependency here
and assume that it comes from other dependencies where it is used
Expand Down
3 changes: 2 additions & 1 deletion juel/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
<!-- We shade artifacts into the jar, so we need to generate
a dependency BOM for the license book -->
<skip-third-party-bom>false</skip-third-party-bom>
<!-- Using Jakarta Expression Language 4.0 for Java 8 compatibility -->
<!-- TODO
Using Jakarta Expression Language 4.0 for Java 8 compatibility -->
<version.jakarta.el>4.0.0</version.jakarta.el>
</properties>

Expand Down
4 changes: 2 additions & 2 deletions qa/test-old-engine/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@
</build>
</profile>
<profile>
<id>below-java11</id>
<id>below-java11</id> <!-- TODO can be removed after 7.20 is released-->
<activation>
<jdk>(,11)</jdk>
</activation>
Expand All @@ -442,7 +442,7 @@
</build>
</profile>
<profile>
<id>java11</id>
<id>java11</id> <!-- TODO can be removed after 7.20 is released-->
<activation>
<jdk>[11,)</jdk>
</activation>
Expand Down