Skip to content

Migrate to a newer JDK #8411

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

Closed
vishesh92 wants to merge 2 commits into from
Closed

Migrate to a newer JDK #8411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5f2fd7
Migrate to JDK 17
vishesh92 Dec 28, 2023
a865652
Migrate to OpenJDK 21
vishesh92 Dec 28, 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
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Set up JDK 11
- name: Set up JDK 21
uses: actions/setup-java@v3
with:
java-version: '11'
java-version: '21'
distribution: 'adopt'
architecture: x64
cache: maven
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v3
with:
java-version: '11'
java-version: '21'
distribution: 'adopt'
architecture: x64
cache: maven
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codecov.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ jobs:
with:
fetch-depth: 0

- name: Set up JDK11
- name: Set up JDK21
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '11'
java-version: '21'
cache: 'maven'

- name: Build CloudStack with Quality Checks
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/main-sonar-check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ jobs:
with:
fetch-depth: 0

- name: Set up JDK11
- name: Set up JDK17
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '11'
java-version: '17'
cache: 'maven'

- name: Cache SonarCloud packages
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ jobs:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- name: Set up JDK 11
- name: Set up JDK 21
uses: actions/setup-java@v3
with:
java-version: '11'
java-version: '21'
distribution: 'adopt'
architecture: x64
cache: maven
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sonar-check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ jobs:
ref: "refs/pull/${{ github.event.number }}/merge"
fetch-depth: 0

- name: Set up JDK11
- name: Set up JDK21
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '11'
java-version: '21'
cache: 'maven'

- name: Cache SonarCloud packages
Expand Down
66 changes: 39 additions & 27 deletions engine/schema/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@
<build>
<plugins>
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
<version>1.5</version>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
<version>3.0.2</version>
Copy link
Copy Markdown
Contributor

@DaanHoogland DaanHoogland Dec 28, 2023

Choose a reason for hiding this comment

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

can this come from the parent pom?

