You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by tr...@apache.org on 2017/12/01 16:32:49 UTC
svn commit: r1816884 - in
/jackrabbit/commons/filevault-package-maven-plugin/trunk/src:
main/java/org/apache/jackrabbit/filevault/maven/packaging/
test/java/org/apache/jackrabbit/filevault/maven/packaging/it/
test/resources/test-projects/properties-fro...
Author: tripod
Date: Fri Dec 1 16:32:48 2017
New Revision: 1816884
URL: http://svn.apache.org/viewvc?rev=1816884&view=rev
Log:
JCRVLT-239 Package Maven Plugin: Add "accessControlHandling" property (adding alias)
Added:
jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/properties-from-plugin-config-aliased/
jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/properties-from-plugin-config-aliased/pom.xml
Modified:
jackrabbit/commons/filevault-package-maven-plugin/trunk/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/VaultMojo.java
jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/PropertyConfigurationIT.java
Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/VaultMojo.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/VaultMojo.java?rev=1816884&r1=1816883&r2=1816884&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/VaultMojo.java (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/main/java/org/apache/jackrabbit/filevault/maven/packaging/VaultMojo.java Fri Dec 1 16:32:48 2017
@@ -270,6 +270,7 @@ public class VaultMojo extends AbstractM
*/
@Parameter(
property = "vault.acHandling",
+ alias = "acHandling",
required = false)
private AccessControlHandling accessControlHandling;
Modified: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/PropertyConfigurationIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/PropertyConfigurationIT.java?rev=1816884&r1=1816883&r2=1816884&view=diff
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/PropertyConfigurationIT.java (original)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/java/org/apache/jackrabbit/filevault/maven/packaging/it/PropertyConfigurationIT.java Fri Dec 1 16:32:48 2017
@@ -57,6 +57,19 @@ public class PropertyConfigurationIT {
.verifyPackageProperty("requiresRoot", "true")
.verifyPackageProperty("allowIndexDefinitions", "true")
.verifyPackageProperty("acHandling", "merge");
+ }
+
+ /**
+ * Tests set properties set explicitly as plugin config param have higher precedence than those in the properties map.
+ */
+ @Test
+ public void test_that_properties_set_in_plugin_config_have_higher_precedence_with_alias() throws Exception {
+ new ProjectBuilder()
+ .setTestProjectDir("properties-from-plugin-config-aliased")
+ .build()
+ .verifyPackageProperty("requiresRoot", "true")
+ .verifyPackageProperty("allowIndexDefinitions", "true")
+ .verifyPackageProperty("acHandling", "merge");
}
Added: jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/properties-from-plugin-config-aliased/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/properties-from-plugin-config-aliased/pom.xml?rev=1816884&view=auto
==============================================================================
--- jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/properties-from-plugin-config-aliased/pom.xml (added)
+++ jackrabbit/commons/filevault-package-maven-plugin/trunk/src/test/resources/test-projects/properties-from-plugin-config-aliased/pom.xml Fri Dec 1 16:32:48 2017
@@ -0,0 +1,55 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <!-- ====================================================================== -->
+ <!-- P R O J E C T D E S C R I P T I O N -->
+ <!-- ====================================================================== -->
+ <groupId>org.apache.jackrabbit.filevault</groupId>
+ <artifactId>package-plugin-test-pkg</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>content-package</packaging>
+
+ <build>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>filevault-package-maven-plugin</artifactId>
+ <version>${plugin.version}</version>
+ <extensions>true</extensions>
+ <configuration>
+ <failOnEmptyFilter>false</failOnEmptyFilter>
+
+ <!-- properties set here should have higher precedence than in the properties map -->
+ <requiresRoot>true</requiresRoot>
+ <allowIndexDefinitions>true</allowIndexDefinitions>
+ <!-- use alias -->
+ <acHandling>merge</acHandling>
+
+ <properties>
+ <requiresRoot>false</requiresRoot>
+ <allowIndexDefinitions>false</allowIndexDefinitions>
+ <acHandling>overwrite</acHandling>
+ </properties>
+
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>