Skip to content

Commit c898280

Browse files
stefanseifertstefanseifert
committed
[jgitflow-maven-plugin] merging 'release/1.8.14' into 'master'
2 parents 1e58b1d + 269f76d commit c898280

9 files changed

Lines changed: 45 additions & 34 deletions

File tree

‎.travis.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,17 @@ language: java
2121

2222
jdk:
2323
- oraclejdk8
24+
- openjdk11
2425

2526
# Make sure travis can use container-based infrastructure
2627
sudo: false
2728

2829
install: "mvn -s ./.travis.maven-settings.xml clean"
2930

3031
script:
31-
- "mvn -s ./.travis.maven-settings.xml -Pcontinuous-integration -U -Dmaven.javadoc.skip=true install"
32+
- "mvn -s ./.travis.maven-settings.xml -Pcontinuous-integration -U install"
3233
# Separate build for example due to dependeny on conga-maven-plugin
33-
- "mvn -s ./.travis.maven-settings.xml -Pcontinuous-integration -U -Dmaven.javadoc.skip=true install -f example"
34+
- "mvn -s ./.travis.maven-settings.xml -Pcontinuous-integration -U install -f example"
3435
# Remove wcm.io artefacts from repository before cache
3536
- rm -rf $HOME/.m2/repository/io/wcm
3637

‎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 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
2424
<body>
2525

26+
<release version="1.8.14" date="2019-05-08">
27+
<action type="update" dev="sseifert">
28+
aem-contentpackage-properties plugin: Also support "jar" file extension for AEM content packages (but only when explicitly defined as post processor).
29+
</action>
30+
<action type="update" dev="sseifert">
31+
Read Felix ConfigAdmin configuration files with latest version (1.9.14), but write it using the old file format form ConfigAdmin 1.8.4 to support AEM 6.1 and below.
32+
</action>
33+
</release>
34+
2635
<release version="1.8.12" date="2018-10-17">
2736
<action type="update" dev="sseifert">
2837
conga-aem-maven-plugin: Fix display of active bundles when checking bundle display.

‎conga-aem-plugin/pom.xml‎

Lines changed: 11 additions & 17 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.1.0</version>
28+
<version>1.1.4</version>
2929
<relativePath />
3030
</parent>
3131

3232
<groupId>io.wcm.devops.conga.plugins</groupId>
3333
<artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
34-
<version>1.8.12</version>
34+
<version>1.8.14</version>
3535
<packaging>jar</packaging>
3636

3737
<name>CONGA AEM Plugin</name>
@@ -53,36 +53,30 @@
5353
<dependency>
5454
<groupId>io.wcm.devops.conga</groupId>
5555
<artifactId>io.wcm.devops.conga.generator</artifactId>
56-
<version>1.9.2</version>
56+
<version>1.11.0</version>
5757
<scope>compile</scope>
5858
</dependency>
5959

6060
<dependency>
6161
<groupId>io.wcm.devops.conga.plugins</groupId>
6262
<artifactId>io.wcm.devops.conga.plugins.sling</artifactId>
63-
<version>1.2.4</version>
63+
<version>1.2.6</version>
6464
<scope>compile</scope>
6565
</dependency>
6666

6767
<dependency>
6868
<groupId>io.wcm.tooling.commons</groupId>
6969
<artifactId>io.wcm.tooling.commons.content-package-builder</artifactId>
70-
<version>1.4.0</version>
70+
<version>1.4.2</version>
7171
<scope>compile</scope>
7272
</dependency>
7373
<dependency>
7474
<groupId>io.wcm.tooling.commons</groupId>
7575
<artifactId>io.wcm.tooling.commons.crx-packmgr-helper</artifactId>
76-
<version>1.5.8</version>
76+
<version>1.5.10</version>
7777
<scope>compile</scope>
7878
</dependency>
7979

80-
<dependency>
81-
<groupId>org.apache.commons</groupId>
82-
<artifactId>commons-lang3</artifactId>
83-
<version>3.7</version>
84-
<scope>compile</scope>
85-
</dependency>
8680
<dependency>
8781
<groupId>com.day.commons</groupId>
8882
<artifactId>day-commons-any</artifactId>
@@ -99,14 +93,14 @@
9993
<dependency>
10094
<groupId>org.apache.commons</groupId>
10195
<artifactId>commons-compress</artifactId>
102-
<version>1.16.1</version>
96+
<version>1.18</version>
10397
<scope>compile</scope>
10498
</dependency>
10599

106100
<dependency>
107101
<groupId>org.apache.sling</groupId>
108102
<artifactId>org.apache.sling.jcr.contentparser</artifactId>
109-
<version>1.2.4</version>
103+
<version>1.2.6</version>
110104
<scope>compile</scope>
111105
<exclusions>
112106
<exclusion>
@@ -149,19 +143,19 @@
149143
<dependency>
150144
<groupId>org.xmlunit</groupId>
151145
<artifactId>xmlunit-core</artifactId>
152-
<version>2.6.0</version>
146+
<version>2.6.2</version>
153147
<scope>test</scope>
154148
</dependency>
155149
<dependency>
156150
<groupId>org.xmlunit</groupId>
157151
<artifactId>xmlunit-legacy</artifactId>
158-
<version>2.6.0</version>
152+
<version>2.6.2</version>
159153
<scope>test</scope>
160154
</dependency>
161155
<dependency>
162156
<groupId>org.zeroturnaround</groupId>
163157
<artifactId>zt-zip</artifactId>
164-
<version>1.12</version>
158+
<version>1.13</version>
165159
<scope>test</scope>
166160
</dependency>
167161

