Skip to content
This repository was archived by the owner on Aug 12, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
d21af9c
Merge pull request #190 from xdev-software/master
AB-xdev Sep 14, 2023
48f0a23
Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.5.0 to 3.6.0
dependabot[bot] Sep 18, 2023
e3d030b
Bump vaadin.version from 24.1.9 to 24.1.10
dependabot[bot] Sep 19, 2023
ff31e06
Bump org.springframework.boot.version from 3.1.3 to 3.1.4
dependabot[bot] Sep 22, 2023
c2ca04b
Bump com.mycila:license-maven-plugin from 4.2 to 4.3
dependabot[bot] Sep 28, 2023
fca16a1
Merge pull request #7 from xdev-software/dependabot/maven/com.mycila-…
AB-xdev Sep 29, 2023
fa88646
Merge pull request #6 from xdev-software/dependabot/maven/org.apache.…
AB-xdev Sep 29, 2023
9f88650
Merge branch 'update-from-template'
AB-xdev Oct 2, 2023
3790677
Merge pull request #78 from xdev-software/dependabot/maven/vaadin.ver…
AB-xdev Oct 2, 2023
03b49d4
Merge pull request #79 from xdev-software/dependabot/maven/org.spring…
AB-xdev Oct 2, 2023
8980688
Update update-from-template.yml
AB-xdev Oct 2, 2023
747b92f
Merge pull request #4 from xdev-software/replace-repo-sync-pull-request
AB-xdev Oct 2, 2023
3442223
Merge pull request #8 from xdev-software/update-from-template
AB-xdev Oct 2, 2023
cfc0913
Replace outdated repo-sync/pull-request
AB-xdev Oct 2, 2023
c6edb6f
Merge pull request #82 from xdev-software/update-from-template
AB-xdev Oct 2, 2023
306805c
Bump vaadin.version from 24.1.10 to 24.1.11
dependabot[bot] Oct 2, 2023
621031c
Merge pull request #83 from xdev-software/dependabot/maven/vaadin.ver…
AB-xdev Oct 2, 2023
c875740
Merge remote-tracking branch 'origin/update-from-template' into develop
AB-xdev Oct 2, 2023
0699efb
Replace GIF with AVIF
AB-xdev Oct 2, 2023
e545e02
Replace gif with avif
AB-xdev Oct 2, 2023
7273c89
Create demo.avif
AB-xdev Oct 4, 2023
415be2e
Merge remote-tracking branch 'origin/update-from-template' into develop
AB-xdev Oct 4, 2023
472f947
Bump vaadin.version from 24.1.11 to 24.1.12
dependabot[bot] Oct 6, 2023
47c0ada
Merge pull request #85 from xdev-software/dependabot/maven/vaadin.ver…
AB-xdev Oct 13, 2023
87f837a
Bump vaadin.version from 24.1.12 to 24.2.0
dependabot[bot] Oct 17, 2023
6b67652
Bump org.springframework.boot.version from 3.1.4 to 3.1.5
dependabot[bot] Oct 20, 2023
6cb43b9
Fix syntax for edit
AB-xdev Oct 25, 2023
7f6fd29
Update update-from-template.yml
AB-xdev Oct 25, 2023
4a9626f
Merge pull request #9 from xdev-software/update-from-template
AB-xdev Oct 25, 2023
b2b2122
Merge pull request #86 from xdev-software/dependabot/maven/vaadin.ver…
AB-xdev Oct 25, 2023
7d0fc6b
Merge pull request #87 from xdev-software/dependabot/maven/org.spring…
AB-xdev Oct 25, 2023
d51d168
Merge pull request #88 from xdev-software/update-from-template
AB-xdev Oct 25, 2023
6c3628b
Compile with Java 21
AB-xdev Oct 26, 2023
36b201e
Recommend Java 21 for development
AB-xdev Oct 26, 2023
81ae43b
Merge pull request #89 from xdev-software/update-from-template
AB-xdev Oct 26, 2023
8dee66b
Bump vaadin.version from 24.2.0 to 24.2.1
dependabot[bot] Oct 27, 2023
4028697
Merge pull request #90 from xdev-software/dependabot/maven/vaadin.ver…
AB-xdev Nov 6, 2023
08519b8
Added spring boot info to installation guide
AB-xdev Nov 6, 2023
d3ec5fa
Bump vaadin.version from 24.2.1 to 24.2.2
dependabot[bot] Nov 7, 2023
77bcbb3
Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.0 to 3.6.2
dependabot[bot] Nov 7, 2023
863ce33
Merge pull request #10 from xdev-software/dependabot/maven/org.apache…
AB-xdev Nov 7, 2023
8cbecb8
Merge pull request #91 from xdev-software/dependabot/maven/vaadin.ver…
AB-xdev Nov 7, 2023
5cd919d
Merge remote-tracking branch 'origin/update-from-template'
AB-xdev Nov 7, 2023
0cf81c0
Place bracket correctly
AB-xdev Nov 7, 2023
aeccd61
Merge pull request #11 from xdev-software/update-from-template
AB-xdev Nov 7, 2023
eccee27
Merge pull request #94 from xdev-software/update-from-template
AB-xdev Nov 7, 2023
97878a3
Merge remote-tracking branch 'origin/update-from-template' into develop
AB-xdev Nov 7, 2023
5667315
Bump vaadin.version from 24.2.2 to 24.2.4
dependabot[bot] Nov 22, 2023
30d8aac
Merge pull request #96 from xdev-software/dependabot/maven/vaadin.ver…
AB-xdev Nov 23, 2023
e458faa
Bump actions/setup-java from 3 to 4
dependabot[bot] Nov 30, 2023
4efe636
Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.2 to 3.6.3
dependabot[bot] Dec 4, 2023
a1f982e
Merge pull request #12 from xdev-software/dependabot/github_actions/a…
AB-xdev Dec 4, 2023
122fc93
Merge pull request #13 from xdev-software/dependabot/maven/org.apache…
AB-xdev Dec 4, 2023
3298401
Merge remote-tracking branch 'origin/update-from-template'
AB-xdev Dec 6, 2023
42758e8
Bump org.springframework.boot.version from 3.1.5 to 3.2.0
dependabot[bot] Dec 6, 2023
6bc8bdc
Bump vaadin.version from 24.2.4 to 24.2.5
dependabot[bot] Dec 6, 2023
736cd79
Merge pull request #97 from xdev-software/dependabot/maven/org.spring…
AB-xdev Dec 6, 2023
28b1893
Merge pull request #98 from xdev-software/dependabot/maven/vaadin.ver…
AB-xdev Dec 6, 2023
e5e62c8
Fix format of release description
AB-xdev Dec 6, 2023
4cd258e
Bump actions/upload-artifact from 3 to 4
dependabot[bot] Dec 15, 2023
bff536e
Bump org.springframework.boot.version from 3.2.0 to 3.2.1
dependabot[bot] Dec 22, 2023
dbca559
Bump vaadin.version from 24.2.5 to 24.3.2
dependabot[bot] Dec 25, 2023
d200d7e
Bump org.apache.maven.plugins:maven-compiler-plugin
dependabot[bot] Dec 25, 2023
cccbc91
Merge pull request #14 from xdev-software/dependabot/github_actions/a…
AB-xdev Jan 11, 2024
4512bf8
Merge pull request #16 from xdev-software/dependabot/maven/org.apache…
AB-xdev Jan 11, 2024
4c44c8c
Rename
AB-xdev Jan 11, 2024
7466546
Merge branch 'update-from-template'
AB-xdev Jan 11, 2024
3534b36
Merge pull request #108 from xdev-software/dependabot/maven/org.sprin…
AB-xdev Jan 11, 2024
22a0d5c
Merge pull request #109 from xdev-software/dependabot/maven/vaadin.ve…
AB-xdev Jan 11, 2024
cd1c9a4
Include jakarta in import order
AB-xdev Jan 11, 2024
c630864
Rework checkstyle
AB-xdev Jan 11, 2024
0b45e09
Merge remote-tracking branch 'origin/update-from-template'
AB-xdev Jan 11, 2024
09d20ce
Checkstyle + Maven
AB-xdev Jan 11, 2024
ff92e4a
Run Checkstyle in workflow
AB-xdev Jan 11, 2024
39be717
Adjust ignored workflow paths
AB-xdev Jan 11, 2024
267a558
Merge pull request #112 from xdev-software/update-from-template
AB-xdev Jan 11, 2024
eabda82
Fix maven checkstyle
AB-xdev Jan 11, 2024
e99f23c
Rename
AB-xdev Jan 11, 2024
5d23494
Merge branch 'update-from-template'
AB-xdev Jan 11, 2024
c10c778
Fix maven warning
AB-xdev Jan 11, 2024
e8e18e6
Merge pull request #114 from xdev-software/update-from-template
AB-xdev Jan 11, 2024
03f0cb8
Ignore new Vaadin 24.3 blob and lock files in repo
AB-xdev Jan 11, 2024
09ba833
Merge remote-tracking branch 'origin/update-from-template' into develop
AB-xdev Jan 11, 2024
96a73ae
Fix checkstyle
AB-xdev Jan 11, 2024
969bc38
Exclude "internal" Vaadin Copilot project
AB-xdev Jan 15, 2024
1714a0e
Ignore src/gen(erated) files
AB-xdev Jan 16, 2024
0183900
Bump vaadin.version from 24.3.2 to 24.3.3
dependabot[bot] Jan 17, 2024
6fdcf46
Bump actions/cache from 3 to 4
dependabot[bot] Jan 18, 2024
cef86ea
Merge pull request #18 from xdev-software/dependabot/github_actions/a…
AB-xdev Jan 18, 2024
017e828
Merge pull request #19 from xdev-software/update-from-template
AB-xdev Jan 18, 2024
85dfdc9
``com.xdev-software`` -> ``software.xdev``
AB-xdev Jan 18, 2024
7cb155b
Rename
AB-xdev Jan 18, 2024
87e7bde
Merge branch 'update-from-template'
AB-xdev Jan 18, 2024
4233c0f
Merge pull request #115 from xdev-software/dependabot/maven/vaadin.ve…
AB-xdev Jan 18, 2024
4cfb4dc
Use new sonatype server
AB-xdev Jan 18, 2024
d081258
Merge remote-tracking branch 'origin/update-from-template'
AB-xdev Jan 18, 2024
d1be2c2
Merge remote-tracking branch 'origin/update-from-template' into develop
AB-xdev Jan 18, 2024
70ed252
Update CHANGELOG.md
AB-xdev Jan 18, 2024
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
141 changes: 141 additions & 0 deletions .config/checkstyle/checkstyle.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
<module name="Checker">
<!-- Only check code -->
<property name="fileExtensions" value="java"/>
<property name="severity" value="error"/>

