Skip to content

Commit b91c975

Browse files
stefanseifertstefanseifert
committed
Merge branch 'develop'
2 parents 9c08d0e + 1adea91 commit b91c975

File tree

15 files changed

+90
-76
lines changed

15 files changed

+90
-76
lines changed

‎.github/dependabot.yml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "maven"
4+
directory: "/"
5+
schedule:
6+
interval: "daily"

‎.github/workflows/maven-build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: ${{ matrix.os }}
2121
strategy:
2222
matrix:
23-
java: [8, 11, 17]
23+
java: [11, 17]
2424
os: [ubuntu-latest]
2525
distribution: [temurin]
2626
include:

‎.github/workflows/maven-deploy.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Deploy snapshots to Sonatpe OSS repository and deploy site to GitHub Pages
1+
# Deploy snapshots to Sonatype OSS repository and deploy site to GitHub Pages
22

33
name: Deploy
44

@@ -15,19 +15,19 @@ jobs:
1515

1616
steps:
1717
- name: Checkout code
18-
uses: actions/checkout@v2
18+
uses: actions/checkout@v3
1919

2020
- name: Configure GIT
2121
run: |
2222
git config --global user.email "${{ secrets.GH_SITE_DEPLOY_EMAIL }}"
2323
git config --global user.name "${{ secrets.GH_SITE_DEPLOY_NAME }}"
2424
2525
- name: Setup JDK
26-
uses: actions/setup-java@v2
26+
uses: actions/setup-java@v3
2727
with:
2828
distribution: temurin
29-
java-version: 8
30-
cache: 'maven'
29+
java-version: 11
30+
cache: maven
3131

