Skip to content

Commit 1c29246

Browse files
stefanseifertstefanseifert
committed
Merge branch 'develop'
2 parents 0980890 + 41623a8 commit 1c29246

11 files changed

Lines changed: 54 additions & 60 deletions

File tree

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,13 @@ jobs:
1919
runs-on: ${{ matrix.os }}
2020
strategy:
2121
matrix:
22+
java: [8, 11, 17]
2223
os: [ ubuntu-latest ]
23-
java: [8, 11]
24+
include:
25+
- java: 11
26+
os: windows-latest
27+
- java: 11
28+
os: macos-latest
2429

2530
steps:
2631
# Check out Git repository
@@ -49,7 +54,3 @@ jobs:
4954
# Build & verify example
5055
- name: Build and verify example
5156
run: ./mvnw -s ./.maven-settings.xml -Pcontinuous-integration -B -U clean verify -f example
52-
53-
# Run code coverage check
54-
- name: Run code coverage check
55-
run: bash <(curl -s https://codecov.io/bash)

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ jobs:
4646
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
4747
run: ./mvnw -s ./.maven-settings.xml -Pcontinuous-integration -B -U clean deploy site
4848

49+
# Run code coverage check
50+
- name: Run code coverage check
51+
run: bash <(curl -s https://codecov.io/bash)
52+
4953
# Deploy site to Github Pages
5054
- name: Stage and deploy site
5155
run: >

‎.maven-settings.xml‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,6 @@
4444
-->
4545
</repository>
4646

47-
<repository>
48-
<id>wcm-io-apache-intermediate-release</id>
49-
<url>https://wcm.io/maven/repositories/apache-intermediate-release</url>
50-
<layout>default</layout>
51-
<releases>
52-
<enabled>true</enabled>
53-
<updatePolicy>never</updatePolicy>
54-
</releases>
55-
<snapshots>
56-
<enabled>false</enabled>
57-
</snapshots>
58-
</repository>
59-
6047
<repository>
6148
<id>oss-snapshots</id>
6249
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
@@ -100,19 +87,6 @@
10087
</snapshots>
10188
</pluginRepository>
10289

103-
<pluginRepository>
104-
<id>wcm-io-apache-intermediate-release</id>
105-
<url>https://wcm.io/maven/repositories/apache-intermediate-release</url>
106-
<layout>default</layout>
107-
<releases>
108-
<enabled>true</enabled>
109-
<updatePolicy>never</updatePolicy>
110-
</releases>
111-
<snapshots>
112-
<enabled>false</enabled>
113-
</snapshots>
114-
</pluginRepository>
115-
11690
<pluginRepository>
11791
<id>oss-snapshots</id>
11892
<url>https://oss.sonatype.org/content/repositories/snapshots</url>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.1/apache-maven-3.8.1-bin.zip
1+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
22
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

‎changes.xml‎

Lines changed: 9 additions & 0 deletions
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.16.2" date="2022-01-06">
27+
<action type="update" dev="sseifert">
28+
conga-aem-maven-plugin: Declare maven core dependencies as provided.
29+
</action>
30+
<action type="fix" dev="sseifert">
31+
conga-aem-maven-plugin: Remove misplaced message 'Package uploaded successfully (without installing).' after package install.
32+
</action>
33+
</release>
34+
2635
<release version="2.16.0" date="2021-12-13">
2736
<action type="add" dev="sseifert">
2837
conga-aem-maven-plugin: Add support for IMS/Auth 2 authentication for AEMaaCS (via oauth2AccessToken).

‎conga-aem-plugin/pom.xml‎

Lines changed: 2 additions & 2 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.16.0</version>
28+
<version>2.16.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.16.0</version>
34+
<version>2.16.2</version>
3535
<packaging>jar</packaging>
3636

3737
<name>CONGA AEM Plugin</name>

‎example/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,15 @@
5757
<plugin>
5858
<groupId>io.wcm.devops.conga</groupId>
5959
<artifactId>conga-maven-plugin</artifactId>
60-
<version>1.13.0</version>
60+
<version>1.14.4</version>
6161
<extensions>true</extensions>
6262
<dependencies>
6363

6464
<!-- Activate further CONGA plugins for special file types -->
6565
<dependency>
6666
<groupId>io.wcm.devops.conga.plugins</groupId>
6767
<artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
68-
<version>2.15.1-SNAPSHOT</version>
68+
<version>2.16.1-SNAPSHOT</version>
6969
</dependency>
7070

7171
</dependencies>

‎parent/pom.xml‎

Lines changed: 9 additions & 9 deletions
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.2.8</version>
28+
<version>1.2.10</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.16.0</version>
34+
<version>2.16.2</version>
3535
<packaging>pom</packaging>
3636

3737
<name>CONGA AEM Plugin</name>
@@ -47,12 +47,12 @@
4747
<dependency>
4848
<groupId>io.wcm.devops.conga</groupId>
4949
<artifactId>io.wcm.devops.conga.generator</artifactId>
50-
<version>1.13.0</version>
50+
<version>1.14.4</version>
5151
</dependency>
5252
<dependency>
5353
<groupId>io.wcm.devops.conga</groupId>
5454
<artifactId>conga-maven-plugin</artifactId>
55-
<version>1.13.0</version>
55+
<version>1.14.4</version>
5656
</dependency>
5757

5858
<dependency>
@@ -75,13 +75,13 @@
7575
<dependency>
7676
<groupId>io.wcm.tooling.commons</groupId>
7777
<artifactId>io.wcm.tooling.commons.crx-packmgr-helper</artifactId>
78-
<version>2.0.0</version>
78+
<version>2.0.2</version>
7979
</dependency>
8080

8181
<dependency>
8282
<groupId>com.google.guava</groupId>
8383
<artifactId>guava</artifactId>
84-
<version>30.1.1-jre</version>
84+
<version>31.0.1-jre</version>
8585
</dependency>
8686

8787
<dependency>
@@ -109,7 +109,7 @@
109109
<dependency>
110110
<groupId>commons-cli</groupId>
111111
<artifactId>commons-cli</artifactId>
112-
<version>1.4</version>
112+
<version>1.5.0</version>
113113
</dependency>
114114
<dependency>
115115
<groupId>org.apache.commons</groupId>
@@ -119,7 +119,7 @@
119119
<dependency>
120120
<groupId>commons-io</groupId>
121121
<artifactId>commons-io</artifactId>
122-
<version>2.8.0</version>
122+
<version>2.11.0</version>
123123
</dependency>
124124

125125
<dependency>
@@ -170,7 +170,7 @@
170170
<dependency>
171171
<groupId>org.xmlunit</groupId>
172172
<artifactId>xmlunit-core</artifactId>
173-
<version>2.7.0</version>
173+
<version>2.8.3</version>
174174
</dependency>
175175
<dependency>
176176
<groupId>org.zeroturnaround</groupId>

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
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.16.0</version>
26+
<version>2.16.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.16.0</version>
32+
<version>2.16.2</version>
3333
<packaging>pom</packaging>
3434

3535
<name>CONGA AEM Plugin</name>

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

Lines changed: 3 additions & 3 deletions
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.16.0</version>
28+
<version>2.16.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.16.0</version>
35+
<version>2.16.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.16.0</version>
45+
<version>2.16.2</version>
4646
<scope>compile</scope>
4747
<exclusions>
4848
<!-- Exclude all deps - only crypto util classes are used -->

0 commit comments

Comments
 (0)