<executions>
<execution>
<id>setproperty</id>
Expand All @@ -72,12 +72,14 @@
<goal>execute</goal>
</goals>
<configuration>
<source>
def projectVersion = project.properties['project.systemvm.template.version']
String[] versionParts = projectVersion.tokenize('.')
pom.properties['cs.version'] = versionParts[0] + "." + versionParts[1]
pom.properties['patch.version'] = versionParts[2]
</source>
<scripts>
<script><![CDATA[
def projectVersion = project.properties['project.systemvm.template.version']
String[] versionParts = projectVersion.tokenize('.')
project.properties.setProperty('cs.version', versionParts[0] + "." + versionParts[1])
project.properties.setProperty('patch.version', versionParts[2])
]]></script>
</scripts>
</configuration>
</execution>
<execution>
Expand All @@ -87,28 +89,38 @@
<goal>execute</goal>
</goals>
<configuration>
<source>
def csVersion = pom.properties['cs.version']
def patch = pom.properties['patch.version']
def templateList = []
templateList.add("systemvmtemplate-${csVersion}.${patch}-kvm")
templateList.add("systemvmtemplate-${csVersion}.${patch}-vmware")
templateList.add("systemvmtemplate-${csVersion}.${patch}-xen")
templateList.add("systemvmtemplate-${csVersion}.${patch}-ovm")
templateList.add("systemvmtemplate-${csVersion}.${patch}-hyperv")
File file = new File("./engine/schema/dist/systemvm-templates/md5sum.txt")
def lines = file.readLines()
for (template in templateList) {
def data = lines.findAll { it.contains(template) }
if (data != null) {
def hypervisor = template.tokenize('-')[-1]
pom.properties["$hypervisor" + ".checksum"] = data[0].tokenize(' ')[0]
<scripts>
<script><![CDATA[
def csVersion = project.properties['cs.version']
def patch = project.properties['patch.version']
def templateList = []
templateList.add("systemvmtemplate-${csVersion}.${patch}-kvm")
templateList.add("systemvmtemplate-${csVersion}.${patch}-vmware")
templateList.add("systemvmtemplate-${csVersion}.${patch}-xen")
templateList.add("systemvmtemplate-${csVersion}.${patch}-ovm")
templateList.add("systemvmtemplate-${csVersion}.${patch}-hyperv")
File file = new File("./engine/schema/dist/systemvm-templates/md5sum.txt")
def lines = file.readLines()
for (template in templateList) {
def data = lines.findAll { it.contains(template) }
if (data != null) {
def hypervisor = template.tokenize('-')[-1]
project.properties["$hypervisor" + ".checksum"] = data[0].tokenize(' ')[0]
}
}
}
</source>
]]></script>
</scripts>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<version>4.0.15</version>
<scope>runtime</scope>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>com.googlecode.maven-download-plugin</groupId>
Expand Down
2 changes: 1 addition & 1 deletion plugins/network-elements/brocade-vcs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
<version>0.14.0</version>
<version>0.15.3</version>
<executions>
<execution>
<id>interface</id>
Expand Down
25 changes: 13 additions & 12 deletions plugins/storage/volume/storpool/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@
<build>
<plugins>
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
<version>1.5</version>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
<version>3.0.2</version>
<executions>
<execution>
<id>set-properties</id>
Expand All @@ -76,15 +76,16 @@
<goal>execute</goal>
</goals>
<configuration>
<providerSelection>1.7</providerSelection>
<source>
File git = new File("./.git")
if (!git.exists()) {
pom.properties['storpool.skip.git.properties'] = 'true'
} else {
pom.properties['storpool.skip.git.properties'] = 'false'
}
</source>
<scripts>
<script><![CDATA[
File git = new File("./.git")
if (!git.exists()) {
project.properties.setProperty('storpool.skip.git.properties', 'true')
} else {
project.properties.setProperty('storpool.skip.git.properties', 'false')
}
]]></script>
</scripts>
</configuration>
</execution>
</executions>
Expand Down
9 changes: 4 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<sonar.host.url>https://sonarcloud.io</sonar.host.url>

<!-- Build properties -->
<cs.jdk.version>11</cs.jdk.version>
<cs.jdk.version>21</cs.jdk.version>
<cs.target.dir>target</cs.target.dir>
<cs.replace.properties>build/replace.properties</cs.replace.properties>
<argLine>-Djava.security.egd=file:/dev/./urandom -noverify</argLine>
Expand Down Expand Up @@ -153,8 +153,8 @@
<cs.jaxb.version>2.3.0</cs.jaxb.version>
<cs.jaxws.version>2.3.2-1</cs.jaxws.version>
<cs.jersey-client.version>2.26</cs.jersey-client.version>
<cs.jetty.version>9.4.51.v20230217</cs.jetty.version>
<cs.jetty-maven-plugin.version>9.4.27.v20200227</cs.jetty-maven-plugin.version>
<cs.jetty.version>9.4.53.v20231009</cs.jetty.version>
<cs.jetty-maven-plugin.version>9.4.53.v20231009</cs.jetty-maven-plugin.version>
<cs.jna.version>5.5.0</cs.jna.version>
<cs.joda-time.version>2.12.5</cs.joda-time.version>
<cs.jpa.version>2.2.1</cs.jpa.version>
Expand All @@ -181,9 +181,8 @@
<cs.xapi.version>6.2.0-3.1</cs.xapi.version>
<cs.xmlrpc.version>3.1.3</cs.xmlrpc.version>
<cs.xstream.version>1.4.20</cs.xstream.version>
<org.springframework.version>5.3.26</org.springframework.version>
<org.springframework.version>5.3.31</org.springframework.version>
<cs.ini.version>0.5.4</cs.ini.version>
<cs.gmaven.version>1.12.0</cs.gmaven.version>
</properties>

<distributionManagement>
Expand Down