3232
- name: Build, verify, deploy, generate site
3333
env:

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
permissions:
1313
contents: write
1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v3
1616
- uses: ncipollo/release-action@v1
1717
with:
1818
body: 'Changes: https://devops.wcm.io/conga/plugins/aem/changes-report.html'

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=wcm-io-devops_conga-aem-plugin&metric=coverage)](https://sonarcloud.io/summary/new_code?id=wcm-io-devops_conga-aem-plugin)
66

77
Documentation: https://devops.wcm.io/conga/plugins/aem/<br/>
8-
Issues: https://wcm-io.atlassian.net/projects/WDCONGA<br/>
8+
Issues: https://github.com/wcm-io-devops/conga-aem-plugin/issues<br/>
99
Wiki: https://wcm-io.atlassian.net/wiki/<br/>
1010
Continuous Integration: https://github.com/wcm-io-devops/conga-aem-plugin/actions<br/>
1111
Commercial support: https://wcm.io/commercial-support.html

‎changes.xml

+9
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,15 @@
2323
xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 https://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
2424
<body>
2525

26+
<release version="2.19.2" date="2023-01-12">
27+
<action type="update" dev="sseifert">
28+
Switch to Java 11 as minimum version.
29+
</action>
30+
<action type="fix" dev="sseifert">
31+
conga-aem-maven-plugin: Avoid duplicating version when adding release version suffix with packageVersionMode=RELEASE_SUFFIX_VERSION mode.
32+
</action>
33+
</release>
34+
2635
<release version="2.19.0" date="2022-11-10">
2736
<action type="add" dev="sseifert">
2837
conga-aem-maven-plugin: Introduce new parameter "packageVersionMode" to "cloudmanager-all-package" goal, which allows to enable a special "RELEASE_SUFFIX_VERSION" mode.

‎conga-aem-plugin/pom.xml

+2-2
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.19.0</version>
28+
<version>2.19.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.19.0</version>
34+
<version>2.19.2</version>
3535
<packaging>jar</packaging>
3636

3737
<name>CONGA AEM Plugin</name>

‎parent/pom.xml

+12-12
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
<parent>
2626
<groupId>io.wcm.devops</groupId>
2727
<artifactId>io.wcm.devops.parent_toplevel</artifactId>
28-
<version>1.3.2</version>
28+
<version>1.4.0</version>
2929
<relativePath />
3030
</parent>
3131

3232
<groupId>io.wcm.devops.conga.plugins</groupId>
3333
<artifactId>io.wcm.devops.conga.plugins.aem.parent</artifactId>
34-
<version>2.19.0</version>
34+
<version>2.19.2</version>
3535
<packaging>pom</packaging>
3636

3737
<name>CONGA AEM Plugin</name>
@@ -81,13 +81,13 @@
8181
<dependency>
8282
<groupId>com.google.guava</groupId>
8383
<artifactId>guava</artifactId>
84-
<version>31.0.1-jre</version>
84+
<version>31.1-jre</version>
8585
</dependency>
8686

8787
<dependency>
8888
<groupId>org.apache.jackrabbit</groupId>
8989
<artifactId>filevault-package-maven-plugin</artifactId>
90-
<version>1.3.0</version>
90+
<version>1.3.2</version>
9191
</dependency>
9292

9393
<dependency>
@@ -104,7 +104,7 @@
104104
<dependency>
105105
<groupId>org.apache.commons</groupId>
106106
<artifactId>commons-compress</artifactId>
107-
<version>1.21</version>
107+
<version>1.22</version>
108108
</dependency>
109109
<dependency>
110110
<groupId>commons-cli</groupId>
@@ -135,30 +135,30 @@
135135
<dependency>
136136
<groupId>org.apache.geronimo.specs</groupId>
137137
<artifactId>geronimo-json_1.1_spec</artifactId>
138-
<version>1.0</version>
138+
<version>1.5</version>
139139
</dependency>
140140
<dependency>
141141
<groupId>org.apache.johnzon</groupId>
142142
<artifactId>johnzon-core</artifactId>
143-
<version>1.1.4</version>
143+
<version>1.2.19</version>
144144
</dependency>
145145

146146
<dependency>
147147
<groupId>org.apache.jackrabbit</groupId>
148148
<artifactId>oak-security-spi</artifactId>
149-
<version>1.8.0</version>
149+
<version>1.46.0</version>
150150
</dependency>
151151
<dependency>
152152
<groupId>org.apache.jackrabbit</groupId>
153153
<artifactId>oak-commons</artifactId>
154-
<version>1.8.0</version>
154+
<version>1.46.0</version>
155155
</dependency>
156156

157157
<!-- Node type validation -->
158158
<dependency>
159159
<groupId>biz.netcentric.aem</groupId>
160160
<artifactId>aem-nodetypes</artifactId>
161-
<version>2020.11.0</version>
161+
<version>2022.10.0</version>
162162
</dependency>
163163
<dependency>
164164
<groupId>io.wcm.tooling.nodetypes</groupId>
@@ -170,12 +170,12 @@
170170
<dependency>
171171
<groupId>org.xmlunit</groupId>
172172
<artifactId>xmlunit-core</artifactId>
173-
<version>2.8.3</version>
173+
<version>2.9.1</version>
174174
</dependency>
175175
<dependency>
176176
<groupId>org.zeroturnaround</groupId>
177177
<artifactId>zt-zip</artifactId>
178-
<version>1.14</version>
178+
<version>1.15</version>
179179
</dependency>
180180

181181
</dependencies>

‎pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
<parent>
2424
<groupId>io.wcm.devops.conga.plugins</groupId>
2525
<artifactId>io.wcm.devops.conga.plugins.aem.parent</artifactId>
26-
<version>2.19.0</version>
26+
<version>2.19.2</version>
2727
<relativePath>parent/pom.xml</relativePath>
2828
</parent>
2929

3030
<groupId>io.wcm.devops.conga.plugins</groupId>
3131
<artifactId>io.wcm.devops.conga.plugins.aem.root</artifactId>
32-
<version>2.19.0</version>
32+
<version>2.19.2</version>
3333
<packaging>pom</packaging>
3434

3535
<name>CONGA AEM Plugin</name>

‎tooling/conga-aem-crypto-cli/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525
<parent>
2626
<groupId>io.wcm.devops.conga.plugins</groupId>
2727
<artifactId>io.wcm.devops.conga.plugins.aem.parent</artifactId>
28-
<version>2.19.0</version>
28+
<version>2.19.2</version>
2929
<relativePath>../../parent/pom.xml</relativePath>
3030
</parent>
3131

3232
<groupId>io.wcm.devops.conga.plugins</groupId>
3333
<artifactId>conga-aem-crypto-cli</artifactId>
3434
<packaging>jar</packaging>
35-
<version>2.19.0</version>
35+
<version>2.19.2</version>
3636

3737
<name>CONGA AEM Crypto Command Line Interface</name>
3838
<description>Command line tool to generate Crypto keys for AEM.</description>
@@ -42,7 +42,7 @@
4242
<dependency>
4343
<groupId>io.wcm.devops.conga.plugins</groupId>
4444
<artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
45-
<version>2.19.0</version>
45+
<version>2.19.2</version>
4646
<scope>compile</scope>
4747
<exclusions>
4848
<!-- Exclude all deps - only crypto util classes are used -->

‎tooling/conga-aem-maven-plugin/pom.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525
<parent>
2626
<groupId>io.wcm.devops.conga.plugins</groupId>
2727
<artifactId>io.wcm.devops.conga.plugins.aem.parent</artifactId>
28-
<version>2.19.0</version>
28+
<version>2.19.2</version>
2929
<relativePath>../../parent/pom.xml</relativePath>
3030
</parent>
3131

3232
<groupId>io.wcm.devops.conga.plugins</groupId>
3333
<artifactId>conga-aem-maven-plugin</artifactId>
3434
<packaging>maven-plugin</packaging>
35-
<version>2.19.0</version>
35+
<version>2.19.2</version>
3636

3737
<name>CONGA AEM Maven Plugin</name>
3838
<description>wcm.io DevOps CONGA - CONfiguration GenerAtor Maven Plugin for AEM</description>
@@ -42,7 +42,7 @@
4242
<site.url.module.prefix>tooling/conga-aem-maven-plugin</site.url.module.prefix>
4343

4444
<!-- Versions -->
45-
<maven-plugin-plugin.version>3.6.4</maven-plugin-plugin.version>
45+
<maven-plugin-plugin.version>3.7.0</maven-plugin-plugin.version>
4646

4747
<!-- Enable recording of coverage during execution of maven-invoker-plugin -->
4848
<jacoco.propertyName>invoker.mavenOpts</jacoco.propertyName>
@@ -63,7 +63,7 @@
6363
<dependency>
6464
<groupId>io.wcm.devops.conga.plugins</groupId>
6565
<artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
66-
<version>2.19.0</version>
66+
<version>2.19.2</version>
6767
<scope>compile</scope>
6868
</dependency>
6969
<dependency>
@@ -113,7 +113,7 @@
113113
<dependency>
114114
<groupId>org.apache.maven</groupId>
115115
<artifactId>maven-archiver</artifactId>
116-
<version>3.5.2</version>
116+
<version>3.6.0</version>
117117
<scope>compile</scope>
118118
</dependency>
119119
<dependency>
@@ -125,7 +125,7 @@
125125
<dependency>
126126
<groupId>org.slf4j</groupId>
127127
<artifactId>jcl-over-slf4j</artifactId>
128-
<version>1.7.32</version>
128+
<version>1.7.36</version>
129129
<scope>compile</scope>
130130
</dependency>
131131

‎tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/parent/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
<properties>
2020

2121
<!-- Java version -->
22-
<java.version>1.8</java.version>
23-
<build.compiler.release>8</build.compiler.release>
22+
<java.version>11</java.version>
2423

2524
<!-- AEM instance parameters -->
2625
<sling.url>http://localhost:4502</sling.url>

‎tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-cloud/parent/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
<properties>
2020

2121
<!-- Java version -->
22-
<java.version>1.8</java.version>
23-
<build.compiler.release>8</build.compiler.release>
22+
<java.version>11</java.version>
2423

2524
<!-- AEM instance parameters -->
2625
<sling.url>http://localhost:4502</sling.url>

‎tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/allpackage/AllPackageBuilder.java

+1
Original file line numberDiff line numberDiff line change
@@ -499,6 +499,7 @@ private String buildVersionSuffix(ContentPackageFile pkg, boolean ignoreSnapshot
499499

500500
if (this.packageVersionMode == PackageVersionMode.RELEASE_SUFFIX_VERSION
501501
&& (!ArtifactUtils.isSnapshot(pkg.getVersion()) || !ignoreSnapshot)
502+
&& !StringUtils.equals(pkg.getVersion(), this.version)
502503
&& this.version != null) {
503504
versionSuffix.append(VERSION_SUFFIX_SEPARATOR)
504505
// replace dots with underlines in version suffix to avoid confusion with main version number

0 commit comments

Comments
 (0)