Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Auto detect text files and perform LF normalization
* text=auto
9 changes: 0 additions & 9 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,3 @@ updates:
# Run it at a specific time so that we don't get emails all day long
time: "00:00"
open-pull-requests-limit: 10
ignore:
- dependency-name: "org.yaml:snakeyaml"
# Version 2+ requires Spring Boot 3
versions: ">=2.0.0"
- dependency-name: "org.springframework.boot:*"
# Version 3+ requires Vaadin 24
versions: ">=3.0.0"
- dependency-name: "com.vaadin:*"
versions: ">=24.0.0"
2 changes: 1 addition & 1 deletion .github/workflows/checkBuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

strategy:
matrix:
java: [11, 17]
java: [17]
distribution: [temurin]

steps:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v3
with:
java-version: '11'
java-version: '17'
distribution: 'temurin'
cache: 'maven'

Expand Down Expand Up @@ -122,7 +122,7 @@ jobs:
- name: Set up JDK Apache Maven Central
uses: actions/setup-java@v3
with: # running setup-java again overwrites the settings.xml
java-version: '11'
java-version: '17'
distribution: 'temurin'
server-id: ossrh
server-username: MAVEN_CENTRAL_USERNAME
Expand Down Expand Up @@ -154,7 +154,7 @@ jobs:
- name: Setup - Java
uses: actions/setup-java@v3
with:
java-version: '11'
java-version: '17'
distribution: 'temurin'
cache: 'maven'

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sonar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ jobs:
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis

- name: Set up JDK 11
- name: Set up JDK
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 11
java-version: 17

- name: Cache SonarCloud packages
uses: actions/cache@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
uses: actions/setup-java@v3
with: # running setup-java again overwrites the settings.xml
distribution: 'temurin'
java-version: '11'
java-version: '17'
server-id: ossrh
server-username: MAVEN_CENTRAL_USERNAME
server-password: MAVEN_CENTRAL_TOKEN
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ vite.config.ts
vite.generated.ts
/*/frontend/generated/
/*/frontend/index.html
/*/src/main/dev-bundle/

#custom
.flattened-pom.xml
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ We encourage you to read the [contribution instructions by GitHub](https://guide
### Software Requirements
You should have the following things installed:
* Git
* Java 11 or 17 - should be as unmodified as possible (Recommended: [Eclipse Adoptium](https://adoptium.net/temurin/releases/))
* Java 17 - should be as unmodified as possible (Recommended: [Eclipse Adoptium](https://adoptium.net/temurin/releases/))
* Maven

### Recommended setup
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
[![Latest version](https://img.shields.io/maven-central/v/com.xdev-software/vaadin-addon-template)](https://mvnrepository.com/artifact/com.xdev-software/vaadin-addon-template)
[![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/vaadin-addon-template/checkBuild.yml?branch=develop)](https://github.com/xdev-software/vaadin-addon-template/actions/workflows/checkBuild.yml?query=branch%3Adevelop)
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=xdev-software_vaadin-addon-template&metric=alert_status)](https://sonarcloud.io/dashboard?id=xdev-software_vaadin-addon-template)
![Vaadin 23+](https://img.shields.io/badge/Vaadin%20Platform/Flow-23+-00b4f0.svg)
![Vaadin 24+](https://img.shields.io/badge/Vaadin%20Platform/Flow-24+-00b4f0.svg)

# vaadin-addon-template
A Vaadin Template Repo
Expand Down
7 changes: 3 additions & 4 deletions vaadin-addon-template-demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<properties>
<license.licenseName>apache_v2</license.licenseName>

<javaVersion>11</javaVersion>
<javaVersion>17</javaVersion>
<maven.compiler.release>${javaVersion}</maven.compiler.release>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand All @@ -35,9 +35,9 @@
<mainClass>software.xdev.vaadin.Application</mainClass>

<!-- Dependency-Versions -->
<vaadin.version>23.3.7</vaadin.version>
<vaadin.version>24.0.3</vaadin.version>

<org.springframework.boot.version>2.7.9</org.springframework.boot.version>
<org.springframework.boot.version>3.0.5</org.springframework.boot.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -83,7 +83,6 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.33</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down
6 changes: 3 additions & 3 deletions vaadin-addon-template/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@
</licenses>

<properties>
<javaVersion>11</javaVersion>
<javaVersion>17</javaVersion>
<maven.compiler.release>${javaVersion}</maven.compiler.release>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<!-- Dependency-Versions -->
<vaadin.version>23.3.7</vaadin.version>
<vaadin.version>24.0.3</vaadin.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -111,7 +111,7 @@
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>4.1</version>
<version>4.2</version>
<configuration>
<properties>
<email>${project.organization.url}</email>
Expand Down