<property name="tabWidth" value="4"/>

<module name="SuppressionFilter">
<property name="file" value=".config/checkstyle/suppressions.xml"/>
</module>

<module name="FileLength"/>
<module name="LineLength">
<property name="max" value="120"/>
<property name="fileExtensions" value="java"/>
<!-- Ignore default + links in comments -->
<property name="ignorePattern" value="(^(package|import))|(^\s*(\/\/|\*) .*https?.*$)"/>
</module>
<module name="NewlineAtEndOfFile"/>

<module name="RegexpSingleline">
<!-- Ignore inside block comments (*) -->
<property name="format" value="[^\s\*][\s]{1,}$"/>
<property name="minimum" value="0"/>
<property name="maximum" value="0"/>
<property name="message" value="Line has trailing whitespaces"/>
</module>

<!-- Generated code -->
<module name="SuppressionSingleFilter">
<property name="checks" value="."/>
<property name="files" value="[\\/](src)?gen[\\/].*\.java$"/>
</module>
<module name="SuppressionSingleFilter">
<property name="checks" value="."/>
<property name="files" value="[\\/]src[\\/]gen(erated)?[\\/].*\.java$"/>
</module>
<!-- Test code -->
<module name="SuppressionSingleFilter">
<property name="checks" value="MagicNumberCheck"/>
<property name="files" value="[\\/]test[\\/].*\.java$"/>
</module>
<module name="SuppressWarningsFilter"/>

