Skip to content

Commit c5eeae2

Browse files
AB-xdevAB-xdev
committed
Merge remote-tracking branch 'origin/update-from-template' into develop
2 parents 3b5d616 + d081258 commit c5eeae2

File tree

8 files changed

+35
-17
lines changed

8 files changed

+35
-17
lines changed

‎.config/checkstyle/checkstyle.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@
3434
<property name="checks" value="."/>
3535
<property name="files" value="[\\/](src)?gen[\\/].*\.java$"/>
3636
</module>
37+
<module name="SuppressionSingleFilter">
38+
<property name="checks" value="."/>
39+
<property name="files" value="[\\/]src[\\/]gen(erated)?[\\/].*\.java$"/>
40+
</module>
3741
<!-- Test code -->
3842
<module name="SuppressionSingleFilter">
3943
<property name="checks" value="MagicNumberCheck"/>

‎.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
Add the following lines to your pom:
102102
```XML
103103
<dependency>
104-
<groupId>com.xdev-software</groupId>
104+
<groupId>software.xdev</groupId>
105105
<artifactId>${{ env.PRIMARY_MAVEN_MODULE }}</artifactId>
106106
<version>${{ steps.version.outputs.release }}</version>
107107
</dependency>
@@ -136,8 +136,8 @@ jobs:
136136
- name: Publish to Apache Maven Central
137137
run: mvn -B deploy -Possrh
138138
env:
139-
MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
140-
MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
139+
MAVEN_CENTRAL_USERNAME: ${{ secrets.S01_OSS_SONATYPE_MAVEN_USERNAME }}
140+
MAVEN_CENTRAL_TOKEN: ${{ secrets.S01_OSS_SONATYPE_MAVEN_TOKEN }}
141141
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
142142
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
143143

‎.github/workflows/sonar.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ jobs:
3939
java-version: 17
4040

4141
- name: Cache SonarCloud packages
42-
uses: actions/cache@v3
42+
uses: actions/cache@v4
4343
with:
4444
path: ~/.sonar/cache
4545
key: ${{ runner.os }}-sonar
4646
restore-keys: ${{ runner.os }}-sonar
4747

4848
- name: Cache Maven packages
49-
uses: actions/cache@v3
49+
uses: actions/cache@v4
5050
with:
5151
path: ~/.m2
5252
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}

‎.github/workflows/test-deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ jobs:
2727
run: mvn -B deploy -Possrh
2828
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
2929
env:
30-
MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
31-
MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
30+
MAVEN_CENTRAL_USERNAME: ${{ secrets.S01_OSS_SONATYPE_MAVEN_USERNAME }}
31+
MAVEN_CENTRAL_TOKEN: ${{ secrets.S01_OSS_SONATYPE_MAVEN_TOKEN }}
3232
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[![Published on Vaadin Directory](https://img.shields.io/badge/Vaadin%20Directory-published-00b4f0?logo=vaadin)](https://vaadin.com/directory/component/leafletmap-for-vaadin)
2-
[![Latest version](https://img.shields.io/maven-central/v/com.xdev-software/vaadin-maps-leaflet-flow?logo=apache%20maven)](https://mvnrepository.com/artifact/com.xdev-software/vaadin-maps-leaflet-flow)
2+
[![Latest version](https://img.shields.io/maven-central/v/software.xdev/vaadin-maps-leaflet-flow?logo=apache%20maven)](https://mvnrepository.com/artifact/software.xdev/vaadin-maps-leaflet-flow)
33
[![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/vaadin-maps-leaflet-flow/checkBuild.yml?branch=develop)](https://github.com/xdev-software/vaadin-maps-leaflet-flow/actions/workflows/checkBuild.yml?query=branch%3Adevelop)
44
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=xdev-software_vaadin-maps-leaflet-flow&metric=alert_status)](https://sonarcloud.io/dashboard?id=xdev-software_vaadin-maps-leaflet-flow)
55
![Vaadin 24+](https://img.shields.io/badge/Vaadin%20Platform/Flow-24+-00b4f0)

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66

7-
<groupId>com.xdev-software</groupId>
7+
<groupId>software.xdev</groupId>
88
<artifactId>vaadin-maps-leaflet-flow-root</artifactId>
99
<version>4.1.1-SNAPSHOT</version>
1010
<packaging>pom</packaging>

‎vaadin-maps-leaflet-flow-demo/pom.xml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66

7-
<groupId>com.xdev-software</groupId>
7+
<groupId>software.xdev</groupId>
88
<artifactId>vaadin-maps-leaflet-flow-demo</artifactId>
99
<version>4.1.1-SNAPSHOT</version>
1010
<packaging>jar</packaging>
@@ -26,7 +26,7 @@
2626
<mainClass>software.xdev.vaadin.Application</mainClass>
2727

2828
<!-- Dependency-Versions -->
29-
<vaadin.version>24.3.2</vaadin.version>
29+
<vaadin.version>24.3.3</vaadin.version>
3030

3131
<org.springframework.boot.version>3.2.1</org.springframework.boot.version>
3232
</properties>
@@ -58,9 +58,16 @@
5858
<dependency>
5959
<groupId>com.vaadin</groupId>
6060
<artifactId>vaadin-core</artifactId>
61+
<exclusions>
62+
<!-- https://github.com/vaadin/flow/issues/18449 -->
63+
<exclusion>
64+
<groupId>com.vaadin</groupId>
65+
<artifactId>copilot</artifactId>
66+
</exclusion>
67+
</exclusions>
6168
</dependency>
6269
<dependency>
63-
<groupId>com.xdev-software</groupId>
70+
<groupId>software.xdev</groupId>
6471
<artifactId>vaadin-maps-leaflet-flow</artifactId>
6572
<version>${project.version}</version>
6673
</dependency>

‎vaadin-maps-leaflet-flow/pom.xml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66

7-
<groupId>com.xdev-software</groupId>
7+
<groupId>software.xdev</groupId>
88
<artifactId>vaadin-maps-leaflet-flow</artifactId>
99
<version>4.1.1-SNAPSHOT</version>
1010
<packaging>jar</packaging>
@@ -49,7 +49,7 @@
4949
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
5050

5151
<!-- Dependency-Versions -->
52-
<vaadin.version>24.3.2</vaadin.version>
52+
<vaadin.version>24.3.3</vaadin.version>
5353
</properties>
5454

5555
<dependencyManagement>
@@ -91,18 +91,25 @@
9191
<distributionManagement>
9292
<snapshotRepository>
9393
<id>ossrh</id>
94-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
94+
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
9595
</snapshotRepository>
9696
<repository>
9797
<id>ossrh</id>
98-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
98+
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
9999
</repository>
100100
</distributionManagement>
101101

102102
<dependencies>
103103
<dependency>
104104
<groupId>com.vaadin</groupId>
105105
<artifactId>vaadin-core</artifactId>
106+
<exclusions>
107+
<!-- https://github.com/vaadin/flow/issues/18449 -->
108+
<exclusion>
109+
<groupId>com.vaadin</groupId>
110+
<artifactId>copilot</artifactId>
111+
</exclusion>
112+
</exclusions>
106113
</dependency>
107114
<!-- JSON JACKSON -->
108115
<dependency>
@@ -268,7 +275,7 @@
268275
<extensions>true</extensions>
269276
<configuration>
270277
<serverId>ossrh</serverId>
271-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
278+
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
272279
<!-- Sometimes OSSRH is really slow -->
273280
<stagingProgressTimeoutMinutes>30</stagingProgressTimeoutMinutes>
274281
<autoReleaseAfterClose>true</autoReleaseAfterClose>

0 commit comments

Comments
 (0)