Skip to content

Commit 0aa2a97

Browse files
Artur-ZheSun88
andauthored
feat: Bump minimum Java version to 11 (#2473)
* feat: Bump minimum Java version to 11 * Upgrade jol to latest version * chore: fix build script Co-authored-by: Zhe Sun <31067185+ZheSun88@users.noreply.github.com> Co-authored-by: ZheSun88 <zhe@vaadin.com>
1 parent e835124 commit 0aa2a97

3 files changed

Lines changed: 10 additions & 4 deletions

File tree

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<properties>
1414
<flow.version>10.0-SNAPSHOT</flow.version>
1515
<testbench.version>7.0.3</testbench.version>
16-
<maven.compiler.source>1.8</maven.compiler.source>
17-
<maven.compiler.target>1.8</maven.compiler.target>
16+
<maven.compiler.source>11</maven.compiler.source>
17+
<maven.compiler.target>11</maven.compiler.target>
1818
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1919
<project.reporting.outputEncoding>UTF-8
2020
</project.reporting.outputEncoding>

‎scripts/build.sh‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,15 @@ args="$args -B $quiet"
3131
## compute modules that were modified in this PR
3232
if [ -z "$modules" -a -n "$PR" ]
3333
then
34+
## need to check whether changes in the root or not
35+
modifiedAll=`curl -s https://api.github.com/repos/vaadin/flow-components/pulls/$PR/files \
36+
| jq -r '.[] | .filename' | sort -u | tr -d '[:space:]'`
37+
modifiedComponent=`curl -s https://api.github.com/repos/vaadin/flow-components/pulls/$PR/files \
38+
| jq -r '.[] | .filename' | grep 'vaadin.*parent' | sort -u | tr -d '[:space:]'`
3439
modified=`curl -s https://api.github.com/repos/vaadin/flow-components/pulls/$PR/files \
3540
| jq -r '.[] | .filename' | grep 'vaadin.*parent' | perl -pe 's,^vaadin-(.*)-flow-parent.*,$1,g' | sort -u`
36-
if [ `echo "$modified" | wc -w` -lt 5 ]
41+
42+
if [ `echo "$modified" | wc -w` -lt 5 ] && [ `echo ${#modifiedAll}` = `echo ${#modifiedComponent}` ]
3743
then
3844
for i in $modified
3945
do

‎vaadin-grid-flow-parent/vaadin-grid-flow-integration-tests/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142
<dependency>
143143
<groupId>org.openjdk.jol</groupId>
144144
<artifactId>jol-core</artifactId>
145-
<version>0.8</version>
145+
<version>0.16</version>
146146
</dependency>
147147
<dependency>
148148
<groupId>com.vaadin</groupId>

0 commit comments

Comments
 (0)