<module name="TreeWalker">
<!-- Checks - sorted alphabetically -->
<module name="ArrayTypeStyle"/>
<module name="AvoidStarImport"/>
<module name="ConstantName"/>
<module name="DefaultComesLast"/>
<module name="EmptyBlock"/>
<module name="EmptyCatchBlock"/>
<module name="EmptyForInitializerPad"/>
<module name="EmptyForIteratorPad"/>
<module name="EmptyStatement"/>
<module name="EqualsHashCode"/>
<module name="ExplicitInitialization">
<property name="severity" value="info"/>
</module>
<module name="FinalClass"/>
<module name="FinalParameters"/>
<module name="GenericWhitespace"/>
<module name="HideUtilityClassConstructor"/>
<module name="IllegalImport"/>
<module name="InterfaceIsType"/>
<module name="JavadocStyle">
<property name="checkFirstSentence" value="false"/>
</module>
<module name="LeftCurly">
<!-- Default minus Lambda -->
<property name="tokens" value="ANNOTATION_DEF, CLASS_DEF, CTOR_DEF, ENUM_CONSTANT_DEF, ENUM_DEF, INTERFACE_DEF, LITERAL_CASE, LITERAL_CATCH, LITERAL_DEFAULT, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, METHOD_DEF, OBJBLOCK, STATIC_INIT, RECORD_DEF, COMPACT_CTOR_DEF"/>
<property name="option" value="nl"/>
</module>
<module name="LocalFinalVariableName"/>
<module name="LocalVariableName"/>
<module name="MagicNumber">
<property name="ignoreAnnotation" value="true"/>
<property name="ignoreFieldDeclaration" value="true"/>
<property name="ignoreHashCodeMethod" value="true"/>
<!-- Defaults + other common constant values (e.g. time) -->
<property name="ignoreNumbers" value="-1, 0, 1, 2, 3, 4, 5, 10, 12, 24, 31, 60, 100, 1000"/>
</module>
<module name="MemberName"/>
<module name="MethodLength"/>
<module name="MethodName"/>
<module name="MethodParamPad"/>
<module name="MissingDeprecated"/>
<module name="MissingOverride"/>
<module name="MissingSwitchDefault"/>
<module name="ModifierOrder"/>
<module name="NeedBraces"/>
<module name="NoClone"/>
<module name="NoFinalizer"/>
<module name="NonEmptyAtclauseDescription"/>
<module name="NoWhitespaceAfter"/>
<module name="NoWhitespaceBefore"/>
<module name="OneStatementPerLine"/>
<module name="OneTopLevelClass"/>
<module name="OperatorWrap"/>
<module name="OuterTypeNumber"/>
<module name="PackageName"/>
<module name="ParameterName"/>
<module name="ParenPad"/>
<module name="RedundantImport"/>
<module name="RequireThis"/>
<module name="RightCurly">
<property name="option" value="alone"/>
</module>
<module name="SimplifyBooleanExpression"/>
<module name="StaticVariableName"/>
<module name="StringLiteralEquality"/>
<module name="SuppressWarningsHolder"/>
<module name="TodoComment">
<property name="severity" value="info"/>
</module>
<module name="TypecastParenPad"/>
<module name="TypeName"/>
<module name="UnusedImports"/>
<module name="UpperEll"/>
<module name="VisibilityModifier">
<property name="packageAllowed" value="true"/>
<property name="protectedAllowed" value="true"/>
</module>
<module name="WhitespaceAfter">
<property name="tokens" value="COMMA,SEMI"/>
</module>
<module name="WhitespaceAround">
<property name="tokens"
value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAND,LCURLY,LE,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,RCURLY,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,TYPE_EXTENSION_AND"/>
</module>

