Skip to content

Commit 1b88131

Browse files
authored
Merge pull request #158 from xdev-software/develop
3.0.0 - Vaadin 23
2 parents c5ff5b5 + 1557b49 commit 1b88131

File tree

16 files changed

+614
-91
lines changed

16 files changed

+614
-91
lines changed

β€Ž.github/dependabot.ymlβ€Ž

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,5 @@ updates:
2121
time: "00:00"
2222
open-pull-requests-limit: 10
2323
ignore:
24-
- dependency-name: "com.vaadin:vaadin-bom"
25-
versions: ">=15.0.0"
2624
- dependency-name: "org.eclipse.jetty:jetty-maven-plugin"
2725
versions: ">=10.0.0"

β€Ž.github/workflows/checkBuild.ymlβ€Ž

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,19 @@ jobs:
1515
build:
1616
runs-on: ubuntu-latest
1717

18+
strategy:
19+
matrix:
20+
java: [11, 17]
21+
distribution: [temurin]
22+
1823
steps:
1924
- uses: actions/checkout@v3
2025

21-
- name: Set up JDK 8
22-
uses: actions/setup-java@v2
26+
- name: Set up JDK
27+
uses: actions/setup-java@v3
2328
with:
24-
java-version: '8'
25-
distribution: 'temurin'
29+
distribution: ${{ matrix.distribution }}
30+
java-version: ${{ matrix.java }}
2631
cache: 'maven'
2732

2833
- name: Build with Maven
@@ -47,8 +52,8 @@ jobs:
4752
fi
4853
4954
- name: Upload demo files
50-
uses: actions/upload-artifact@v2
55+
uses: actions/upload-artifact@v3
5156
with:
52-
name: demo-files
57+
name: demo-files-java-${{ matrix.java }}
5358
path: vaadin-date-range-picker-demo/target/vaadin-date-range-picker-demo.war
5459
if-no-files-found: error

β€Ž.github/workflows/release.ymlβ€Ž

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010
steps:
1111
- uses: actions/checkout@v3
1212

13-
- name: Set up JDK 8
14-
uses: actions/setup-java@v2
13+
- name: Set up JDK
14+
uses: actions/setup-java@v3
1515
with:
16-
java-version: '8'
16+
java-version: '11'
1717
distribution: 'temurin'
1818

1919
- name: Cache local Maven repository
@@ -117,10 +117,10 @@ jobs:
117117
git config --global user.name "GitHub Actions"
118118
git pull
119119
120-
- name: Set up JDK 8 Apache Maven Central
121-
uses: actions/setup-java@v2
120+
- name: Set up JDK Apache Maven Central
121+
uses: actions/setup-java@v3
122122
with: # running setup-java again overwrites the settings.xml
123-
java-version: '8'
123+
java-version: '11'
124124
distribution: 'temurin'
125125
server-id: ossrh
126126
server-username: MAVEN_CENTRAL_USERNAME
@@ -148,18 +148,18 @@ jobs:
148148
git config --global user.name "GitHub Actions"
149149
git pull
150150
151-
- name: Set up JDK 8
152-
uses: actions/setup-java@v2
151+
- name: Set up JDK
152+
uses: actions/setup-java@v3
153153
with:
154-
java-version: '8'
154+
java-version: '11'
155155
distribution: 'temurin'
156156

157157
- name: Build for Vaadin Directory
158158
run: mvn -B install -Pdirectory
159159
working-directory: vaadin-date-range-picker
160160

161161
- name: Upload asset
162-
uses: actions/upload-artifact@v2
162+
uses: actions/upload-artifact@v3
163163
with:
164164
name: vaadin-directory-files
165165
path: vaadin-date-range-picker/target/vaadin-date-range-picker-*.zip
@@ -195,9 +195,9 @@ jobs:
195195
git pull
196196
197197
- name: Setup - Java
198-
uses: actions/setup-java@v2
198+
uses: actions/setup-java@v3
199199
with:
200-
java-version: '8'
200+
java-version: '11'
201201
distribution: 'temurin'
202202
cache: 'maven'
203203

@@ -206,7 +206,7 @@ jobs:
206206
working-directory: vaadin-date-range-picker
207207

