Skip to content

Commit c25ff34

Browse files
stefanseifertstefanseifert
committed
Merge branch 'develop' into master
2 parents 065cdb4 + f49b499 commit c25ff34

7 files changed

Lines changed: 125 additions & 36 deletions

File tree

‎changes.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@
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="1.14.4" date="2021-06-08">
27+
<action type="update" dev="sseifert">
28+
Update to latest AEM Content Package Builder.
29+
</action>
30+
</release>
31+
2632
<release version="1.14.2" date="2021-03-15">
2733
<action type="fix" dev="dtschentscher">
2834
Fix parsing content package properties with numeric values.

‎conga-aem-plugin/pom.xml‎

Lines changed: 2 additions & 18 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>1.14.2</version>
28+
<version>1.14.4</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>1.14.2</version>
34+
<version>1.14.4</version>
3535
<packaging>jar</packaging>
3636

3737
<name>CONGA AEM Plugin</name>
@@ -53,34 +53,29 @@
5353
<dependency>
5454
<groupId>io.wcm.devops.conga</groupId>
5555
<artifactId>io.wcm.devops.conga.generator</artifactId>
56-
<version>1.13.0</version>
5756
<scope>compile</scope>
5857
</dependency>
5958
<dependency>
6059
<groupId>io.wcm.devops.conga</groupId>
6160
<artifactId>conga-maven-plugin</artifactId>
62-
<version>1.13.0</version>
6361
<scope>provided</scope>
6462
</dependency>
6563

6664
<dependency>
6765
<groupId>io.wcm.devops.conga.plugins</groupId>
6866
<artifactId>io.wcm.devops.conga.plugins.sling</artifactId>
69-
<version>1.3.0</version>
7067
<scope>compile</scope>
7168
</dependency>
7269

7370
<dependency>
7471
<groupId>com.google.guava</groupId>
7572
<artifactId>guava</artifactId>
76-
<version>29.0-jre</version>
7773
<scope>compile</scope>
7874
</dependency>
7975

8076
<dependency>
8177
<groupId>org.apache.jackrabbit</groupId>
8278
<artifactId>filevault-package-maven-plugin</artifactId>
83-
<version>1.1.2</version>
8479
<scope>compile</scope>
8580
<exclusions>
8681
<exclusion>
@@ -112,58 +107,49 @@
112107
<dependency>
113108
<groupId>com.day.commons</groupId>
114109
<artifactId>day-commons-any</artifactId>
115-
<version>2.0.0</version>
116110
<scope>compile</scope>
117111
</dependency>
118112
<dependency>
119113
<groupId>com.day.commons</groupId>
120114
<artifactId>day-commons-text</artifactId>
121-
<version>1.1.10</version>
122115
<scope>compile</scope>
123116
</dependency>
124117

125118
<dependency>
126119
<groupId>org.apache.commons</groupId>
127120
<artifactId>commons-compress</artifactId>
128-
<version>1.20</version>
129121
<scope>compile</scope>
130122
</dependency>
131123

132124
<dependency>
133125
<groupId>org.apache.sling</groupId>
134126
<artifactId>org.apache.sling.contentparser.api</artifactId>
135-
<version>2.0.0</version>
136127
<scope>compile</scope>
137128
</dependency>
138129
<dependency>
139130
<groupId>org.apache.sling</groupId>
140131
<artifactId>org.apache.sling.contentparser.json</artifactId>
141-
<version>2.0.0</version>
142132
<scope>compile</scope>
143133
</dependency>
144134
<dependency>
145135
<groupId>org.apache.geronimo.specs</groupId>
146136
<artifactId>geronimo-json_1.1_spec</artifactId>
147-
<version>1.0</version>
148137
<scope>compile</scope>
149138
</dependency>
150139
<dependency>
151140
<groupId>org.apache.johnzon</groupId>
152141
<artifactId>johnzon-core</artifactId>
153-
<version>1.1.4</version>
154142
<scope>compile</scope>
155143
</dependency>
156144

