Skip to content

Commit dc29d27

Browse files
stefanseifertstefanseifert
committed
Merge branch 'develop'
2 parents ef87060 + 3839ff7 commit dc29d27

File tree

23 files changed

+395
-481
lines changed

23 files changed

+395
-481
lines changed

‎.github/dependabot.yml‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎.github/renovate.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"extends": [
4+
"github>wcm-io/renovate-config:maven",
5+
"github>wcm-io/renovate-config:automerge-parent",
6+
"github>wcm-io/renovate-config:automerge-testing",
7+
"github>wcm-io-devops/renovate-config:automerge-parent"
8+
],
9+
"ignoreDeps": [
10+
"io.wcm.devops.conga:io.wcm.devops.conga.example",
11+
"io.wcm.devops.conga:io.wcm.devops.conga.example.definitions"
12+
]
13+
}

‎.github/workflows/maven-build.yml‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,9 @@ name: Build
44

55
on:
66
push:
7-
branches-ignore:
8-
- master
9-
- experimental/**
7+
branches:
8+
- develop
109
pull_request:
11-
types: [opened, synchronize, reopened]
12-
branches-ignore:
13-
- master
14-
- experimental/**
1510
workflow_dispatch:
1611

1712
jobs:
@@ -39,6 +34,6 @@ jobs:
3934
java-version: ${{ matrix.java }}
4035
maven-executable: ./mvnw
4136
sonar-run-on-os: ubuntu-latest
42-
sonar-run-on-java-version: 17
37+
sonar-run-on-java-version: 21
4338
sonar-token: ${{ secrets.SONAR_TOKEN }}
4439
github-token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/maven-deploy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
git config --global user.name "${{ secrets.GH_SITE_DEPLOY_NAME }}"
2626
2727
- name: Setup JDK
28-
uses: actions/setup-java@v3
28+
uses: actions/setup-java@v4
2929
with:
3030
distribution: temurin
3131
java-version: 11

‎.github/workflows/release-from-tag.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ jobs:
1515
- uses: actions/checkout@v4
1616
- uses: ncipollo/release-action@v1
1717
with:
18-
body: 'Changes: https://devops.wcm.io/conga/changes-report.html'
18+
body: 'Changes: https://devops.wcm.io/conga/changes.html'
1919
token: ${{ secrets.GITHUB_TOKEN }}

‎.mvn/wrapper/maven-wrapper.jar‎

-61.1 KB
Binary file not shown.

‎.mvn/wrapper/maven-wrapper.properties‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@
1414
# KIND, either express or implied. See the License for the
1515
# specific language governing permissions and limitations
1616
# under the License.
17-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip
18-
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
17+
wrapperVersion=3.3.2
18+
distributionType=only-script
19+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip

‎changes.xml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,17 @@
1919
#L%
2020
-->
2121

22-
<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/changes/1.0.0"
23-
xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 https://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
22+
<document xmlns="http://maven.apache.org/changes/2.0.0"
23+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
24+
xsi:schemaLocation="http://maven.apache.org/changes/2.0.0 https://maven.apache.org/xsd/changes-2.0.0.xsd">
2425
<body>
2526

27+
<release version="1.17.2" date="2025-03-31">
28+
<action type="update" dev="sseifert">
29+
Update dependencies.
30+
</action>
31+
</release>
32+
2633
<release version="1.17.0" date="2024-01-26">
2734
<action type="update" dev="sseifert" issue="57">
2835
Special handling for detecting ".cfg.json" file extensions.

‎generator/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<parent>
2626
<groupId>io.wcm.devops.conga</groupId>
2727
<artifactId>io.wcm.devops.conga.parent</artifactId>
28-
<version>1.17.0</version>
28+
<version>1.17.2</version>
2929
<relativePath>../parent/pom.xml</relativePath>
3030
</parent>
3131

@@ -44,7 +44,7 @@
4444
<dependency>
4545
<groupId>io.wcm.devops.conga</groupId>
4646
<artifactId>io.wcm.devops.conga.model</artifactId>
47-
<version>1.17.0</version>
47+
<version>1.17.2</version>
4848
<scope>compile</scope>
4949
</dependency>
5050

‎model/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<parent>
2626
<groupId>io.wcm.devops.conga</groupId>
2727
<artifactId>io.wcm.devops.conga.parent</artifactId>
28-
<version>1.17.0</version>
28+
<version>1.17.2</version>
2929
<relativePath>../parent/pom.xml</relativePath>
3030
</parent>
3131

@@ -40,7 +40,7 @@
4040
<dependency>
4141
<groupId>io.wcm.devops.conga</groupId>
4242
<artifactId>io.wcm.devops.conga.resource</artifactId>
43-
<version>1.17.0</version>
43+
<version>1.17.2</version>
4444
<scope>compile</scope>
4545
</dependency>
4646

0 commit comments

Comments
 (0)