Skip to content

Commit

Permalink
chore: fix validations in GH and TC to work with JDK 17 (#14503)
Browse files Browse the repository at this point in the history
* chore: bump GH actions to java 17

* chore: bump java source to 17

* chore: add JDK names in GH actions config file (#14504)

* chore: add JDK names in GH actions config file

* chore: increase jdk range for gradle profile activation

* chore: add tomcat10 to the exclusions list

* chore: bump version of japicmp-maven-plugin
  • Loading branch information
manolo committed Sep 13, 2022
1 parent 69e4172 commit f970961
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 9 deletions.
12 changes: 7 additions & 5 deletions .github/workflows/validation.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Flow Validation
on:
push:
branches: [master, '23.1', '23.0', '9.0']
branches: [master, '24.0', '23.2', '23.1', '23.0', '9.0']
workflow_dispatch:
pull_request_target:
types: [opened, synchronize, reopened]
Expand Down Expand Up @@ -32,9 +32,10 @@ jobs:
- uses: actions/setup-node@v3
with:
node-version: '16'
- uses: actions/setup-java@v3
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: '11'
java-version: '17'
distribution: 'temurin'
- name: Set flow version to 999.99-SNAPSHOT
run: |
Expand Down Expand Up @@ -74,9 +75,10 @@ jobs:
- uses: actions/checkout@v2
with:
ref: ${{ github.event.pull_request.head.sha }}
- uses: actions/setup-java@v3
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: '11'
java-version: '17'
distribution: 'temurin'
- name: Set flow version to 999.99-SNAPSHOT
run: |
Expand Down
2 changes: 1 addition & 1 deletion flow-plugins/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<profile>
<id>gradle</id>
<activation>
<jdk>(,17]</jdk>
<jdk>(,18]</jdk>
</activation>
<modules>
<module>flow-gradle-plugin</module>
Expand Down
17 changes: 15 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,14 @@
https://maven.vaadin.com/vaadin-addons
</flow.addons.repo.url>

<maven.compiler.release>11</maven.compiler.release>
<maven.compiler.release>17</maven.compiler.release>
<maven.compiler.source>${maven.compiler.release}</maven.compiler.source>
<maven.compiler.target>${maven.compiler.release}</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8
</project.reporting.outputEncoding>
<jsinterop.version>1.0.2</jsinterop.version>
<sonar.java.source>11</sonar.java.source>
<sonar.java.source>17</sonar.java.source>
<sonar.analysis.mode>preview</sonar.analysis.mode>
<sonar.issuesReport.console.enable>true</sonar.issuesReport.console.enable>
<sonar.issuesReport.html.enable>true</sonar.issuesReport.html.enable>
Expand Down Expand Up @@ -689,5 +689,18 @@
<sonar.issuesReport.html.enable/>
</properties>
</profile>
<!-- TEMPORARY override apicmp profile in vaadin-parent until we release it with this change -->
<profile>
<id>apicmp</id>
<build>
<plugins>
<plugin>
<groupId>com.github.siom79.japicmp</groupId>
<artifactId>japicmp-maven-plugin</artifactId>
<version>0.16.0</version>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
2 changes: 1 addition & 1 deletion scripts/computeMatrix.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const fs = require("fs");

/****************** START CONFIG */
// Do not run the following modules except 'flow-tests' that is handled separatelly in this script
const globalExclusions = ['flow-tests/servlet-containers/tomcat9', 'flow-tests/servlet-containers/tomcat85'];
const globalExclusions = ['flow-tests/servlet-containers/tomcat10', 'flow-tests/servlet-containers/tomcat9', 'flow-tests/servlet-containers/tomcat85'];

// Set modules or tests weights and fixed slice position for better distribution
// weight: it's time in half-minutes, default 1 = 30secs
Expand Down

0 comments on commit f970961

Please sign in to comment.