You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2014/10/29 06:07:51 UTC
svn commit: r1635043 - in
/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir:
./ src/ src/main/ src/main/assembly/ src/main/filters/
Author: krosenvold
Date: Wed Oct 29 05:07:50 2014
New Revision: 1635043
URL: http://svn.apache.org/r1635043
Log:
[MASSEMBLY-579] IT Added
Added:
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/invoker.properties
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/src/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/src/main/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/src/main/assembly/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/src/main/assembly/unpack-deps.xml
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/src/main/filters/
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/src/main/filters/my.properties
maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/verify.bsh
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/invoker.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/invoker.properties?rev=1635043&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/invoker.properties (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/invoker.properties Wed Oct 29 05:07:50 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 package
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/pom.xml?rev=1635043&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/pom.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/pom.xml Wed Oct 29 05:07:50 2014
@@ -0,0 +1,43 @@
+<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/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.github.runeflobakk</groupId>
+ <artifactId>assembly-plugin-bug-demo</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>${project.artifactId}</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-default-skin</artifactId>
+ <version>1.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bundle-unpacked-dependency</id>
+ <phase>package</phase>
+ <goals><goal>single</goal></goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/unpack-deps.xml</descriptor>
+ </descriptors>
+ <filters>
+ <filter>src/main/filters/my.properties</filter>
+ </filters>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/src/main/assembly/unpack-deps.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/src/main/assembly/unpack-deps.xml?rev=1635043&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/src/main/assembly/unpack-deps.xml (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/src/main/assembly/unpack-deps.xml Wed Oct 29 05:07:50 2014
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+
+
+ <id>my-assembly</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+
+ <dependencySets>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <includes>
+ <include>*:maven-default-skin:*:*</include>
+ </includes>
+ <outputDirectory>deps</outputDirectory>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <filtered>true</filtered>
+ </unpackOptions>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
\ No newline at end of file
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/src/main/filters/my.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/src/main/filters/my.properties?rev=1635043&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/src/main/filters/my.properties (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/src/main/filters/my.properties Wed Oct 29 05:07:50 2014
@@ -0,0 +1 @@
+my.name=John Doe
Added: maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/verify.bsh?rev=1635043&view=auto
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/verify.bsh (added)
+++ maven/plugins/trunk/maven-assembly-plugin/src/it/projects/dependency-sets/unpack-deps-correct-dir/verify.bsh Wed Oct 29 05:07:50 2014
@@ -0,0 +1,33 @@
+/*
+ * 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.
+ */
+
+import java.io.*;
+import java.util.zip.*;
+
+ZipFile zf = new ZipFile( new File( basedir, "target/assembly-plugin-bug-demo-1.0-SNAPSHOT-my-assembly.zip" ) );
+
+ZipEntry child1InclEntry = zf.getEntry( "assembly-plugin-bug-demo-1.0-SNAPSHOT/deps/META-INF/maven/org.apache.maven.skins/maven-default-skin/pom.xml" );
+
+if ( child1InclEntry == null )
+{
+ System.out.println( "Incorrect path of unpacked jar file" );
+ return false;
+}
+
+return true;