Skip to content

Commit 6f27a1b

Browse files
stefanseifertstefanseifert
committed
[jgitflow-maven-plugin] merging 'release/1.8.10' into 'master'
2 parents c7b120d + 4c3f1e7 commit 6f27a1b

9 files changed

Lines changed: 62 additions & 16 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 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
2424
<body>
2525

26+
<release version="1.8.10" date="2018-08-17">
27+
<action type="update" dev="sseifert">
28+
conga-aem-maven-plugin: Improve error message in case of HTTP socket timeouts.
29+
</action>
30+
</release>
31+
2632
<release version="1.8.8" date="2018-07-13">
2733
<action type="fix" dev="sseifert">
2834
conga-aem-maven-plugin: Fix parsing of model YAML files which contain custom tags.

‎conga-aem-plugin/pom.xml‎

Lines changed: 2 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</artifactId>
34-
<version>1.8.8</version>
34+
<version>1.8.10</version>
3535
<packaging>jar</packaging>
3636

3737
<name>CONGA AEM Plugin</name>
@@ -73,7 +73,7 @@
7373
<dependency>
7474
<groupId>io.wcm.tooling.commons</groupId>
7575
<artifactId>io.wcm.tooling.commons.crx-packmgr-helper</artifactId>
76-
<version>1.5.4</version>
76+
<version>1.5.6</version>
7777
<scope>compile</scope>
7878
</dependency>
7979

‎example/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<dependency>
6666
<groupId>io.wcm.devops.conga.plugins</groupId>
6767
<artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
68-
<version>1.8.7-SNAPSHOT</version>
68+
<version>1.8.9-SNAPSHOT</version>
6969
</dependency>
7070

7171
</dependencies>

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

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

3535
<name>CONGA AEM Plugin</name>

