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

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

Merged
merged 26 commits into from
Sep 18, 2023
Merged
Show file tree
Hide file tree
Changes from 24 commits
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
3 changes: 2 additions & 1 deletion .ci/daily/Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// https://github.com/camunda/jenkins-global-shared-library
// https://github.com/camunda/cambpm-jenkins-shared-library
@Library(['camunda-ci', 'cambpm-jenkins-shared-library']) _
@Library(['camunda-ci', 'cambpm-jenkins-shared-library@3690']) _
yanavasileva marked this conversation as resolved.
Show resolved Hide resolved

def failedStageTypes = []

Expand All @@ -13,6 +13,7 @@ pipeline {
environment {
LOGGER_LOG_LEVEL = 'DEBUG'
MAVEN_VERSION = 'maven-3.8-latest'
DEF_JDK_VERSION = 'jdk-11-latest'
}
parameters {
booleanParam name: 'TRIGGERED_BY_UPSTREAM', defaultValue: false, description: 'Is the current build triggered in the scope of an upstream pipeline (pull request or default branch)'
Expand Down
3 changes: 2 additions & 1 deletion .ci/main-trigger/Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// https://github.com/camunda/jenkins-global-shared-library
// https://github.com/camunda/cambpm-jenkins-shared-library
@Library(['camunda-ci', 'cambpm-jenkins-shared-library']) _
@Library(['camunda-ci', 'cambpm-jenkins-shared-library@3690']) _
yanavasileva marked this conversation as resolved.
Show resolved Hide resolved

pipeline {
agent {
Expand All @@ -11,6 +11,7 @@ pipeline {
environment {
LOGGER_LOG_LEVEL = 'DEBUG'
MAVEN_VERSION = 'maven-3.8-latest'
DEF_JDK_VERSION = 'jdk-11-latest'
}
options {
buildDiscarder(logRotator(numToKeepStr: '5'))
Expand Down
3 changes: 2 additions & 1 deletion .ci/sidetrack/Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// https://github.com/camunda/jenkins-global-shared-library
// https://github.com/camunda/cambpm-jenkins-shared-library
@Library(['camunda-ci', 'cambpm-jenkins-shared-library']) _
@Library(['camunda-ci', 'cambpm-jenkins-shared-library@3690']) _
yanavasileva marked this conversation as resolved.
Show resolved Hide resolved

pipeline {
agent {
Expand All @@ -11,6 +11,7 @@ pipeline {
environment {
LOGGER_LOG_LEVEL = 'DEBUG'
MAVEN_VERSION = 'maven-3.8-latest'
DEF_JDK_VERSION = 'jdk-11-latest'
}
parameters {
booleanParam name: 'TRIGGERED_BY_UPSTREAM', defaultValue: false, description: 'Is the current build triggered in the scope of an upstream pipeline (pull request or default branch)'
Expand Down
17 changes: 8 additions & 9 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// https://github.com/camunda/jenkins-global-shared-library
// https://github.com/camunda/cambpm-jenkins-shared-library
@Library(['camunda-ci', 'cambpm-jenkins-shared-library']) _
@Library(['camunda-ci', 'cambpm-jenkins-shared-library@3690']) _
yanavasileva marked this conversation as resolved.
Show resolved Hide resolved

def failedStageTypes = []

Expand All @@ -13,6 +13,7 @@ pipeline {
environment {
LOGGER_LOG_LEVEL = 'DEBUG'
MAVEN_VERSION = 'maven-3.8-latest'
DEF_JDK_VERSION = 'jdk-11-latest'
}
options {
buildDiscarder(logRotator(numToKeepStr: '5'))
Expand Down Expand Up @@ -50,7 +51,7 @@ pipeline {
withCatch: false,
withNpm: true,
// we use JDK 17 to build the artifacts, as it is required for supporting Spring Boot 3
// the compiler source and target is set to JDK 8 in the release parents
// the compiler source and target is set to JDK 11 in the release parents
jdkVersion: 'jdk-17-latest')
}

Expand Down Expand Up @@ -227,7 +228,7 @@ pipeline {
'clean install -Pwildfly,postgresql,engine-integration-jakarta',
runtimeStash: true,
archiveStash: true,
// we need to use JDK 17 for WildFly 27+ + Spring 6
// we need to use JDK 17 for Spring 6
jdkVersion: 'jdk-17-latest')
},
postFailure: {
Expand Down Expand Up @@ -272,7 +273,7 @@ pipeline {
'clean install -Pwildfly,postgresql,postgresql-xa,engine-integration-jakarta',
runtimeStash: true,
archiveStash: true,
// we need to use JDK 17 for WildFly 27+ + Spring 6
// we need to use JDK 17 for Spring 6
jdkVersion: 'jdk-17-latest')
},
postFailure: {
Expand Down Expand Up @@ -333,9 +334,7 @@ pipeline {
cambpmRunMaven('qa/',
'clean install -Pwildfly,h2,webapps-integration',
runtimeStash: true,
archiveStash: true,
// we need to use JDK 11 for WildFly 27+
jdkVersion: 'jdk-11-latest')
archiveStash: true)
},
postFailure: {
cambpmPublishTestResult()
Expand Down Expand Up @@ -495,7 +494,7 @@ pipeline {
'clean install -Pwildfly-domain,h2,engine-integration-jakarta',
runtimeStash: true,
archiveStash: true,
// we need to use JDK 17 for WildFly 27+ + Spring 6
// we need to use JDK 17 for Spring 6
jdkVersion: 'jdk-17-latest')
},
postFailure: {
Expand All @@ -518,7 +517,7 @@ pipeline {
'clean install -Pwildfly,wildfly-servlet,h2,engine-integration-jakarta',
runtimeStash: true,
archiveStash: true,
// we need to use JDK 17 for WildFly 27+ + Spring 6
// we need to use JDK 17 for Spring 6
jdkVersion: 'jdk-17-latest')
},
postFailure: {
Expand Down
14 changes: 2 additions & 12 deletions clients/java/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ The **Camunda External Task Client (Java)** allows to set up remote Service Task
* The topic subscription can be configured with the fluent api of the [TopicSubscriptionBuilder](client/src/main/java/org/camunda/bpm/client/topic/TopicSubscriptionBuilder.java).

## Prerequisites
* Oracle Hotspot v1.8+ (JDK 8)
* Camunda BPM Platform 7.9.0+
* Java (supported version by the used Camunda Platform 7)
* Camunda Platform 7

## Maven coordinates
The following Maven coordinate needs to be added to the projects `pom.xml`:
Expand All @@ -37,16 +37,6 @@ The following Maven coordinate needs to be added to the projects `pom.xml`:
</dependency>
```

### JDK 9+ Support
If you want to use a JDK higher than 1.8, please add the following dependency to the projects `pom.xml`:
```xml
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.2.4</version>
</dependency>
```

## Contributing

Have a look at our [contribution guide](https://github.com/camunda/camunda-bpm-platform/blob/master/CONTRIBUTING.md) for how to contribute to this repository.
Expand Down
25 changes: 7 additions & 18 deletions clients/java/client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,13 @@
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>${version.xml.jaxb-impl}</version>
<scope>provided</scope>
</dependency>

</dependencies>

<build>
Expand Down Expand Up @@ -314,22 +321,4 @@

</build>

<profiles>
<profile>
<id>jdk-9-plus</id>
<activation>
<jdk>(1.8,)</jdk>
</activation>

<dependencies>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>${version.xml.jaxb-impl}</version>
<scope>provided</scope>
</dependency>
</dependencies>
</profile>
</profiles>

</project>
2 changes: 1 addition & 1 deletion database/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<!-- database driver versions -->
<version.h2>2.1.214</version.h2>
<version.h2-v1>1.4.190</version.h2-v1><!-- used for instance migration qa -->
<version.h2-v1>1.4.200</version.h2-v1><!-- used for instance migration qa -->
<version.oracle>19.3.0.0</version.oracle>
<version.mariadb>1.7.6</version.mariadb>
<version.mariadb-v1>1.1.8</version.mariadb-v1>
Expand Down
13 changes: 0 additions & 13 deletions distro/run/core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,19 +53,6 @@
<groupId>org.camunda.bpm.springboot</groupId>
<artifactId>camunda-bpm-spring-boot-starter-rest</artifactId>
</dependency>

<!-- 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.
However, in order to be able to build Run with Java 8 and
operate it with Java 11+, we must have a
direct dependency to JAXB, regardless which Java version we
use for building -->
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down
2 changes: 1 addition & 1 deletion distro/wildfly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<message>
*****************************************************************************************************
* *
* You must use at least JDK 11 to compile Camunda Platform Wildfly!!! *
* You must use at least JDK 11 to compile Camunda Platform Wildfly!!! *
* *
*****************************************************************************************************
</message>
Expand Down
4 changes: 2 additions & 2 deletions distro/wildfly26/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@
<configuration>
<rules>
<requireJavaVersion>
<version>[1.8,)</version>
<version>[11,)</version>
<message>
*****************************************************************************************************
* *
* You must use at least JDK 1.8 to compile Camunda Platform Wildfly!!! *
* You must use at least JDK 11 to compile Camunda Platform Wildfly!!! *
* *
*****************************************************************************************************
</message>
Expand Down
22 changes: 5 additions & 17 deletions engine-plugins/spin-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,11 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand All @@ -141,21 +146,4 @@
</plugins>
</build>

<profiles>
<profile>
<id>jdk9-and-onwards</id>
<activation>
<jdk>[9,)</jdk>
</activation>

<dependencies>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
</profiles>

</project>
3 changes: 2 additions & 1 deletion engine-rest/engine-rest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
<artifactId>jackson-jaxrs-json-provider</artifactId>
<!--
* 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
8 changes: 4 additions & 4 deletions engine/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -348,10 +348,10 @@
</camunda.artifact>
<camunda.osgi.export.pkg>
!${camunda.artifact}.engine.variable.*,
${camunda.artifact};${camunda.osgi.version};-noimport:=true,
${camunda.artifact}.application.*;${camunda.osgi.version};-noimport:=true,
${camunda.artifact}.container.*;${camunda.osgi.version};-noimport:=true,
${camunda.artifact}.engine.*;${camunda.osgi.version};-noimport:=true
${camunda.artifact},
${camunda.artifact}.application.*,
${camunda.artifact}.container.*,
${camunda.artifact}.engine.*
</camunda.osgi.export.pkg>
<camunda.osgi.import.additional>
!com.google.gson.*,
Expand Down
Loading