‎conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/postprocessor/ContentPackageOsgiConfigPostProcessor.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636

3737
import org.apache.commons.io.FilenameUtils;
3838
import org.apache.commons.lang3.StringUtils;
39-
import org.apache.felix.cm.file.ConfigurationHandler;
4039
import org.apache.sling.provisioning.model.Model;
4140
import org.slf4j.Logger;
4241

@@ -50,6 +49,7 @@
5049
import io.wcm.devops.conga.generator.spi.context.PostProcessorContext;
5150
import io.wcm.devops.conga.plugins.aem.util.ContentPackageUtil;
5251
import io.wcm.devops.conga.plugins.sling.util.ConfigConsumer;
52+
import io.wcm.devops.conga.plugins.sling.util.OsgiConfigUtil;
5353
import io.wcm.devops.conga.plugins.sling.util.ProvisioningUtil;
5454
import io.wcm.tooling.commons.contentpackagebuilder.ContentPackage;
5555
import io.wcm.tooling.commons.contentpackagebuilder.ContentPackageBuilder;
@@ -139,7 +139,7 @@ public Void accept(String path, Dictionary<String, Object> properties) throws IO
139139
// write configuration to temporary file
140140
File tempFile = File.createTempFile(NAME, ".config");
141141
try (OutputStream os = new FileOutputStream(tempFile)) {
142-
ConfigurationHandler.write(os, properties);
142+
OsgiConfigUtil.write(os, properties);
143143
}
144144
try {
145145
FileContext tempFileContext = new FileContext().file(tempFile).charset(StandardCharsets.UTF_8);

‎conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/postprocessor/ContentPackagePropertiesPostProcessor.java‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ public class ContentPackagePropertiesPostProcessor extends AbstractPostProcessor
5252
public static final String MODEL_OPTIONS_PROPERTY = "aemContentPackageProperties";
5353

5454
private static final String FILE_EXTENSION = "zip";
55+
private static final String ALTERNATE_FILE_EXTENSION = "jar";
5556

5657
@Override
5758
public String getName() {
@@ -60,12 +61,18 @@ public String getName() {
6061

6162
@Override
6263
public boolean accepts(FileContext file, PostProcessorContext context) {
63-
return FileUtil.matchesExtension(file, FILE_EXTENSION);
64+
return FileUtil.matchesExtension(file, FILE_EXTENSION)
65+
|| FileUtil.matchesExtension(file, ALTERNATE_FILE_EXTENSION);
6466
}
6567

6668
@Override
6769
public ImplicitApplyOptions implicitApply(FileContext file, PostProcessorContext context) {
68-
return ImplicitApplyOptions.ALWAYS;
70+
if (FileUtil.matchesExtension(file, FILE_EXTENSION)) {
71+
return ImplicitApplyOptions.ALWAYS;
72+
}
73+
else {
74+
return ImplicitApplyOptions.NEVER;
75+
}
6976
}
7077

7178
@Override

‎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>20</version>
29+
<version>25</version>
3030
<relativePath/>
3131
</parent>
3232

@@ -57,7 +57,7 @@
5757
<plugin>
5858
<groupId>io.wcm.devops.conga</groupId>
5959
<artifactId>conga-maven-plugin</artifactId>
60-
<version>1.9.2</version>
60+
<version>1.11.0</version>
6161
<extensions>true</extensions>
6262
<dependencies>
6363

‎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</groupId>
2525
<artifactId>io.wcm.devops.parent_toplevel</artifactId>
26-
<version>1.1.0</version>
26+
<version>1.1.4</version>
2727
<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.8.12</version>
32+
<version>1.8.14</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</groupId>
2727
<artifactId>io.wcm.devops.parent_toplevel</artifactId>
28-
<version>1.1.0</version>
28+
<version>1.1.4</version>
2929
<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.8.12</version>
35+
<version>1.8.14</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.8.12</version>
45+
<version>1.8.14</version>
4646
<scope>compile</scope>
4747
<exclusions>
4848
<!-- Exclude all deps - only crypto util classes are used -->

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525
<parent>
2626
<groupId>io.wcm.devops</groupId>
2727
<artifactId>io.wcm.devops.parent_toplevel</artifactId>
28-
<version>1.1.0</version>
28+
<version>1.1.4</version>
2929
<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>1.8.12</version>
35+
<version>1.8.14</version>
3636

3737
<name>CONGA AEM Maven Plugin</name>
3838
<description>wcm.io DevOps CONGA - CONfiguration GenerAtor Maven Plugin for AEM</description>
@@ -51,7 +51,7 @@
5151
<dependency>
5252
<groupId>io.wcm.devops.conga</groupId>
5353
<artifactId>io.wcm.devops.conga.generator</artifactId>
54-
<version>1.9.2</version>
54+
<version>1.11.0</version>
5555
<scope>compile</scope>
5656
</dependency>
5757
<dependency>
@@ -99,7 +99,7 @@
9999
<dependency>
100100
<groupId>io.wcm.tooling.commons</groupId>
101101
<artifactId>io.wcm.tooling.commons.crx-packmgr-helper</artifactId>
102-
<version>1.5.8</version>
102+
<version>1.5.10</version>
103103
<scope>compile</scope>
104104
</dependency>
105105
</dependencies>

0 commit comments

Comments
 (0)