Merge pull request #22 from xdev-software/develop

Release

Author: AB-xdev

.github/dependabot.yml

@@ -21,6 +21,11 @@ updates:
     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"

.github/workflows/release.yml

@@ -2,7 +2,7 @@ name: Release
 
 on:
   push:
-    branches: [ main ]
+    branches: [ master ]
 
 env:
   PRIMARY_MAVEN_MODULE: ${{ github.event.repository.name }}
@@ -92,7 +92,7 @@ jobs:
       with:
         tag_name: v${{ steps.version.outputs.release }}
         release_name: v${{ steps.version.outputs.release }}
-        commitish: main
+        commitish: master
         body: |
           ## [Changelog](https://github.com/xdev-software/${{ env.PRIMARY_MAVEN_MODULE }}/blob/develop/CHANGELOG.md#${{ steps.version.outputs.releasenumber }})
           See [Changelog#v${{ steps.version.outputs.release }}](https://github.com/xdev-software/${{ env.PRIMARY_MAVEN_MODULE }}/blob/develop/CHANGELOG.md#${{ steps.version.outputs.releasenumber }}) for more information.
@@ -137,49 +137,6 @@ jobs:
         MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
         MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
       working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
-  
-  build_directory: # Build a ZIP that can be uploaded to Vaadin Directory
-    runs-on: ubuntu-latest
-    needs: [prepare_release]
-    steps:
-    - uses: actions/checkout@v3
-    
-    - name: Init Git and pull
-      run: |
-        git config --global user.email "[email protected]"
-        git config --global user.name "GitHub Actions"
-        git pull
-    
-    - name: Set up JDK
-      uses: actions/setup-java@v3
-      with:
-        java-version: '11'
-        distribution: 'temurin'
-      
-    - name: Build for Vaadin Directory
-      run: mvn -B install -Pdirectory
-      working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
-      
-    - name: Upload asset
-      uses: actions/upload-artifact@v3
-      with:
-        name: vaadin-directory-files
-        path: ${{ env.PRIMARY_MAVEN_MODULE }}/target/${{ env.PRIMARY_MAVEN_MODULE }}-*.zip
-        if-no-files-found: error
-
-    - name: Get version
-      id: version
-      run: |
-       echo "release=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_OUTPUT
-      working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
-
-    - name: Upload Release Asset
-      uses: shogo82148/actions-upload-release-asset@v1
-      with:
-        upload_url: ${{ needs.prepare_release.outputs.upload_url }}
-        asset_path: ${{ env.PRIMARY_MAVEN_MODULE }}/target/${{ env.PRIMARY_MAVEN_MODULE }}-${{ steps.version.outputs.release }}.zip
-        asset_name: ${{ env.PRIMARY_MAVEN_MODULE }}-${{ steps.version.outputs.release }}.zip
-        asset_content_type: application/zip
 
   publish-pages:
     name: Publish dependencies and licenses to github pages
@@ -238,7 +195,7 @@ jobs:
 
   after_release:
     runs-on: ubuntu-latest
-    needs: [publish_central, build_directory]
+    needs: [publish_central]
     steps:
     - uses: actions/checkout@v3
 

.idea/checkstyle-idea.xml

@@ -1,2 +1,5 @@
-# 1.0.0 
-Initial release
+## 1.0.1
+* Updated dependencies
+
+## 1.0.0 
+Initial release

CHANGELOG.md

@@ -57,4 +57,4 @@ If the ``develop`` is ready for release, create a pull request to the ``master``
 
 When the release is finished do the following:
 * Merge the auto-generated PR (with the incremented version number) back into the ``develop``
-* Upload the generated release asset zip into the [Vaadin Directory](https://vaadin.com/directory) and update the component there
+* Ensure that [Vaadin Directory](https://vaadin.com/directory) syncs the update and maybe update the component / version there

CONTRIBUTING.md

@@ -1,4 +1,4 @@
-[![Published on Vaadin Directory](https://img.shields.io/badge/Vaadin%20Directory-published-00b4f0.svg)](https://vaadin.com/directory/component/vaadin-editable-label)
+[![Published on Vaadin Directory](https://img.shields.io/badge/Vaadin%20Directory-published-00b4f0.svg)](https://vaadin.com/directory/component/editable-labels-for-vaadin)
 [![Latest version](https://img.shields.io/maven-central/v/com.xdev-software/vaadin-editable-label)](https://mvnrepository.com/artifact/com.xdev-software/vaadin-editable-label)
 [![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/vaadin-editable-label/checkBuild.yml?branch=develop)](https://github.com/xdev-software/vaadin-editable-label/actions/workflows/checkBuild.yml?query=branch%3Adevelop)
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=xdev-software_vaadin-editable-label&metric=alert_status)](https://sonarcloud.io/dashboard?id=xdev-software_vaadin-editable-label)
@@ -10,11 +10,29 @@ A Vaadin Flow implementation for editable labels
 
 ![demo](assets/demo.png)
 
+This component provides a couple of elements that are displayed as simple read-only components, but can be edited with a
+simple click.
+Following components are available:
+
+* [EditableLabelTextField](./vaadin-editable-label/src/main/java/software/xdev/vaadin/editable_label/predefined/EditableLabelTextField.java)
+* [EditableLabelTextArea](./vaadin-editable-label/src/main/java/software/xdev/vaadin/editable_label/predefined/EditableLabelTextArea.java)
+* [EditableLabelComboBox](./vaadin-editable-label/src/main/java/software/xdev/vaadin/editable_label/predefined/EditableLabelComboBox.java)
+* [EditableLabelDatePicker](./vaadin-editable-label/src/main/java/software/xdev/vaadin/editable_label/predefined/EditableLabelDatePicker.java)
+* [EditableLabelNumberField](./vaadin-editable-label/src/main/java/software/xdev/vaadin/editable_label/predefined/EditableLabelNumberField.java)
+* [EditableLabelBigDecimalField](./vaadin-editable-label/src/main/java/software/xdev/vaadin/editable_label/predefined/EditableLabelBigDecimalField.java)
+
+It's also possible to create a custom element:
+
+```java 
+final EditableLabel<EmailField, String> emailLabel = new EditableLabel<>(new EmailField()).withValue(defaultValue);
+```
+
 ## Installation
 
 [Installation guide for the latest release](https://github.com/xdev-software/vaadin-editable-label/releases/latest#Installation)
 
 ## Run the Demo
+
 * Checkout the repo
 * Run ``mvn install && mvn -f vaadin-editable-label-demo spring-boot:run``
 * Open http://localhost:8080

README.md

@@ -35,9 +35,9 @@
 		<mainClass>software.xdev.vaadin.Application</mainClass>
 
 		<!-- Dependency-Versions -->
-		<vaadin.version>23.3.6</vaadin.version>
+		<vaadin.version>23.3.7</vaadin.version>
 
-		<org.springframework.boot.version>2.7.8</org.springframework.boot.version>
+		<org.springframework.boot.version>2.7.9</org.springframework.boot.version>
 	</properties>
 
 	<dependencyManagement>
@@ -80,7 +80,12 @@
 			<groupId>com.vaadin</groupId>
 			<artifactId>vaadin-spring-boot-starter</artifactId>
 		</dependency>
-
+		<!-- Temporarily excluded by Vaadin due to "security vulnerability" -->
+		<dependency>
+			<groupId>org.yaml</groupId>
+			<artifactId>snakeyaml</artifactId>
+			<version>1.33</version>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-devtools</artifactId>
@@ -117,7 +122,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.10.1</version>
+				<version>3.11.0</version>
 				<configuration>
 					<release>${maven.compiler.release}</release>
 					<compilerArgs>

vaadin-editable-label-demo/pom.xml

@@ -0,0 +1,8 @@
+vaadin:
+  whitelisted-packages: software/xdev,com/vaadin/flow
+
+spring:
+  devtools:
+    restart:
+      poll-interval: 2s
+      quiet-period: 1s