Skip to content

Commit e31d6c2

Browse files
stefanseifertstefanseifert
committed
Merge branch 'develop'
2 parents d5f7646 + a70a392 commit e31d6c2

File tree

17 files changed

+375
-467
lines changed

17 files changed

+375
-467
lines changed

‎.github/dependabot.yml‎

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

‎.github/renovate.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
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+
}

‎.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/plugins/sling/changes-report.html'
18+
body: 'Changes: https://devops.wcm.io/conga/plugins/sling/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 http://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.4.2" date="2025-04-01">
28+
<action type="update" dev="sseifert">
29+
Switch to Johnzon 2.x and jakarta.json.
30+
</action>
31+
</release>
32+
2633
<release version="1.4.0" date="2024-01-26">
2734
<action type="add" dev="sseifert" issue="7">
2835
Add JsonOsgiConfigPostProcessor to support reading a combined set of OSGi configuration for run modes from .osgiconfig.json files.

‎conga-sling-plugin/pom.xml‎

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

3232
<groupId>io.wcm.devops.conga.plugins</groupId>
3333
<artifactId>io.wcm.devops.conga.plugins.sling</artifactId>
34-
<version>1.4.0</version>
34+
<version>1.4.2</version>
3535
<packaging>jar</packaging>
3636

3737
<name>CONGA Sling Plugin</name>
@@ -60,7 +60,7 @@
6060
<dependency>
6161
<groupId>io.wcm.devops.conga</groupId>
6262
<artifactId>io.wcm.devops.conga.generator</artifactId>
63-
<version>1.17.0</version>
63+
<version>1.17.2</version>
6464
<scope>compile</scope>
6565
</dependency>
6666

@@ -82,7 +82,7 @@
8282
<dependency>
8383
<groupId>com.fasterxml.jackson.core</groupId>
8484
<artifactId>jackson-databind</artifactId>
85-
<version>2.16.1</version>
85+
<version>2.18.3</version>
8686
<scope>compile</scope>
8787
</dependency>
8888

@@ -99,9 +99,9 @@
9999
<scope>compile</scope>
100100
</dependency>
101101
<dependency>
102-
<groupId>org.eclipse.parsson</groupId>
103-
<artifactId>parsson</artifactId>
104-
<version>1.1.5</version>
102+
<groupId>org.apache.johnzon</groupId>
103+
<artifactId>johnzon-core</artifactId>
104+
<version>2.0.1</version>
105105
<scope>compile</scope>
106106
</dependency>
107107
<dependency>

‎conga-sling-plugin/src/it/example/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<parent>
2727
<groupId>io.wcm.maven</groupId>
2828
<artifactId>io.wcm.maven.global-parent</artifactId>
29-
<version>54</version>
29+
<version>62</version>
3030
<relativePath/>
3131
</parent>
3232

@@ -45,7 +45,7 @@
4545
<plugin>
4646
<groupId>io.wcm.devops.conga</groupId>
4747
<artifactId>conga-maven-plugin</artifactId>
48-
<version>1.17.0</version>
48+
<version>1.17.2</version>
4949
<extensions>true</extensions>
5050
<dependencies>
5151

0 commit comments

Comments
 (0)