157145
<dependency>
158146
<groupId>org.apache.jackrabbit</groupId>
159147
<artifactId>oak-security-spi</artifactId>
160-
<version>1.8.0</version>
161148
<scope>compile</scope>
162149
</dependency>
163150
<dependency>
164151
<groupId>org.apache.jackrabbit</groupId>
165152
<artifactId>oak-commons</artifactId>
166-
<version>1.8.0</version>
167153
<scope>compile</scope>
168154
</dependency>
169155

@@ -175,13 +161,11 @@
175161
<dependency>
176162
<groupId>org.xmlunit</groupId>
177163
<artifactId>xmlunit-core</artifactId>
178-
<version>2.7.0</version>
179164
<scope>test</scope>
180165
</dependency>
181166
<dependency>
182167
<groupId>org.zeroturnaround</groupId>
183168
<artifactId>zt-zip</artifactId>
184-
<version>1.14</version>
185169
<scope>test</scope>
186170
</dependency>
187171

‎conga-aem-plugin/src/test/java/io/wcm/devops/conga/plugins/aem/handlebars/helper/HttpdFilterTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public void testLocation() {
8484
assertEquals(HttpdFilterType.ALLOW, underTest.getType());
8585
assertEquals("/abc", underTest.getLocation());
8686
assertNull(underTest.getLocationMatch());
87-
assertEquals("type=allow, location=/abc", underTest.toString());
87+
assertEquals("location=/abc, type=allow", underTest.toString());
8888
}
8989

9090
@Test
@@ -93,7 +93,7 @@ public void testLocationMatch() {
9393
assertEquals(HttpdFilterType.ALLOW, underTest.getType());
9494
assertNull(underTest.getLocation());
9595
assertEquals("/abc(/.*)?", underTest.getLocationMatch());
96-
assertEquals("type=allow, locationMatch=/abc(/.*)?", underTest.toString());
96+
assertEquals("locationMatch=/abc(/.*)?, type=allow", underTest.toString());
9797
}
9898

9999
}

‎parent/pom.xml‎

Lines changed: 107 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

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

3737
<name>CONGA AEM Plugin</name>
@@ -44,6 +44,23 @@
4444
<dependencyManagement>
4545
<dependencies>
4646

47+
<dependency>
48+
<groupId>io.wcm.devops.conga</groupId>
49+
<artifactId>io.wcm.devops.conga.generator</artifactId>
50+
<version>1.13.0</version>
51+
</dependency>
52+
<dependency>
53+
<groupId>io.wcm.devops.conga</groupId>
54+
<artifactId>conga-maven-plugin</artifactId>
55+
<version>1.13.0</version>
56+
</dependency>
57+
58+
<dependency>
59+
<groupId>io.wcm.devops.conga.plugins</groupId>
60+
<artifactId>io.wcm.devops.conga.plugins.sling</artifactId>
61+
<version>1.3.0</version>
62+
</dependency>
63+
4764
<dependency>
4865
<groupId>io.wcm.devops.conga.plugins</groupId>
4966
<artifactId>io.wcm.devops.conga.plugins.ansible</artifactId>
@@ -53,14 +70,102 @@
5370
<dependency>
5471
<groupId>io.wcm.tooling.commons</groupId>
5572
<artifactId>io.wcm.tooling.commons.content-package-builder</artifactId>
56-
<version>1.5.4</version>
73+
<version>1.6.2</version>
5774
</dependency>
5875
<dependency>
5976
<groupId>io.wcm.tooling.commons</groupId>
6077
<artifactId>io.wcm.tooling.commons.crx-packmgr-helper</artifactId>
6178
<version>1.7.4</version>
6279
</dependency>
6380