<!-- Filter -->
<module name="SuppressionCommentFilter">
<property name="offCommentFormat" value="\s*CHECKSTYLE:OFF\s*[^\s]{1,}"/>
<property name="onCommentFormat" value="\s*CHECKSTYLE:ON"/>
</module>
</module>
</module>
6 changes: 6 additions & 0 deletions .config/checkstyle/suppressions.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE suppressions PUBLIC
"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
"https://checkstyle.org/dtds/suppressions_1_2.dtd">
<suppressions>
</suppressions>
33 changes: 30 additions & 3 deletions .github/workflows/checkBuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,16 @@ on:
branches: [ develop ]
paths-ignore:
- '**.md'
- '.config/**'
- '.idea/**'
- 'assets/**'
pull_request:
branches: [ develop ]
paths-ignore:
- '**.md'
- '.config/**'
- '.idea/**'
- 'assets/**'

env:
PRIMARY_MAVEN_MODULE: ${{ github.event.repository.name }}
Expand All @@ -21,14 +27,14 @@ jobs:

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

steps:
- uses: actions/checkout@v4

- name: Set up JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: ${{ matrix.distribution }}
java-version: ${{ matrix.java }}
Expand Down Expand Up @@ -56,8 +62,29 @@ jobs:
fi

- name: Upload demo files
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: demo-files-java-${{ matrix.java }}
path: ${{ env.DEMO_MAVEN_MODULE }}/target/${{ env.DEMO_MAVEN_MODULE }}.jar
if-no-files-found: error

code-style:
runs-on: ubuntu-latest

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

steps:
- uses: actions/checkout@v4

- name: Set up JDK
uses: actions/setup-java@v4
with:
distribution: ${{ matrix.distribution }}
java-version: ${{ matrix.java }}
cache: 'maven'

- name: Run Checkstyle
run: mvn -B checkstyle:check -P checkstyle -T2C
32 changes: 19 additions & 13 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- uses: actions/checkout@v4

