You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by an...@apache.org on 2019/12/13 21:03:44 UTC
[sling-org-apache-sling-feature-cpconverter] branch master updated:
Fixed for a failing test and adjustments for the release 1.0.0
This is an automated email from the ASF dual-hosted git repository.
andysch pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-cpconverter.git
The following commit(s) were added to refs/heads/master by this push:
new ffabb51 Fixed for a failing test and adjustments for the release 1.0.0
ffabb51 is described below
commit ffabb51033243e9a1004dd89c651c37d75bdf766
Author: Andreas Schaefer <sc...@iMac.local>
AuthorDate: Fri Dec 13 13:03:29 2019 -0800
Fixed for a failing test and adjustments for the release 1.0.0
---
pom.xml | 73 ++++++++++++++--------
.../vltpkg/VaultPackageAssemblerTest.java | 2 +-
2 files changed, 49 insertions(+), 26 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3347b7e..a0fe8d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,6 +36,30 @@
<properties>
<sling.java.version>8</sling.java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <picocli.version>3.6.0</picocli.version>
+ <org.apache.jackrabbit.vault.version>3.2.8</org.apache.jackrabbit.vault.version>
+ <jackrabbit-spi-commons.version>2.19.5</jackrabbit-spi-commons.version>
+ <commons-io.version>2.6</commons-io.version>
+ <org.apache.sling.feature.version>1.1.0</org.apache.sling.feature.version>
+ <org.apache.sling.feature.io.version>1.1.0</org.apache.sling.feature.io.version>
+ <org.apache.felix.converter.version>1.0.8</org.apache.felix.converter.version>
+ <org.apache.felix.configurator.version>1.0.10</org.apache.felix.configurator.version>
+ <org.apache.felix.utils.version>1.11.2</org.apache.felix.utils.version>
+ <geronimo-json_1.0_spec.version>1.0-alpha-1</geronimo-json_1.0_spec.version>
+ <johnzon-core.version>1.0.2</johnzon-core.version>
+ <org.osgi.annotation.versioning.version>1.0.0</org.osgi.annotation.versioning.version>
+ <osgi.core.version>6.0.0</osgi.core.version>
+ <org.apache.felix.configadmin.version>1.9.16</org.apache.felix.configadmin.version>
+ <jackrabbit-api.version>2.19.3</jackrabbit-api.version>
+ <plexus-archiver.version>4.1.0</plexus-archiver.version>
+ <plexus-utils.version>3.2.1</plexus-utils.version>
+ <plexus-io.version>3.1.1</plexus-io.version>
+ <plexus-container-default.version>2.0.0</plexus-container-default.version>
+ <maven-model.version>3.6.3</maven-model.version>
+ <mockito-core.version>3.2.0</mockito-core.version>
+ <org.apache.sling.repoinit.parser.version>1.3.2</org.apache.sling.repoinit.parser.version>
+ <license-maven-plugin.version>1.16</license-maven-plugin.version>
+ <appassembler-maven-plugin.version>2.0.0</appassembler-maven-plugin.version>
</properties>
<dependencies>
@@ -58,7 +82,7 @@
<dependency>
<groupId>info.picocli</groupId>
<artifactId>picocli</artifactId>
- <version>3.6.0</version>
+ <version>${picocli.version}</version>
<scope>provided</scope>
</dependency>
@@ -68,13 +92,13 @@
<dependency>
<groupId>org.apache.jackrabbit.vault</groupId>
<artifactId>org.apache.jackrabbit.vault</artifactId>
- <version>3.2.8</version>
+ <version>${org.apache.jackrabbit.vault.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-spi-commons</artifactId>
- <version>2.19.3</version>
+ <version>${jackrabbit-spi-commons.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -85,7 +109,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.6</version>
+ <version>${commons-io.version}</version>
<scope>provided</scope>
</dependency>
@@ -95,55 +119,55 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.feature</artifactId>
- <version>1.0.4</version>
+ <version>${org.apache.sling.feature.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.feature.io</artifactId>
- <version>1.0.4</version>
+ <version>${org.apache.sling.feature.io.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.converter</artifactId>
- <version>1.0.8</version>
+ <version>${org.apache.felix.converter.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configurator</artifactId>
- <version>1.0.10</version>
+ <version>${org.apache.felix.configurator.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.utils</artifactId>
- <version>1.11.2</version>
+ <version>${org.apache.felix.utils.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-json_1.0_spec</artifactId>
- <version>1.0-alpha-1</version>
+ <version>${geronimo-json_1.0_spec.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.johnzon</groupId>
<artifactId>johnzon-core</artifactId>
- <version>1.0.0</version>
+ <version>${johnzon-core.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.annotation.versioning</artifactId>
- <version>1.0.0</version>
+ <version>${org.osgi.annotation.versioning.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
- <version>6.0.0</version>
+ <version>${osgi.core.version}</version>
<scope>compile</scope>
</dependency>
@@ -153,13 +177,13 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.9.16</version>
+ <version>${org.apache.felix.configadmin.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-api</artifactId>
- <version>2.19.3</version>
+ <version>${jackrabbit-api.version}</version>
<scope>provided</scope>
</dependency>
@@ -169,19 +193,19 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
- <version>4.1.0</version>
+ <version>${plexus-archiver.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.2.0</version>
+ <version>${plexus-utils.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-io</artifactId>
- <version>3.1.1</version>
+ <version>${plexus-io.version}</version>
<scope>provided</scope>
</dependency>
<!--
@@ -190,7 +214,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
- <version>2.0.0</version>
+ <version>${plexus-container-default.version}</version>
<scope>provided</scope>
</dependency>
@@ -200,7 +224,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
- <version>3.6.0</version>
+ <version>${maven-model.version}</version>
<scope>provided</scope>
</dependency>
@@ -215,13 +239,13 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>2.25.0</version>
+ <version>${mockito-core.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.repoinit.parser</artifactId>
- <version>1.2.4</version>
+ <version>${org.apache.sling.repoinit.parser.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -242,7 +266,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
- <version>1.16</version>
+ <version>${license-maven-plugin.version}</version>
<executions>
<execution>
<id>add-third-party</id>
@@ -266,7 +290,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>appassembler-maven-plugin</artifactId>
- <version>2.0.0</version>
+ <version>${appassembler-maven-plugin.version}</version>
<executions>
<execution>
<phase>package</phase>
@@ -294,7 +318,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.1.0</version>
<executions>
<execution>
<id>assembly</id>
diff --git a/src/test/java/org/apache/sling/feature/cpconverter/vltpkg/VaultPackageAssemblerTest.java b/src/test/java/org/apache/sling/feature/cpconverter/vltpkg/VaultPackageAssemblerTest.java
index 88f8e4b..71affa0 100644
--- a/src/test/java/org/apache/sling/feature/cpconverter/vltpkg/VaultPackageAssemblerTest.java
+++ b/src/test/java/org/apache/sling/feature/cpconverter/vltpkg/VaultPackageAssemblerTest.java
@@ -90,7 +90,7 @@ public class VaultPackageAssemblerTest {
VaultPackageAssembler assembler = VaultPackageAssembler.create(vaultPackage);
PackageId packageId = vaultPackage.getId();
- String fileName = packageId.toString().replace("/", "-") + "-" + vaultPackage.getFile().getName();
+ String fileName = packageId.toString().replaceAll("/", "-").replaceAll(":", "-") + "-" + vaultPackage.getFile().getName();
File storingDirectory = new File(TMP_DIR, fileName + "-deflated");
assertTrue("Storing Directory for Vault Package does not exist", storingDirectory.exists());
}