Skip to content

Commit 2efbc60

Browse files
AB-xdevAB-xdev
committed
Merge remote-tracking branch 'origin/update-from-template' into develop
2 parents 56ac70c + 57d19b4 commit 2efbc60

File tree

9 files changed

+43
-153
lines changed

9 files changed

+43
-153
lines changed

‎.github/dependabot.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ updates:
2121
time: "00:00"
2222
open-pull-requests-limit: 10
2323
ignore:
24+
- dependency-name: "org.yaml:snakeyaml"
25+
# Version 2+ requires Spring Boot 3
26+
versions: ">=2.0.0"
2427
- dependency-name: "org.springframework.boot:*"
2528
# Version 3+ requires Vaadin 24
2629
versions: ">=3.0.0"
30+
- dependency-name: "com.vaadin:*"
31+
versions: ">=24.0.0"

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -137,49 +137,6 @@ jobs:
137137
MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
138138
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
139139
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
140-
141-
build_directory: # Build a ZIP that can be uploaded to Vaadin Directory
142-
runs-on: ubuntu-latest
143-
needs: [prepare_release]
144-
steps:
145-
- uses: actions/checkout@v3
146-
147-
- name: Init Git and pull
148-
run: |
149-
git config --global user.email "[email protected]"
150-
git config --global user.name "GitHub Actions"
151-
git pull
152-
153-
- name: Set up JDK
154-
uses: actions/setup-java@v3
155-
with:
156-
java-version: '11'
157-
distribution: 'temurin'
158-
159-
- name: Build for Vaadin Directory
160-
run: mvn -B install -Pdirectory
161-
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
162-
163-
- name: Upload asset
164-
uses: actions/upload-artifact@v3
165-
with:
166-
name: vaadin-directory-files
167-
path: ${{ env.PRIMARY_MAVEN_MODULE }}/target/${{ env.PRIMARY_MAVEN_MODULE }}-*.zip
168-
if-no-files-found: error
169-
170-
- name: Get version
171-
id: version
172-
run: |
173-
echo "release=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_OUTPUT
174-
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
175-
176-
- name: Upload Release Asset
177-
uses: shogo82148/actions-upload-release-asset@v1
178-
with:
179-
upload_url: ${{ needs.prepare_release.outputs.upload_url }}
180-
asset_path: ${{ env.PRIMARY_MAVEN_MODULE }}/target/${{ env.PRIMARY_MAVEN_MODULE }}-${{ steps.version.outputs.release }}.zip
181-
asset_name: ${{ env.PRIMARY_MAVEN_MODULE }}-${{ steps.version.outputs.release }}.zip
182-
asset_content_type: application/zip
183140

184141
publish-pages:
185142
name: Publish dependencies and licenses to github pages
@@ -238,7 +195,7 @@ jobs:
238195

239196
after_release:
240197
runs-on: ubuntu-latest
241-
needs: [publish_central, build_directory]
198+
needs: [publish_central]
242199
steps:
243200
- uses: actions/checkout@v3
244201

‎.idea/checkstyle-idea.xml‎

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

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,4 @@ If the ``develop`` is ready for release, create a pull request to the ``master``
5757