208208
- name: Upload licenses - Upload Artifact
209-
uses: actions/upload-artifact@v2
209+
uses: actions/upload-artifact@v3
210210
with:
211211
name: dependencies-licenses
212212
path: vaadin-date-range-picker/target/site

β€Ž.gitignoreβ€Ž

Lines changed: 98 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,109 @@
1-
**/target/
1+
# Maven
2+
target/
3+
pom.xml.tag
4+
pom.xml.releaseBackup
5+
pom.xml.versionsBackup
6+
pom.xml.next
7+
release.properties
8+
dependency-reduced-pom.xml
9+
buildNumber.properties
10+
.mvn/timing.properties
11+
# https://github.com/takari/maven-wrapper#usage-without-binary-jar
12+
.mvn/wrapper/maven-wrapper.jar
213

3-
# IDEA
4-
.idea/
5-
*.iml
614

7-
# MacOS
8-
.DS_Store
15+
# Compiled class file
16+
*.class
917

10-
# Eclipse
11-
.settings
12-
.classpath
13-
.project
18+
# Log file
19+
*.log
1420

15-
# The following files are generated/updated by vaadin-maven-plugin
16-
node_modules/
21+
# BlueJ files
22+
*.ctxt
1723

18-
# Browser drivers for local integration tests
19-
drivers/
20-
# Error screenshots generated by TestBench for failed integration tests
21-
error-screenshots/
24+
# Mobile Tools for Java (J2ME)
25+
.mtj.tmp/
26+
27+
# Package/Binary Files don't belong into a git repo
28+
*.jar
29+
*.war
30+
*.nar
31+
*.ear
32+
*.zip
33+
*.tar.gz
34+
*.rar
35+
*.dll
36+
*.exe
37+
*.bin
38+
39+
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
40+
hs_err_pid*
41+
42+
43+
# bin / compiled stuff
44+
target/
45+
46+
47+
# JRebel
48+
**/resources/rebel.xml
49+
**/resources/rebel-remote.xml
50+
51+
# eclispe stuff for root
52+
/.settings/
53+
/.classpath
54+
/.project
55+
56+
57+
# eclispe stuff for modules
58+
/*/.metadata/
59+
/*/.apt_generated_tests/
60+
/*/.settings/
61+
/*/.classpath
62+
/*/.project
63+
/*/RemoteSystemsTempFiles/
2264

23-
webpack.generated.js
2465

25-
#JRebel
26-
rebel.xml
66+
#vaadin/node webpack/frontend stuff
67+
# Ignore Node
68+
node/
2769

28-
#Vaadin
70+
# The following files are generated/updated by vaadin-maven-plugin
71+
node_modules/
72+
73+
# Vaadin
2974
package.json
3075
package-lock.json
76+
webpack.generated.js
3177
webpack.config.js
78+
tsconfig.json
79+
types.d.ts
80+
/*/frontend/generated/
81+
/*/frontend/index.html
82+
83+
#custom
84+
.flattened-pom.xml
85+
.tern-project
86+
87+
# Ignore Testcontainer generic folders
88+
PutObjectStoreDirHere/
89+
ObjectStore/
90+
91+
# == IntelliJ ==
92+
*.iml
93+
*.ipr
94+
95+
# Some files are user/installation independent and are used for configuring the IDE
96+
# See also https://stackoverflow.com/a/35279076
97+
98+
.idea/*
99+
!.idea/saveactions_settings.xml
100+
!.idea/checkstyle-idea.xml
101+
102+
!.idea/inspectionProfiles/
103+
.idea/inspectionProfiles/*
104+
!.idea/inspectionProfiles/Project_Default.xml
105+
106+
!.idea/codeStyles/
107+
.idea/codeStyles/*
108+
!.idea/codeStyles/codeStyleConfig.xml
109+
!.idea/codeStyles/Project.xml

β€Ž.idea/checkstyle-idea.xmlβ€Ž

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Ž.idea/codeStyles/Project.xmlβ€Ž

Lines changed: 82 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Ž.idea/codeStyles/codeStyleConfig.xmlβ€Ž

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Ž.idea/inspectionProfiles/Project_Default.xmlβ€Ž

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Ž.idea/saveactions_settings.xmlβ€Ž

Lines changed: 21 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
Β (0)