‎src/site/markdown/crypto-cli.md.vm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ _**Please note:** You need to install the [Java Cryptography Extension (JCE) Unl
1212
Download it from Maven Central:
1313

1414
|---|---|---|
15-
| [CONGA AEM Crypto CLI tool](http://repo1.maven.org/maven2/io/wcm/devops/conga/plugins/conga-aem-crypto-cli/1.8.6/conga-aem-crypto-cli-${project.properties['releasedVersion.version']}-dist.zip) | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.wcm.devops.conga.plugins/conga-aem-crypto-cli/badge.svg)](http://repo1.maven.org/maven2/io/wcm/devops/conga/plugins/conga-aem-crypto-cli/1.8.6/conga-aem-crypto-cli-${project.properties['releasedVersion.version']}-dist.zip) |
15+
| [CONGA AEM Crypto CLI tool](http://repo1.maven.org/maven2/io/wcm/devops/conga/plugins/conga-aem-crypto-cli/${project.properties['releasedVersion.version']}/conga-aem-crypto-cli-${project.properties['releasedVersion.version']}-dist.zip) | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.wcm.devops.conga.plugins/conga-aem-crypto-cli/badge.svg)](http://repo1.maven.org/maven2/io/wcm/devops/conga/plugins/conga-aem-crypto-cli/${project.properties['releasedVersion.version']}/conga-aem-crypto-cli-${project.properties['releasedVersion.version']}-dist.zip) |
1616

1717

1818
### Generate AEM crypto keys

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<groupId>io.wcm.devops.conga.plugins</groupId>
3333
<artifactId>conga-aem-crypto-cli</artifactId>
3434
<packaging>jar</packaging>
35-
<version>1.8.8</version>
35+
<version>1.8.10</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.8</version>
45+
<version>1.8.10</version>
4646
<scope>compile</scope>
4747
<exclusions>
4848
<!-- Exclude all deps - only crypto util classes are used -->
@@ -104,14 +104,22 @@
104104
<dependency>
105105
<groupId>io.wcm.devops.conga.plugins</groupId>
106106
<artifactId>io.wcm.devops.conga.plugins.ansible</artifactId>
107-
<version>1.2.0</version>
107+
<version>1.3.0</version>
108108
<scope>compile</scope>
109109
<exclusions>
110110
<!-- Exclude all deps - only Ansible Vault util classes are used -->
111111
<exclusion>
112112
<groupId>io.wcm.devops.conga</groupId>
113113
<artifactId>io.wcm.devops.conga.generator</artifactId>
114114
</exclusion>
115+
<exclusion>
116+
<groupId>org.apache.commons</groupId>
117+
<artifactId>commons-exec</artifactId>
118+
</exclusion>
119+
<exclusion>
120+
<groupId>com.jayway.jsonpath</groupId>
121+
<artifactId>json-path</artifactId>
122+
</exclusion>
115123
</exclusions>
116124
</dependency>
117125

‎tooling/conga-aem-crypto-cli/src/main/java/io/wcm/devops/conga/plugins/aem/tooling/crypto/cli/AnsibleVault.java‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,19 @@ private AnsibleVault() {
4444
* @throws IOException I/O exception
4545
*/
4646
public static void encrypt(File file) throws IOException {
47+
encrypt(file, AnsibleVaultPassword.get());
48+
}
49+
50+
/**
51+
* Encrypts file with Ansible vault.
52+
* @param file File to encrypt
53+
* @param ansibleVaultPassword Ansible Vault Password
54+
* @throws IOException I/O exception
55+
*/
56+
public static void encrypt(File file, String ansibleVaultPassword) throws IOException {
4757
handleFile(file, data -> {
4858
try {
49-
return VaultHandler.encrypt(data, AnsibleVaultPassword.get());
59+
return VaultHandler.encrypt(data, ansibleVaultPassword);
5060
}
5161
catch (IOException ex) {
5262
throw new RuntimeException("Unable to encrypt file " + file.getPath(), ex);
@@ -60,9 +70,19 @@ public static void encrypt(File file) throws IOException {
6070
* @throws IOException I/O exception
6171
*/
6272
public static void decrypt(File file) throws IOException {
73+
decrypt(file, AnsibleVaultPassword.get());
74+
}
75+
76+
/**
77+
* Decrypts file with Ansible vault.
78+
* @param file File to decrypt
79+
* @param ansibleVaultPassword Ansible Vault Password
80+
* @throws IOException I/O exception
81+
*/
82+
public static void decrypt(File file, String ansibleVaultPassword) throws IOException {
6383
handleFile(file, data -> {
6484
try {
65-
return VaultHandler.decrypt(data, AnsibleVaultPassword.get());
85+
return VaultHandler.decrypt(data, ansibleVaultPassword);
6686
}
6787
catch (IOException ex) {
6888
throw new RuntimeException("Unable to decrypt file " + file.getPath(), ex);

‎tooling/conga-aem-crypto-cli/src/main/java/io/wcm/devops/conga/plugins/aem/tooling/crypto/cli/CryptoKeys.java‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,29 @@ private CryptoKeys() {
4949
* @throws GeneralSecurityException Security exception
5050
*/
5151
public static Stream<File> generate(File targetDir, boolean ansibleVaultEncrypt) throws GeneralSecurityException {
52+
return generate(targetDir, ansibleVaultEncrypt, AnsibleVaultPassword.get());
53+
}
54+
55+
/**
56+
* Generates AES and HMAC crypto keys for AEM.
57+
* @param targetDir Target directory
58+
* @param ansibleVaultEncrypt If true, the crypto keys are encrypted with Ansible Vault.
59+
* @param ansibleVaultPassword Ansible Vault Password
60+
* @return Generated files
61+
* @throws GeneralSecurityException Security exception
62+
*/
63+
public static Stream<File> generate(File targetDir, boolean ansibleVaultEncrypt,
64+
String ansibleVaultPassword) throws GeneralSecurityException {
5265
Stream<KeyItem> keys = Stream.of(
5366
new KeyItem("master", new AesCryptoSupport().generateKey().getEncoded()),
5467
new KeyItem("hmac", new HmacCryptoKeySupport().generateKey().getEncoded()));
5568
if (ansibleVaultEncrypt) {
56-
keys = encryptKeys(keys);
69+
keys = encryptKeys(keys, ansibleVaultPassword);
5770
}
5871
return writeKeys(keys, targetDir);
5972
}
6073

61-
private static Stream<KeyItem> encryptKeys(Stream<KeyItem> keys) {
62-
String password = AnsibleVaultPassword.get();
74+
private static Stream<KeyItem> encryptKeys(Stream<KeyItem> keys, String password) {
6375
return keys.map(key -> {
6476
try {
6577
return new KeyItem(key.getName(), VaultHandler.encrypt(key.getData(), password));

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<groupId>io.wcm.devops.conga.plugins</groupId>
3333
<artifactId>conga-aem-maven-plugin</artifactId>
3434
<packaging>maven-plugin</packaging>
35-
<version>1.8.8</version>
35+
<version>1.8.10</version>
3636

3737
<name>CONGA AEM Maven Plugin</name>
3838
<description>wcm.io DevOps CONGA - CONfiguration GenerAtor Maven Plugin for AEM</description>
@@ -57,7 +57,7 @@
5757
<dependency>
5858
<groupId>io.wcm.devops.conga.plugins</groupId>
5959
<artifactId>io.wcm.devops.conga.plugins.ansible</artifactId>
60-
<version>1.2.0</version>
60+
<version>1.3.0</version>
6161
<scope>compile</scope>
6262
</dependency>
6363

@@ -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.4</version>
102+
<version>1.5.6</version>
103103
<scope>compile</scope>
104104
</dependency>
105105
</dependencies>

0 commit comments

Comments
 (0)