5858
When the release is finished do the following:
5959
* Merge the auto-generated PR (with the incremented version number) back into the ``develop``
60-
* Upload the generated release asset zip into the [Vaadin Directory](https://vaadin.com/directory) and update the component there
60+
* Ensure that [Vaadin Directory](https://vaadin.com/directory) syncs the update and maybe update the component / version there

‎vaadin-addon-template-demo/src/main/resources/application.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
vaadin:
2+
whitelisted-packages: software/xdev,com/vaadin/flow
3+
4+
spring:
5+
devtools:
6+
restart:
7+
poll-interval: 2s
8+
quiet-period: 1s

‎vaadin-editable-label-demo/pom.xml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
<mainClass>software.xdev.vaadin.Application</mainClass>
3636

3737
<!-- Dependency-Versions -->
38-
<vaadin.version>23.3.6</vaadin.version>
38+
<vaadin.version>23.3.7</vaadin.version>
3939

40-
<org.springframework.boot.version>2.7.8</org.springframework.boot.version>
40+
<org.springframework.boot.version>2.7.9</org.springframework.boot.version>
4141
</properties>
4242

4343
<dependencyManagement>
@@ -80,7 +80,12 @@
8080
<groupId>com.vaadin</groupId>
8181
<artifactId>vaadin-spring-boot-starter</artifactId>
8282
</dependency>
83-
83+
<!-- Temporarily excluded by Vaadin due to "security vulnerability" -->
84+
<dependency>
85+
<groupId>org.yaml</groupId>
86+
<artifactId>snakeyaml</artifactId>
87+
<version>1.33</version>
88+
</dependency>
8489
<dependency>
8590
<groupId>org.springframework.boot</groupId>
8691
<artifactId>spring-boot-devtools</artifactId>
@@ -117,7 +122,7 @@
117122
<plugin>
118123
<groupId>org.apache.maven.plugins</groupId>
119124
<artifactId>maven-compiler-plugin</artifactId>
120-
<version>3.10.1</version>
125+
<version>3.11.0</version>
121126
<configuration>
122127
<release>${maven.compiler.release}</release>
123128
<compilerArgs>

‎vaadin-editable-label/assembly/MANIFEST.MF‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎vaadin-editable-label/assembly/assembly.xml‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎vaadin-editable-label/pom.xml‎

Lines changed: 3 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
5252

5353
<!-- Dependency-Versions -->
54-
<vaadin.version>23.3.6</vaadin.version>
54+
<vaadin.version>23.3.7</vaadin.version>
5555
</properties>
5656

5757
<dependencyManagement>
@@ -158,7 +158,7 @@
158158
<plugin>
159159
<groupId>org.apache.maven.plugins</groupId>
160160
<artifactId>maven-compiler-plugin</artifactId>
161-
<version>3.10.1</version>
161+
<version>3.11.0</version>
162162
<configuration>
163163
<release>${maven.compiler.release}</release>
164164
<compilerArgs>
@@ -169,7 +169,7 @@
169169
<plugin>
170170
<groupId>org.apache.maven.plugins</groupId>
171171
<artifactId>maven-javadoc-plugin</artifactId>
172-
<version>3.4.1</version>
172+
<version>3.5.0</version>
173173
<executions>
174174
<execution>
175175
<id>attach-javadocs</id>
@@ -268,44 +268,5 @@
268268
</plugins>
269269
</build>
270270
</profile>
271-
<profile>
272-
<id>directory</id>
273-
<build>
274-
<plugins>
275-
<plugin>
276-
<groupId>org.apache.maven.plugins</groupId>
277-
<artifactId>maven-assembly-plugin</artifactId>
278-
<version>3.4.2</version>
279-
<configuration>
280-
<appendAssemblyId>false</appendAssemblyId>
281-
<descriptors>
282-
<descriptor>assembly/assembly.xml</descriptor>
283-
</descriptors>
284-
</configuration>
285-
<executions>
286-
<execution>
287-
<goals>
288-
<goal>single</goal>
289-
</goals>
290-
<phase>install</phase>
291-
</execution>
292-
</executions>
293-
</plugin>
294-
<plugin>
295-
<groupId>org.apache.maven.plugins</groupId>
296-
<artifactId>maven-jar-plugin</artifactId>
297-
<version>3.3.0</version>
298-
<configuration>
299-
<!-- VAADIN files that shouldn't be included in add-ons -->
300-
<excludes>
301-
<exclude>
302-
META-INF/VAADIN/
303-
</exclude>
304-
</excludes>
305-
</configuration>
306-
</plugin>
307-
</plugins>
308-
</build>
309-
</profile>
310271
</profiles>
311272
</project>

0 commit comments

Comments
 (0)