Skip to content

Update from template (auto-merged) #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Mar 24, 2025
Merged

Update from template (auto-merged) #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7d97305
Naming
AB-xdev Mar 14, 2025
53829e0
Simplify module extraction
AB-xdev Mar 14, 2025
cf59a66
Speed up check code
AB-xdev Mar 14, 2025
bb022ad
Use SPDX identifier for license name
AB-xdev Mar 17, 2025
da9442e
Update dependency com.mycila:license-maven-plugin to v5
xdev-renovate Mar 20, 2025
f1d643f
Merge pull request #141 from xdev-software/renovate/com.mycila-licens…
AB-xdev Mar 20, 2025
2e7b1b6
sonarcloud was renamed to sonarqubecloud
AB-xdev Mar 21, 2025
888b4ce
Fix branch deletion being not detected
AB-xdev Mar 21, 2025
8f154b7
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Mar 21, 2025
530ed04
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Mar 21, 2025
c6123ca
Merge remote-tracking branch 'origin/update-from-template'
AB-xdev Mar 21, 2025
afdb0a7
Merge branch 'develop' into update-from-template-merged
xdev-gh-bot Mar 24, 2025
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
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
cache: 'maven'

- name: Build with Maven
run: ./mvnw -B clean package -Pproduction
run: ./mvnw -B clean package -Pproduction -T2C

- name: Check for uncommited changes
run: |
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
run: |
mvnwPath=$(readlink -f ./mvnw)
modules=("") # root
modules+=($(grep -ozP '(?<=module>)[^<]+' 'pom.xml' | tr -d '\0'))
modules+=($(grep -oP '(?<=<module>)[^<]+' 'pom.xml'))
for i in "${modules[@]}"
do
echo "Processing $i/pom.xml"
Expand Down Expand Up @@ -124,7 +124,7 @@ jobs:
git config --global user.name "GitHub Actions"
git pull

- name: Set up JDK Apache Maven Central
- name: Set up JDK OSSRH
uses: actions/setup-java@v4
with: # running setup-java again overwrites the settings.xml
java-version: '17'
Expand All @@ -135,7 +135,7 @@ jobs:
gpg-passphrase: MAVEN_GPG_PASSPHRASE
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}

- name: Publish to Apache Maven Central
- name: Publish to OSSRH
run: ../mvnw -B deploy -Possrh -DskipTests
env:
MAVEN_CENTRAL_USERNAME: ${{ secrets.S01_OSS_SONATYPE_MAVEN_USERNAME }}
Expand Down Expand Up @@ -191,7 +191,7 @@ jobs:
run: |
mvnwPath=$(readlink -f ./mvnw)
modules=("") # root
modules+=($(grep -ozP '(?<=module>)[^<]+' 'pom.xml' | tr -d '\0'))
modules+=($(grep -oP '(?<=<module>)[^<]+' 'pom.xml'))
for i in "${modules[@]}"
do
echo "Processing $i/pom.xml"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-from-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ jobs:
GH_TOKEN: ${{ secrets.UPDATE_FROM_TEMPLATE_PAT }}
run: |
not_failed_conclusion="skipped|neutral|success"
not_relevant_app_slug="dependabot|github-pages|sonarcloud"
not_relevant_app_slug="dependabot|github-pages|sonarqubecloud"

echo "Waiting for checks to start..."
sleep 40s
Expand All @@ -212,7 +212,7 @@ jobs:

echo "Checking if update-branch-merged exists"
git fetch
if [[ $(git rev-parse origin/${{ env.UPDATE_BRANCH_MERGED }}) ]]; then
if [[ $(git ls-remote --heads origin refs/heads/${{ env.UPDATE_BRANCH_MERGED }}) ]]; then
echo "Branch still exists; Continuing..."
else
echo "Branch origin/${{ env.UPDATE_BRANCH_MERGED }} is missing"
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

<licenses>
<license>
<name>Apache License, Version 2.0</name>
<name>Apache-2.0</name>
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
Expand Down
4 changes: 2 additions & 2 deletions vaadin-simple-grid-filter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

<licenses>
<license>
<name>Apache License, Version 2.0</name>
<name>Apache-2.0</name>
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
Expand Down Expand Up @@ -130,7 +130,7 @@
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>4.6</version>
<version>5.0.0</version>
<configuration>
<properties>
<email>${project.organization.url}</email>
Expand Down
Loading