[maven-release-plugin] copy for tag filevault-package-maven-plugin-1.1.0
git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/commons/filevault-package-maven-plugin/tags/filevault-package-maven-plugin-1.1.0@1872583 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index f71d94b..f5ceef0 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -15,16 +15,49 @@
limitations under the License.
-->
-Release Notes -- Apache Jackrabbit FileVault Package Maven Plugin -- Version 1.0.4
+Release Notes -- Apache Jackrabbit FileVault Package Maven Plugin -- Version 1.1.0
==================================================================================
Introduction
------------
-The Apache Jackrabbit FileVault package maven plugin is an Apache maven plugin that simplifies the creation of
-content package maven artifacts. The content packages can later be used to install content into a JCR repository
+The Apache Jackrabbit FileVault package Maven plugin is an Apache Maven plugin that simplifies the creation of
+content package Maven artifacts. The content packages can later be used to install content into a JCR repository
using the Apache Jackrabbit FileVault packaging runtime.
+Changes in Jackrabbit FileVault Package Maven Plugin 1.1.0
+----------------------------------------------------------
+
+#### Bug Fixes
+* [JCRVLT-342] - File leak in ProjectBuilder.getPluginVersion()
+* [JCRVLT-343] - Check for index definitions also considers ACL entries
+* [JCRVLT-351] - IOE thrown in case of no filter and <failOnEmptyFilter>false</failOnEmptyFilter>
+* [JCRVLT-354] - False warnings for files not being included in the package due to being outside of filter roots
+* [JCRVLT-355] - False error in case embedded file/subpackage is overwritten by jcrRootSourceDirectory
+* [JCRVLT-363] - .content.xml of ancestor nodes not included in package
+* [JCRVLT-381] - m2e Integration for goal "format-xml" might lead to endless loops
+* [JCRVLT-386] - Eclipse/m2e: Could not get metadata for dependencies which are resolved via m2e workspace resolution or for multimodule builds with phases < package
+* [JCRVLT-387] - Support reproducible builds
+
+#### New Features
+* [JCRVLT-232] - Enforce constraints for package types
+* [JCRVLT-345] - Support pluggable node/file/filter validators
+
+#### Improvements
+* [JCRVLT-350] - Make all goals support parallel builds (mark as threadSafe)
+* [JCRVLT-361] - Validate that all includes/excludes are below the filter root
+* [JCRVLT-365] - Migrate from JSR 305 to Jetbrains annotations
+* [JCRVLT-370] - New filter option below embeddeds and subpackages which removes other versions
+* [JCRVLT-371] - Include Maven groupId and artifactId of each dependency in the MANIFEST.MF and the properties.xml
+* [JCRVLT-373] - Log overlapping files from workDirectory and metaInf source directory
+* [JCRVLT-389] - Optionally support Maven Filtering during packaging
+* [JCRVLT-399] - Update to Jackrabbit 2.20.0 / Oak 1.20.0
+
+#### Tasks
+* [JCRVLT-392] - Support Matrix builds on Windows/Linux with Travis
+* [JCRVLT-393] - Java 13 Build Support
+
+
Changes in Jackrabbit FileVault Package Maven Plugin 1.0.4
----------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index df9cb55..8358fad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,8 +43,9 @@
<maven.version>3.3.9</maven.version> <!-- required for https://issues.apache.org/jira/browse/MNG-5440 -->
<aether.version>1.0.2.v20150114</aether.version>
<slf4j.version>1.7.5</slf4j.version>
- <jackrabbit.version>2.18.3</jackrabbit.version>
- <oak.version>1.16.0</oak.version>
+ <jackrabbit.version>2.20.0</jackrabbit.version>
+ <oak.version>1.20.0</oak.version>
+ <filevault.version>3.4.2</filevault.version>
</properties>
<prerequisites>
@@ -299,12 +300,12 @@
<dependency>
<groupId>org.apache.jackrabbit.vault</groupId>
<artifactId>org.apache.jackrabbit.vault</artifactId>
- <version>3.4.2</version>
+ <version>${filevault.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit.vault</groupId>
<artifactId>vault-validation</artifactId>
- <version>3.4.2</version>
+ <version>${filevault.version}</version>
</dependency>
<dependency>
<groupId>javax.jcr</groupId>
@@ -319,8 +320,8 @@
<!-- only a transitive dependency but must be declared due to https://issues.apache.org/jira/browse/JCRVLT-394 -->
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-api</artifactId>
- <version>${jackrabbit.version}</version>
+ <artifactId>oak-jackrabbit-api</artifactId>
+ <version>${oak.version}</version>
</dependency>
<!-- Maven Plugin stuff -->
<dependency>
diff --git a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/ValidationHelper.java b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/ValidationHelper.java
index a46f474..3f51d31 100644
--- a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/ValidationHelper.java
+++ b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/ValidationHelper.java
@@ -107,7 +107,7 @@
}
public void printUsedValidators(Log log, ValidationExecutor executor, ValidationContext context, boolean printUnusedValidators) {
- log.info("Using " + executor.getAllValidatorsById().entrySet().size() + " validators for package of type " + context.getPackageType() + ": " + ValidationHelper.getValidatorNames(executor, ", "));
+ log.info("Using " + executor.getAllValidatorsById().entrySet().size() + " validators for package of type " + context.getProperties().getPackageType() + ": " + ValidationHelper.getValidatorNames(executor, ", "));
if (printUnusedValidators) {
Map<String, Validator> unusedValidatorsById = executor.getUnusedValidatorsById();
if (!unusedValidatorsById.isEmpty()) {
diff --git a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/validator/impl/context/ArchiveValidationContextImpl.java b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/validator/impl/context/ArchiveValidationContextImpl.java
index a05d551..a1c4ecd 100644
--- a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/validator/impl/context/ArchiveValidationContextImpl.java
+++ b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/validator/impl/context/ArchiveValidationContextImpl.java
@@ -22,13 +22,10 @@
import org.apache.jackrabbit.vault.fs.api.WorkspaceFilter;
import org.apache.jackrabbit.vault.fs.io.Archive;
-import org.apache.jackrabbit.vault.packaging.PackageId;
import org.apache.jackrabbit.vault.packaging.PackageInfo;
import org.apache.jackrabbit.vault.packaging.PackageProperties;
-import org.apache.jackrabbit.vault.packaging.PackageType;
import org.apache.jackrabbit.vault.validation.spi.ValidationContext;
import org.apache.maven.plugin.logging.Log;
-import org.jetbrains.annotations.NotNull;
/**
@@ -70,20 +67,9 @@
return archivePath;
}
-
@Override
- public Collection<PackageInfo> getDependenciesMetaInfo() {
+ public Collection<PackageInfo> getDependenciesPackageInfo() {
return this.resolvedDependencies;
}
- @Override
- public @NotNull PackageId getId() {
- return properties.getId();
- }
-
- @Override
- public @NotNull PackageType getPackageType() {
- return properties.getPackageType();
- }
-
}
diff --git a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/validator/impl/context/DirectoryValidationContext.java b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/validator/impl/context/DirectoryValidationContext.java
index faf2fe9..ebc84a9 100644
--- a/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/validator/impl/context/DirectoryValidationContext.java
+++ b/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/validator/impl/context/DirectoryValidationContext.java
@@ -28,10 +28,8 @@
import org.apache.jackrabbit.vault.fs.api.WorkspaceFilter;
import org.apache.jackrabbit.vault.fs.config.ConfigurationException;
import org.apache.jackrabbit.vault.fs.config.DefaultWorkspaceFilter;
-import org.apache.jackrabbit.vault.packaging.PackageId;
import org.apache.jackrabbit.vault.packaging.PackageInfo;
import org.apache.jackrabbit.vault.packaging.PackageProperties;
-import org.apache.jackrabbit.vault.packaging.PackageType;
import org.apache.jackrabbit.vault.packaging.impl.DefaultPackageProperties;
import org.apache.jackrabbit.vault.util.Constants;
import org.apache.jackrabbit.vault.validation.spi.ValidationContext;
@@ -107,18 +105,8 @@
}
@Override
- public Collection<PackageInfo> getDependenciesMetaInfo() {
+ public Collection<PackageInfo> getDependenciesPackageInfo() {
return resolvedDependencies;
}
- @Override
- public PackageId getId() {
- return properties.getId();
- }
-
- @Override
- public PackageType getPackageType() {
- return properties.getPackageType();
- }
-
}
diff --git a/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/GenerateMetadataMojoTest.java b/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/GenerateMetadataMojoTest.java
index b24b78c..604284b 100644
--- a/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/GenerateMetadataMojoTest.java
+++ b/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/GenerateMetadataMojoTest.java
@@ -23,9 +23,6 @@
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
@@ -33,7 +30,6 @@
import java.util.jar.Manifest;
import java.util.regex.Pattern;
-import org.apache.commons.io.IOUtils;
import org.apache.jackrabbit.vault.fs.api.PathFilterSet;
import org.apache.jackrabbit.vault.fs.config.ConfigurationException;
import org.apache.jackrabbit.vault.fs.filter.DefaultPathFilter;
diff --git a/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/DefaultProjectIT.java b/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/DefaultProjectIT.java
index fd7c3a0..efb82af 100644
--- a/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/DefaultProjectIT.java
+++ b/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/DefaultProjectIT.java
@@ -27,11 +27,7 @@
import java.security.MessageDigest;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
-import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
import java.util.Calendar;
-import java.util.GregorianCalendar;
import java.util.TimeZone;
import org.apache.commons.io.IOUtils;
