Skip to content

Commit bbd5be3

Browse files
stefanseifertstefanseifert
committed
Merge branch 'develop'
2 parents 05ca639 + b091151 commit bbd5be3

File tree

27 files changed

+498
-556
lines changed

27 files changed

+498
-556
lines changed

‎.github/dependabot.yml‎

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

‎.github/renovate.json‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
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+
"packageRules": [
10+
{
11+
"matchFileNames": ["tooling/conga-aem-maven-plugin/src/it/**"],
12+
"matchPackageNames": [
13+
"io.wcm.maven:io.wcm.maven.aem-dependencies",
14+
"io.wcm.maven:io.wcm.maven.aem-cloud-dependencies"
15+
],
16+
"enabled": false
17+
},
18+
{
19+
"matchFileNames": ["tooling/conga-aem-maven-plugin/src/it/**"],
20+
"matchUpdateTypes": ["minor", "patch"],
21+
"automerge": true,
22+
"addLabels": ["automerge"]
23+
}
24+
],
25+
"ignoreDeps": [
26+
"io.wcm.devops.conga.plugins.aem.it:io.wcm.devops.conga.plugins.aem.it.aem65.parent",
27+
"io.wcm.devops.conga.plugins.aem.it:io.wcm.devops.conga.plugins.aem.it.aem65.complete",
28+
"io.wcm.devops.conga.plugins.aem.it:io.wcm.devops.conga.plugins.aem.it.aem65.conf-content",
29+
"io.wcm.devops.conga.plugins.aem.it:io.wcm.devops.conga.plugins.aem.it.aem65.sample-content",
30+
"io.wcm.devops.conga.plugins.aem.it:io.wcm.devops.conga.plugins.aem.it.aem65.core",
31+
"io.wcm.devops.conga.plugins.aem.it:io.wcm.devops.conga.plugins.aem.it.aem65.clientlibs",
32+
"io.wcm.devops.conga.plugins.aem.it:io.wcm.devops.conga.plugins.aem.it.aemcloud.parent",
33+
"io.wcm.devops.conga.plugins.aem.it:io.wcm.devops.conga.plugins.aem.it.aemcloud.core",
34+
"io.wcm.devops.conga.plugins.aem.it:io.wcm.devops.conga.plugins.aem.it.aemcloud.conf-content",
35+
"io.wcm.devops.conga.plugins.aem.it:io.wcm.devops.conga.plugins.aem.it.aemcloud.sample-content"
36+
]
37+
}

‎.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/aem/changes-report.html'
18+
body: 'Changes: https://devops.wcm.io/conga/plugins/aem/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: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,18 @@
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

26-
<release version="2.20.0" date="not released">
27+
<release version="2.20.2" date="2025-04-02">
28+
<action type="update" dev="sseifert" issue="99">
29+
Switch to Johnzon 2.x and jakarta.json.
30+
</action>
31+
</release>
32+
33+
<release version="2.20.0" date="2024-01-26">
2734
<action type="add" dev="sseifert" issue="86"><![CDATA[
2835
ContentPackageOsgiConfigPostProcessor: Accept both <a href="https://devops.wcm.io/conga/plugins/sling//osgi-config-combined-json.html">Combined JSON files</a>
2936
and Sling Provisioning File Format as input for generating OSGi configurations.

‎conga-aem-plugin/pom.xml‎

Lines changed: 9 additions & 4 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.aem.parent</artifactId>
28-
<version>2.20.0</version>
28+
<version>2.20.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.aem</artifactId>
34-
<version>2.20.0</version>
34+
<version>2.20.2</version>
3535
<packaging>jar</packaging>
3636

3737
<name>CONGA AEM Plugin</name>
@@ -111,6 +111,11 @@
111111
<scope>compile</scope>
112112
</dependency>
113113

114+
<dependency>
115+
<groupId>commons-io</groupId>
116+
<artifactId>commons-io</artifactId>
117+
<scope>compile</scope>
118+
</dependency>
114119
<dependency>
115120
<groupId>org.apache.commons</groupId>
116121
<artifactId>commons-compress</artifactId>
@@ -128,8 +133,8 @@
128133
<scope>compile</scope>
129134
</dependency>
130135
<dependency>
131-
<groupId>org.apache.geronimo.specs</groupId>
132-
<artifactId>geronimo-json_1.1_spec</artifactId>
136+
<groupId>jakarta.json</groupId>
137+
<artifactId>jakarta.json-api</artifactId>
133138
<scope>compile</scope>
134139
</dependency>
135140
<dependency>

‎conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/validator/ContentPackageValidator.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ private void validateContentPackage(File packageFile, ValidatorContext context,
106106

107107
// instantiate Mojo to execute the validation (a bit hacky as we have to manually
108108
// pass through the maven context objects here via reflection)
109-
ValidatePackageMojo mojo = new ValidatePackageMojo();
109+
ValidatePackageMojo mojo = new ValidatePackageMojo(mavenContext.getRepoSystem(), mavenContext.getBuildContext());
110110
mojo.setLog(new InfoPrefixLog(mavenContext.getLog(), " "));
111111

112112
setProperty(mojo, "packageFile", packageFile);
@@ -116,9 +116,7 @@ private void validateContentPackage(File packageFile, ValidatorContext context,
116116
setProperty(mojo, "session", mavenContext.getSession());
117117
setProperty(mojo, "failOnValidationWarnings", false);
118118
setProperty(mojo, "mapPackageDependencyToMavenGa", Collections.emptyList());
119-
setProperty(mojo, "repositorySystem", mavenContext.getRepositorySystem());
120119
setProperty(mojo, "resolutionErrorHandler", mavenContext.getResolutionErrorHandler());
121-
setProperty(mojo, "buildContext", mavenContext.getBuildContext());
122120
setProperty(mojo, "attachedArtifacts", Collections.emptyList());
123121

124122
Object validatorsSettings = MapExpander.getDeep(context.getOptions(), OPTION_VALIDATORS_SETTINGS);

0 commit comments

Comments
 (0)