Author: krosenvold
Date: Tue Nov 11 16:03:55 2014
New Revision: 1638198
URL: http://svn.apache.org/r1638198
Log:
Added precedence check for file items
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/emptyfile.txt
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/invoker.properties
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/src.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/verify.groovy
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/emptyfile.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/emptyfile.txt?rev=1638198&view=auto
==============================================================================
(empty)
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/invoker.properties?rev=1638198&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/invoker.properties
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/invoker.properties
Tue Nov 11 16:03:55 2014
@@ -0,0 +1,18 @@
+# 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.
+
+invoker.goals=clean
org.apache.maven.plugins:maven-assembly-plugin:${testVersion}:directory-inline
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/pom.xml?rev=1638198&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/pom.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/pom.xml
Tue Nov 11 16:03:55 2014
@@ -0,0 +1,47 @@
+<?xml version='1.0'?>
+<!--
+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>
+ <parent>
+ <groupId>org.apache.maven.plugin.assembly.test</groupId>
+ <artifactId>it-project-parent</artifactId>
+ <version>1</version>
+ </parent>
+
+ <groupId>test</groupId>
+ <artifactId>excluding-svn-dirs</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/src.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/src.xml?rev=1638198&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/src.xml
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/src.xml
Tue Nov 11 16:03:55 2014
@@ -0,0 +1,39 @@
+<?xml version='1.0'?>
+<!--
+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.
+-->
+
+<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
+ <id>src</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <files>
+ <file>
+ <source>emptyfile.txt</source>
+ <destName>fud.txt</destName>
+ </file>
+ <file>
+ <source>src.xml</source>
+ <destName>fud.txt</destName>
+ </file>
+ </files>
+</assembly>
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/verify.groovy
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/verify.groovy?rev=1638198&view=auto
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/verify.groovy
(added)
+++
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/file-sets/precedence-check/verify.groovy
Tue Nov 11 16:03:55 2014
@@ -0,0 +1,24 @@
+/*
+ * 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.
+ */
+
+
+File assemblyDir = new File( basedir,
"target/excluding-svn-dirs-1.0-SNAPSHOT-src/fud.txt" );
+
+assert assemblyDir.length( ) == 0;
+return true;