81+
<dependency>
82+
<groupId>com.google.guava</groupId>
83+
<artifactId>guava</artifactId>
84+
<version>30.1.1-jre</version>
85+
</dependency>
86+
87+
<dependency>
88+
<groupId>org.apache.jackrabbit</groupId>
89+
<artifactId>filevault-package-maven-plugin</artifactId>
90+
<version>1.1.2</version>
91+
</dependency>
92+
93+
<dependency>
94+
<groupId>com.day.commons</groupId>
95+
<artifactId>day-commons-any</artifactId>
96+
<version>2.0.0</version>
97+
</dependency>
98+
<dependency>
99+
<groupId>com.day.commons</groupId>
100+
<artifactId>day-commons-text</artifactId>
101+
<version>1.1.10</version>
102+
</dependency>
103+
104+
<dependency>
105+
<groupId>org.apache.commons</groupId>
106+
<artifactId>commons-compress</artifactId>
107+
<version>1.20</version>
108+
</dependency>
109+
<dependency>
110+
<groupId>commons-cli</groupId>
111+
<artifactId>commons-cli</artifactId>
112+
<version>1.4</version>
113+
</dependency>
114+
<dependency>
115+
<groupId>org.apache.commons</groupId>
116+
<artifactId>commons-lang3</artifactId>
117+
<version>3.12.0</version>
118+
</dependency>
119+
<dependency>
120+
<groupId>commons-io</groupId>
121+
<artifactId>commons-io</artifactId>
122+
<version>2.8.0</version>
123+
</dependency>
124+
125+
<dependency>
126+
<groupId>org.apache.sling</groupId>
127+
<artifactId>org.apache.sling.contentparser.api</artifactId>
128+
<version>2.0.0</version>
129+
</dependency>
130+
<dependency>
131+
<groupId>org.apache.sling</groupId>
132+
<artifactId>org.apache.sling.contentparser.json</artifactId>
133+
<version>2.0.0</version>
134+
</dependency>
135+
<dependency>
136+
<groupId>org.apache.geronimo.specs</groupId>
137+
<artifactId>geronimo-json_1.1_spec</artifactId>
138+
<version>1.0</version>
139+
</dependency>
140+
<dependency>
141+
<groupId>org.apache.johnzon</groupId>
142+
<artifactId>johnzon-core</artifactId>
143+
<version>1.1.4</version>
144+
</dependency>
145+
146+
<dependency>
147+
<groupId>org.apache.jackrabbit</groupId>
148+
<artifactId>oak-security-spi</artifactId>
149+
<version>1.8.0</version>
150+
</dependency>
151+
<dependency>
152+
<groupId>org.apache.jackrabbit</groupId>
153+
<artifactId>oak-commons</artifactId>
154+
<version>1.8.0</version>
155+
</dependency>
156+
157+
<!-- Testing -->
158+
<dependency>
159+
<groupId>org.xmlunit</groupId>
160+
<artifactId>xmlunit-core</artifactId>
161+
<version>2.7.0</version>
162+
</dependency>
163+
<dependency>
164+
<groupId>org.zeroturnaround</groupId>
165+
<artifactId>zt-zip</artifactId>
166+
<version>1.14</version>
167+
</dependency>
168+
64169
</dependencies>
65170
</dependencyManagement>
66171

‎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>1.14.2</version>
26+
<version>1.14.4</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>1.14.2</version>
32+
<version>1.14.4</version>
3333
<packaging>pom</packaging>
3434

3535
<name>CONGA AEM Plugin</name>

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

Lines changed: 3 additions & 6 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>1.14.2</version>
28+
<version>1.14.4</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>1.14.2</version>
35+
<version>1.14.4</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>1.14.2</version>
45+
<version>1.14.4</version>
4646
<scope>compile</scope>
4747
<exclusions>
4848
<!-- Exclude all deps - only crypto util classes are used -->
@@ -125,21 +125,18 @@
125125
<dependency>
126126
<groupId>commons-cli</groupId>
127127
<artifactId>commons-cli</artifactId>
128-
<version>1.4</version>
129128
<scope>compile</scope>
130129
</dependency>
131130

132131
<dependency>
133132
<groupId>org.apache.commons</groupId>
134133
<artifactId>commons-lang3</artifactId>
135-
<version>3.10</version>
136134
<scope>compile</scope>
137135
</dependency>
138136

139137
<dependency>
140138
<groupId>commons-io</groupId>
141139
<artifactId>commons-io</artifactId>
142-
<version>2.7</version>
143140
<scope>compile</scope>
144141
</dependency>
145142

0 commit comments

Comments
 (0)