Merge pull request #356 from xdev-software/develop

Release

Author: AB-xdev

.config/pmd/ruleset.xml

@@ -59,6 +59,9 @@
 		<!-- Prohibits singleton pattern -->
 		<exclude name="MutableStaticState"/>
 
+		<!-- Checks LoC, already handled by Checkstyle -->
+		<exclude name="NcssCount"/>
+
 		<!-- Some override methods or Junit require this -->
 		<exclude name="SignatureDeclareThrowsException"/>
 

.github/workflows/release.yml

@@ -160,7 +160,7 @@ jobs:
         cache: 'maven'
 
     - name: Build site
-      run: ../mvnw -B site -DskipTests
+      run: ../mvnw -B compile site -DskipTests -T2C
       working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
 
     - name: Deploy to Github pages

.github/workflows/test-deploy.yml

@@ -24,7 +24,7 @@ jobs:
         gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
 
     - name: Publish to OSSRH
-      run: ../mvnw -B deploy -Possrh
+      run: ../mvnw -B deploy -Possrh -DskipTests
       working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
       env:
         MAVEN_CENTRAL_USERNAME: ${{ secrets.S01_OSS_SONATYPE_MAVEN_USERNAME }}

CHANGELOG.md

@@ -1,5 +1,9 @@
+## 4.1.1
+* Only use client-side locale for formatting when no ``formatLocale`` has been set #353
+
 ## 4.1.0
 * Updated to Vaadin 24.4
+* Minor code improvements
 
 ## 4.0.2
 * ⚠️ GroupId changed from ``com.xdev-software`` to ``software.xdev``

CONTRIBUTING.md

@@ -58,3 +58,31 @@ 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``
 * Ensure that [Vaadin Directory](https://vaadin.com/directory) syncs the update and maybe update the component / version there
+
+### Release failures
+
+There are 2 modes of release failure:
+1. The remote server was e.g. down and non of the artifacts got published
+2. There was a build failure during release and only parts of the artifacts got released
+
+In case 1 we can re-release the existing version,<br/>in case 2 we have to release a new version when we can't get the artifacts deleted (as is the case with Maven Central)
+
+#### How-to: Re-Releasing an existing version
+
+1. Delete the release on GitHub
+2. Delete the release Git tag from the repo (locally and remote!)
+3. Delete the ``master``-Branch and re-create it from the ``develop`` branch (or reset it to the state before the release-workflow commits have been done)
+    * This requires __temporarily__ removing the branch protection
+    * Once this was done a new release is triggered immediately!
+
+#### How-to: Releasing a new version
+
+1. Merge the ``master`` branch back into ``develop`` (or another temporary branch)
+2. Make sure all master branch versions are prepared for a new release<br/>e.g. if the broken release was ``1.0.0`` the version should now be at ``1.0.1-SNAPSHOT`` - the ``SNAPSHOT`` is important for the workflow!
+3. Mark the broken release as broken e.g. inside the Changelog, GitHub Release page, etc.<br/>
+You can use something like this:
+    ```
+    > [!WARNING]
+    > This release is broken as my cat accidentally clicked the abort button during the process
+    ```
+4. Merge the changes back into the ``master`` branch to trigger a new release

pom.xml

@@ -70,7 +70,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-pmd-plugin</artifactId>
-						<version>3.23.0</version>
+						<version>3.24.0</version>
 						<configuration>
 							<includeTests>true</includeTests>
 							<printFailingErrors>true</printFailingErrors>
@@ -82,12 +82,12 @@
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-core</artifactId>
-								<version>7.3.0</version>
+								<version>7.4.0</version>
 							</dependency>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-java</artifactId>
-								<version>7.3.0</version>
+								<version>7.4.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>

renovate.json5

@@ -9,6 +9,16 @@
         "maven"
       ],
       "enabled": false
+    },
+    {
+      "description": "Group net.sourceforge.pmd",
+      "matchPackagePatterns": [
+        "^net.sourceforge.pmd"
+      ],
+      "datasources": [
+        "maven"
+      ],
+      "groupName": "net.sourceforge.pmd"
     }
   ]
 }

vaadin-date-range-picker-demo/pom.xml

@@ -29,9 +29,9 @@
 		<mainClass>software.xdev.vaadin.Application</mainClass>
 
 		<!-- Dependency-Versions -->
-		<vaadin.version>24.4.4</vaadin.version>
+		<vaadin.version>24.4.7</vaadin.version>
 
-		<org.springframework.boot.version>3.3.1</org.springframework.boot.version>
+		<org.springframework.boot.version>3.3.2</org.springframework.boot.version>
 	</properties>
 
 	<dependencyManagement>

vaadin-date-range-picker/pom.xml

@@ -49,7 +49,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
 		<!-- Dependency-Versions -->
-		<vaadin.version>24.4.4</vaadin.version>
+		<vaadin.version>24.4.7</vaadin.version>
 	</properties>
 
 	<dependencyManagement>
@@ -112,12 +112,12 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-site-plugin</artifactId>
-					<version>4.0.0-M15</version>
+					<version>4.0.0-M16</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-project-info-reports-plugin</artifactId>
-					<version>3.6.1</version>
+					<version>3.6.2</version>
 				</plugin>
 			</plugins>
 		</pluginManagement>
@@ -180,7 +180,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.7.0</version>
+				<version>3.8.0</version>
 				<executions>
 					<execution>
 						<id>attach-javadocs</id>
@@ -333,7 +333,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-pmd-plugin</artifactId>
-						<version>3.23.0</version>
+						<version>3.24.0</version>
 						<configuration>
 							<includeTests>true</includeTests>
 							<printFailingErrors>true</printFailingErrors>
@@ -345,12 +345,12 @@
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-core</artifactId>
-								<version>7.3.0</version>
+								<version>7.4.0</version>
 							</dependency>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-java</artifactId>
-								<version>7.3.0</version>
+								<version>7.4.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>

vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/ui/DateRangePicker.java

@@ -76,7 +76,7 @@ public class DateRangePicker<D extends DateRange> extends Composite<VerticalLayo
 	/*
 	 * Config
 	 */
-	
+	protected boolean useClientSideLocale = true;
 	protected Optional<Locale> formatLocale = Optional.empty();
 	protected ItemLabelGenerator<D> dateRangeLocalizerFunction = DateRange::getDefaultDescription;
 	protected Optional<DatePickerI18n> datePickerI18n = Optional.empty();
@@ -149,8 +149,15 @@ public Optional<DatePickerI18n> getDatePickerI18n()
 		return this.datePickerI18n;
 	}
 
+	/**
+	 * Sets the locale used for formatting the "expand" button.
+	 * <p>If the locale is <code>null</code> (default) the clientside locale will be used or {@link Locale#US} if none
+	 * could be detected.
+	 * </p>
+	 */
 	public DateRangePicker<D> withFormatLocale(final Locale locale)
 	{
+		this.useClientSideLocale = locale == null;
 		this.formatLocale = Optional.ofNullable(locale);
 		return this;
 	}
@@ -265,7 +272,10 @@ protected void onAttach(final AttachEvent attachEvent)
 
 	protected void setLocaleFromClient()
 	{
-		this.formatLocale = Optional.ofNullable(VaadinService.getCurrentRequest().getLocale());
+		if(this.useClientSideLocale)
+		{
+			this.formatLocale = Optional.ofNullable(VaadinService.getCurrentRequest().getLocale());
+		}
 	}
 
 	protected void addClickOutsideListener()