- name: Set up JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'temurin'
Expand Down Expand Up @@ -101,12 +101,15 @@ jobs:
Add the following lines to your pom:
```XML
<dependency>
<groupId>com.xdev-software</groupId>
<groupId>software.xdev</groupId>
<artifactId>${{ env.PRIMARY_MAVEN_MODULE }}</artifactId>
<version>${{ steps.version.outputs.release }}</version>
</dependency>
```

### Additional notes
* [Spring-Boot] You may have to include ``software/xdev`` inside [``vaadin.whitelisted-packages``](https://vaadin.com/docs/latest/integrations/spring/configuration#configure-the-scanning-of-packages)

publish_central: # Publish the code to central
runs-on: ubuntu-latest
needs: [prepare_release]
Expand All @@ -120,7 +123,7 @@ jobs:
git pull

- name: Set up JDK Apache Maven Central
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with: # running setup-java again overwrites the settings.xml
java-version: '17'
distribution: 'temurin'
Expand All @@ -133,8 +136,8 @@ jobs:
- name: Publish to Apache Maven Central
run: mvn -B deploy -Possrh
env:
MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
MAVEN_CENTRAL_USERNAME: ${{ secrets.S01_OSS_SONATYPE_MAVEN_USERNAME }}
MAVEN_CENTRAL_TOKEN: ${{ secrets.S01_OSS_SONATYPE_MAVEN_TOKEN }}
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}

Expand All @@ -152,7 +155,7 @@ jobs:
git pull

- name: Setup - Java
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'temurin'
Expand All @@ -163,7 +166,7 @@ jobs:
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}

- name: Upload licenses - Upload Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: dependencies-licenses
path: ${{ env.PRIMARY_MAVEN_MODULE }}/target/site
Expand Down Expand Up @@ -223,9 +226,12 @@ jobs:
git push origin

- name: pull-request
uses: repo-sync/pull-request@v2
with:
destination_branch: "develop"
pr_title: "Sync back"
pr_body: "An automated PR to sync changes back"

env:
GH_TOKEN: ${{ github.token }}
run: |
gh_pr_up() {
gh pr create "$@" || gh pr edit "$@"
}
gh_pr_up -B "develop" \
--title "Sync back" \
--body "An automated PR to sync changes back"
12 changes: 7 additions & 5 deletions .github/workflows/sonar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,16 @@ on:
branches: [ develop ]
paths-ignore:
- '**.md'
- '.config/**'
- '.idea/**'
- 'assets/**'
- 'config/**'
pull_request:
types: [opened, synchronize, reopened]
paths-ignore:
- '**.md'
- '.config/**'
- '.idea/**'
- 'assets/**'
- 'config/**'

env:
SONARCLOUD_ORG: ${{ github.event.organization.login }}
Expand All @@ -31,20 +33,20 @@ jobs:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis

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

- name: Cache SonarCloud packages
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.sonar/cache
key: ${{ runner.os }}-sonar
restore-keys: ${{ runner.os }}-sonar

- name: Cache Maven packages
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@v4

- name: Set up JDK OSSRH
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with: # running setup-java again overwrites the settings.xml
distribution: 'temurin'
java-version: '17'
Expand All @@ -27,6 +27,6 @@ jobs:
run: mvn -B deploy -Possrh
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
env:
MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
MAVEN_CENTRAL_USERNAME: ${{ secrets.S01_OSS_SONATYPE_MAVEN_USERNAME }}
MAVEN_CENTRAL_TOKEN: ${{ secrets.S01_OSS_SONATYPE_MAVEN_TOKEN }}
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
17 changes: 9 additions & 8 deletions .github/workflows/update-from-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,13 @@ jobs:
echo "abort=0" >> $GITHUB_OUTPUT

- name: pull-request
uses: repo-sync/pull-request@v2
if: steps.main.outputs.abort == 0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
source_branch: ${{ env.UPDATE_BRANCH }}
destination_branch: ${{ steps.main.outputs.current_branch }}
pr_title: "Update from template"
pr_body: "An automated PR to sync changes from the template into this repo"

env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
gh_pr_up() {
gh pr create -H "${{ env.UPDATE_BRANCH }}" "$@" || (git checkout "${{ env.UPDATE_BRANCH }}" && gh pr edit "$@")
}
gh_pr_up -B "${{ steps.main.outputs.current_branch }}" \
--title "Update from template" \
--body "An automated PR to sync changes from the template into this repo"
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ vite.generated.ts
/*/frontend/generated/
/*/frontend/index.html
/*/src/main/dev-bundle/
/*/src/main/bundles/
*.lock

#custom
.flattened-pom.xml
Expand Down
Loading