You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2014/10/23 23:01:38 UTC
svn commit: r1633948 [15/21] - in /maven/plugins/branches/MASSEMBLY-704: ./
integration-test-archetype/
integration-test-archetype/src/main/resources/META-INF/maven/
integration-test-archetype/src/main/resources/archetype-resources/
integration-test-ar...
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project2/child-level2-project1/src/main/java/test/App2.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project2/child-level2-project1/src/main/java/test/App2.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project2/child-level2-project1/src/main/java/test/App2.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project2/child-level2-project1/src/main/java/test/App2.java Thu Oct 23 21:01:23 2014
@@ -1,5 +1,25 @@
package test;
+/*
+ * 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.
+ */
+
+
/**
* Hello world!
*
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project2/child-level2-project1/src/test/java/test/App2Test.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project2/child-level2-project1/src/test/java/test/App2Test.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project2/child-level2-project1/src/test/java/test/App2Test.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project2/child-level2-project1/src/test/java/test/App2Test.java Thu Oct 23 21:01:23 2014
@@ -1,5 +1,25 @@
package test;
+/*
+ * 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 junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project2/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project2/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/child-level1-project2/pom.xml Thu Oct 23 21:01:23 2014
@@ -1,4 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+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>
<parent>
<groupId>test</groupId>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/pom.xml Thu Oct 23 21:01:23 2014
@@ -1,4 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+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>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/src/main/assembly/src.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/src/main/assembly/src.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/src/main/assembly/src.xml Thu Oct 23 21:01:23 2014
@@ -1,3 +1,23 @@
+<?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">
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/verify.bsh?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/verify.bsh (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-dontIncludeSubModules-artifactIdExprOutDir/verify.bsh Thu Oct 23 21:01:23 2014
@@ -1,3 +1,22 @@
+/*
+ * 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.net.*;
import java.util.jar.*;
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project1/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project1/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project1/pom.xml Thu Oct 23 21:01:23 2014
@@ -1,4 +1,24 @@
<?xml version="1.0"?><project>
+
+<!--
+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.
+-->
+
<parent>
<groupId>test</groupId>
<artifactId>two-level-multimodule</artifactId>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project1/src/main/java/test/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project1/src/main/java/test/App.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project1/src/main/java/test/App.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project1/src/main/java/test/App.java Thu Oct 23 21:01:23 2014
@@ -1,5 +1,25 @@
package test;
+/*
+ * 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.
+ */
+
+
/**
* Hello world!
*
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project1/src/test/java/test/AppTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project1/src/test/java/test/AppTest.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project1/src/test/java/test/AppTest.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project1/src/test/java/test/AppTest.java Thu Oct 23 21:01:23 2014
@@ -1,5 +1,25 @@
package test;
+/*
+ * 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 junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/child-level2-project1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/child-level2-project1/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/child-level2-project1/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/child-level2-project1/pom.xml Thu Oct 23 21:01:23 2014
@@ -1,4 +1,24 @@
<?xml version="1.0"?><project>
+
+<!--
+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.
+-->
+
<parent>
<artifactId>child-level1-project2</artifactId>
<groupId>test</groupId>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/child-level2-project1/src/main/java/test/App2.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/child-level2-project1/src/main/java/test/App2.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/child-level2-project1/src/main/java/test/App2.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/child-level2-project1/src/main/java/test/App2.java Thu Oct 23 21:01:23 2014
@@ -1,5 +1,25 @@
package test;
+/*
+ * 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.
+ */
+
+
/**
* Hello world!
*
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/child-level2-project1/src/test/java/test/App2Test.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/child-level2-project1/src/test/java/test/App2Test.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/child-level2-project1/src/test/java/test/App2Test.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/child-level2-project1/src/test/java/test/App2Test.java Thu Oct 23 21:01:23 2014
@@ -1,5 +1,25 @@
package test;
+/*
+ * 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 junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/child-level1-project2/pom.xml Thu Oct 23 21:01:23 2014
@@ -1,4 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+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>
<parent>
<groupId>test</groupId>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/pom.xml Thu Oct 23 21:01:23 2014
@@ -1,4 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+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>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/src/main/assembly/src.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/src/main/assembly/src.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/src/main/assembly/src.xml Thu Oct 23 21:01:23 2014
@@ -1,3 +1,23 @@
+<?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">
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/verify.bsh?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/verify.bsh (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/multimodule/twoLevel-includeSubModules-excludeSubModuleSourceDirs/verify.bsh Thu Oct 23 21:01:23 2014
@@ -1,3 +1,22 @@
+/*
+ * 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.net.*;
import java.util.jar.*;
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/basic-repository/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/basic-repository/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/basic-repository/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/basic-repository/pom.xml Thu Oct 23 21:01:23 2014
@@ -1,3 +1,23 @@
+<?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>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/basic-repository/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/basic-repository/src/assemble/bin.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/basic-repository/src/assemble/bin.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/basic-repository/src/assemble/bin.xml Thu Oct 23 21:01:23 2014
@@ -1,3 +1,23 @@
+<?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">
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/basic-repository/src/main/java/org/apache/maven/plugin/assembly/test/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/basic-repository/src/main/java/org/apache/maven/plugin/assembly/test/App.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/basic-repository/src/main/java/org/apache/maven/plugin/assembly/test/App.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/basic-repository/src/main/java/org/apache/maven/plugin/assembly/test/App.java Thu Oct 23 21:01:23 2014
@@ -1,5 +1,25 @@
package org.apache.maven.plugin.assembly.test;
+/*
+ * 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.
+ */
+
+
/**
* Hello world!
*
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/basic-repository/src/test/java/org/apache/maven/plugin/assembly/test/AppTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/basic-repository/src/test/java/org/apache/maven/plugin/assembly/test/AppTest.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/basic-repository/src/test/java/org/apache/maven/plugin/assembly/test/AppTest.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/basic-repository/src/test/java/org/apache/maven/plugin/assembly/test/AppTest.java Thu Oct 23 21:01:23 2014
@@ -1,5 +1,25 @@
package org.apache.maven.plugin.assembly.test;
+/*
+ * 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 junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/basic-repository/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/basic-repository/verify.bsh?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/basic-repository/verify.bsh (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/basic-repository/verify.bsh Thu Oct 23 21:01:23 2014
@@ -1,3 +1,22 @@
+/*
+ * 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.*;
File junitJar = new File( basedir, "target/assembly-bin/repo/junit/junit/3.8.1/junit-3.8.1.jar" );
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/massembly-196/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/massembly-196/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/massembly-196/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/massembly-196/pom.xml Thu Oct 23 21:01:23 2014
@@ -1,4 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+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>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/massembly-196/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/massembly-196/src/main/assembly/bin.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/massembly-196/src/main/assembly/bin.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/massembly-196/src/main/assembly/bin.xml Thu Oct 23 21:01:23 2014
@@ -1,3 +1,23 @@
+<?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">
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/massembly-196/src/main/java/test/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/massembly-196/src/main/java/test/App.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/massembly-196/src/main/java/test/App.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/massembly-196/src/main/java/test/App.java Thu Oct 23 21:01:23 2014
@@ -1,5 +1,25 @@
package test;
+/*
+ * 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.
+ */
+
+
/**
* Hello world!
*
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/massembly-196/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/massembly-196/verify.bsh?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/massembly-196/verify.bsh (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/massembly-196/verify.bsh Thu Oct 23 21:01:23 2014
@@ -1,3 +1,22 @@
+/*
+ * 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.File;
File jarPlugin = new File( basedir, "target/massembly-196-1-bin/repo/org/apache/maven/plugins/maven-jar-plugin/2.0/maven-jar-plugin-2.0.jar" );
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/repo-with-snapshot-parents/child/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/repo-with-snapshot-parents/child/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/repo-with-snapshot-parents/child/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/repo-with-snapshot-parents/child/pom.xml Thu Oct 23 21:01:23 2014
@@ -1,3 +1,23 @@
+<?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>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/repo-with-snapshot-parents/child/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/repo-with-snapshot-parents/child/src/assemble/bin.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/repo-with-snapshot-parents/child/src/assemble/bin.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/repo-with-snapshot-parents/child/src/assemble/bin.xml Thu Oct 23 21:01:23 2014
@@ -1,3 +1,23 @@
+<?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">
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/repo-with-snapshot-parents/child/src/main/java/org/apache/maven/plugin/assembly/test/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/repo-with-snapshot-parents/child/src/main/java/org/apache/maven/plugin/assembly/test/App.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/repo-with-snapshot-parents/child/src/main/java/org/apache/maven/plugin/assembly/test/App.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/repo-with-snapshot-parents/child/src/main/java/org/apache/maven/plugin/assembly/test/App.java Thu Oct 23 21:01:23 2014
@@ -1,5 +1,25 @@
package org.apache.maven.plugin.assembly.test;
+/*
+ * 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.
+ */
+
+
/**
* Hello world!
*
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/repo-with-snapshot-parents/child/src/test/java/org/apache/maven/plugin/assembly/test/AppTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/repo-with-snapshot-parents/child/src/test/java/org/apache/maven/plugin/assembly/test/AppTest.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/repo-with-snapshot-parents/child/src/test/java/org/apache/maven/plugin/assembly/test/AppTest.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/repo-with-snapshot-parents/child/src/test/java/org/apache/maven/plugin/assembly/test/AppTest.java Thu Oct 23 21:01:23 2014
@@ -1,5 +1,25 @@
package org.apache.maven.plugin.assembly.test;
+/*
+ * 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 junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/repo-with-snapshot-parents/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/repo-with-snapshot-parents/pom.xml?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/repo-with-snapshot-parents/pom.xml (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/repo-with-snapshot-parents/pom.xml Thu Oct 23 21:01:23 2014
@@ -1,3 +1,23 @@
+<?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>
Modified: maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/repo-with-snapshot-parents/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/repo-with-snapshot-parents/verify.bsh?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/repo-with-snapshot-parents/verify.bsh (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/it/projects/repositories/repo-with-snapshot-parents/verify.bsh Thu Oct 23 21:01:23 2014
@@ -1,3 +1,22 @@
+/*
+ * 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.*;
File junitJar = new File( basedir, "child/target/assembly-bin/repo/junit/junit/3.8.1/junit-3.8.1.jar" );
Modified: maven/plugins/branches/MASSEMBLY-704/src/main/java/org/apache/maven/plugin/assembly/AssemblerConfigurationSource.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/main/java/org/apache/maven/plugin/assembly/AssemblerConfigurationSource.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/main/java/org/apache/maven/plugin/assembly/AssemblerConfigurationSource.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/main/java/org/apache/maven/plugin/assembly/AssemblerConfigurationSource.java Thu Oct 23 21:01:23 2014
@@ -24,6 +24,7 @@ import org.apache.maven.artifact.reposit
import org.apache.maven.execution.MavenSession;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.filtering.MavenFileFilter;
+import org.apache.maven.shared.filtering.MavenReaderFilter;
import java.io.File;
import java.util.List;
@@ -34,69 +35,184 @@ import java.util.List;
public interface AssemblerConfigurationSource
{
+ /**
+ * @return The descriptor.
+ */
String getDescriptor();
+ /**
+ * @return The descriptor id.
+ */
String getDescriptorId();
+ /**
+ * @return The descriptors.
+ */
String[] getDescriptors();
+ /**
+ * @return The descriptor references.
+ */
String[] getDescriptorReferences();
+ /**
+ * @return The descriptor source direcotoy.
+ */
File getDescriptorSourceDirectory();
+ /**
+ * @return The base directory.
+ */
File getBasedir();
+ /**
+ * @return The Maven Project.
+ */
MavenProject getProject();
+ /**
+ * @return Site included.
+ */
boolean isSiteIncluded();
+ /**
+ * @return The site directory.
+ */
File getSiteDirectory();
+ /**
+ * @return The final name.
+ */
String getFinalName();
+ /**
+ * @return append the assembly id.
+ */
boolean isAssemblyIdAppended();
+ /**
+ * @return The classifier.
+ */
String getClassifier();
+ /**
+ * @return Tar long file mode.
+ */
String getTarLongFileMode();
+ /**
+ * @return The output directory.
+ */
File getOutputDirectory();
+ /**
+ * @return The working direcotory.
+ */
File getWorkingDirectory();
+ /**
+ * @return the jar archive configuration.
+ */
MavenArchiveConfiguration getJarArchiveConfiguration();
+ /**
+ * @return The local repository.
+ */
ArtifactRepository getLocalRepository();
+ /**
+ * @return The temporary root directory.
+ */
File getTemporaryRootDirectory();
+ /**
+ * @return The archive base directory.
+ */
File getArchiveBaseDirectory();
+ /**
+ * @return The filters.
+ */
List<String> getFilters();
+ /**
+ * @return include the project build filters or not.
+ */
+ boolean isIncludeProjectBuildFilters();
+
+ /**
+ * @return The list of reactor projects.
+ */
List<MavenProject> getReactorProjects();
+ /**
+ * @return The remote repositories.
+ */
List<ArtifactRepository> getRemoteRepositories();
+ /**
+ * @return Is this a test run.
+ */
boolean isDryRun();
+ /**
+ * @return Ignore directory format extensions.
+ */
boolean isIgnoreDirFormatExtensions();
+ /**
+ * @return Ignore missing descriptor.
+ */
boolean isIgnoreMissingDescriptor();
+ /**
+ * @return The maven session.
+ */
MavenSession getMavenSession();
+ /**
+ * @return The archiver configu.
+ */
String getArchiverConfig();
+ /**
+ * @return The maven file filter.
+ */
MavenFileFilter getMavenFileFilter();
+ /**
+ * Maven shared filtering utility.
+ */
+ MavenReaderFilter getMavenReaderFilter();
+
+ /**
+ * @return Update only yes/no.
+ */
boolean isUpdateOnly();
+ /**
+ * @return Use JVM chmod yes/no.
+ */
boolean isUseJvmChmod();
+ /**
+ * @return Ignore permissions yes/no.
+ */
boolean isIgnorePermissions();
-
+
+ /**
+ * @return The current encoding.
+ */
String getEncoding();
+ /**
+ * @return The escape string.
+ */
String getEscapeString();
+
+ /**
+ * @return The list of delimiters.
+ */
+ List<String> getDelimiters();
+
}
Modified: maven/plugins/branches/MASSEMBLY-704/src/main/java/org/apache/maven/plugin/assembly/InvalidAssemblerConfigurationException.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/main/java/org/apache/maven/plugin/assembly/InvalidAssemblerConfigurationException.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/main/java/org/apache/maven/plugin/assembly/InvalidAssemblerConfigurationException.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/main/java/org/apache/maven/plugin/assembly/InvalidAssemblerConfigurationException.java Thu Oct 23 21:01:23 2014
@@ -28,11 +28,18 @@ public class InvalidAssemblerConfigurati
private static final long serialVersionUID = 1L;
+ /**
+ * @param message The message.
+ * @param error The error
+ */
public InvalidAssemblerConfigurationException( final String message, final Throwable error )
{
super( message, error );
}
+ /**
+ * @param message The message.
+ */
public InvalidAssemblerConfigurationException( final String message )
{
super( message );
Modified: maven/plugins/branches/MASSEMBLY-704/src/main/java/org/apache/maven/plugin/assembly/archive/ArchiveCreationException.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/main/java/org/apache/maven/plugin/assembly/archive/ArchiveCreationException.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/main/java/org/apache/maven/plugin/assembly/archive/ArchiveCreationException.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/main/java/org/apache/maven/plugin/assembly/archive/ArchiveCreationException.java Thu Oct 23 21:01:23 2014
@@ -28,11 +28,19 @@ public class ArchiveCreationException
private static final long serialVersionUID = 1L;
+ /**
+ * Create in instance.
+ * @param message The message to use.
+ * @param error The error.
+ */
public ArchiveCreationException( final String message, final Throwable error )
{
super( message, error );
}
+ /**
+ * @param message The message.
+ */
public ArchiveCreationException( final String message )
{
super( message );
Modified: maven/plugins/branches/MASSEMBLY-704/src/main/java/org/apache/maven/plugin/assembly/archive/ArchiveExpansionException.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/main/java/org/apache/maven/plugin/assembly/archive/ArchiveExpansionException.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/main/java/org/apache/maven/plugin/assembly/archive/ArchiveExpansionException.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/main/java/org/apache/maven/plugin/assembly/archive/ArchiveExpansionException.java Thu Oct 23 21:01:23 2014
@@ -28,11 +28,18 @@ public class ArchiveExpansionException
private static final long serialVersionUID = 1L;
+ /**
+ * @param message The message to use for this instance.
+ * @param error The error which has been thrown.
+ */
public ArchiveExpansionException( final String message, final Throwable error )
{
super( message, error );
}
+ /**
+ * @param message The message.
+ */
public ArchiveExpansionException( final String message )
{
super( message );
Modified: maven/plugins/branches/MASSEMBLY-704/src/main/java/org/apache/maven/plugin/assembly/archive/AssemblyArchiver.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/main/java/org/apache/maven/plugin/assembly/archive/AssemblyArchiver.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/main/java/org/apache/maven/plugin/assembly/archive/AssemblyArchiver.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/main/java/org/apache/maven/plugin/assembly/archive/AssemblyArchiver.java Thu Oct 23 21:01:23 2014
@@ -33,6 +33,28 @@ public interface AssemblyArchiver
{
String ROLE = AssemblyArchiver.class.getName();
+ /**
+ * Create the assembly archive. Generally:
+ * <ol>
+ * <li>Setup any directory structures for temporary files</li>
+ * <li>Calculate the output directory/file for the assembly</li>
+ * <li>Setup any handler components for special descriptor files we may encounter</li>
+ * <li>Lookup and configure the {@link org.codehaus.plexus.archiver.Archiver} to be used</li>
+ * <li>Determine what, if any, dependency resolution will be required, and resolve any dependency-version conflicts
+ * up front to produce a managed-version map for the whole assembly process.</li>
+ * <li>Iterate through the available {@link org.apache.maven.plugin.assembly.archive.phase.AssemblyArchiverPhase} instances, executing each to handle a different
+ * top-level section of the assembly descriptor, if that section is present.</li>
+ * </ol>
+ * @param assembly The {@link Assembly}
+ * @param fullName The full name.
+ * @param format The format.
+ * @param configSource The {@link AssemblerConfigurationSource}
+ * @param recompressZippedFiles recompress zipped files.
+ * @return The resulting archive file.
+ * @throws ArchiveCreationException
+ * @throws AssemblyFormattingException
+ * @throws InvalidAssemblerConfigurationException
+ */
File createArchive( Assembly assembly, String fullName, String format, AssemblerConfigurationSource configSource,
boolean recompressZippedFiles )
throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException;
Modified: maven/plugins/branches/MASSEMBLY-704/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/main/java/org/apache/maven/plugin/assembly/archive/DefaultAssemblyArchiver.java Thu Oct 23 21:01:23 2014
@@ -27,11 +27,11 @@ import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Set;
+import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.DebugConfigurationListener;
import org.apache.maven.plugin.assembly.AssemblerConfigurationSource;
-import org.apache.maven.plugin.assembly.AssemblyContext;
-import org.apache.maven.plugin.assembly.DefaultAssemblyContext;
import org.apache.maven.plugin.assembly.InvalidAssemblerConfigurationException;
import org.apache.maven.plugin.assembly.archive.archiver.AssemblyProxyArchiver;
import org.apache.maven.plugin.assembly.archive.phase.AssemblyArchiverPhase;
@@ -43,6 +43,9 @@ import org.apache.maven.plugin.assembly.
import org.apache.maven.plugin.assembly.interpolation.AssemblyExpressionEvaluator;
import org.apache.maven.plugin.assembly.model.Assembly;
import org.apache.maven.plugin.assembly.model.ContainerDescriptorHandlerConfig;
+import org.apache.maven.plugin.assembly.model.ModuleSet;
+import org.apache.maven.plugin.assembly.resolved.ResolvedAssembly;
+import org.apache.maven.plugin.assembly.resolved.ResolvedModuleSet;
import org.apache.maven.plugin.assembly.utils.AssemblyFileUtils;
import org.apache.maven.plugin.assembly.utils.AssemblyFormatUtils;
import org.codehaus.plexus.PlexusConstants;
@@ -104,12 +107,17 @@ public class DefaultAssemblyArchiver
private PlexusContainer container;
+ @SuppressWarnings( "UnusedDeclaration" )
public DefaultAssemblyArchiver()
{
- // needed for plexus
}
// introduced for testing.
+ /**
+ * @param archiverManager The archive manager.
+ * @param resolver The {@link DependencyResolver}.
+ * @param assemblyPhases The list of {@link AssemblyArchiverPhase}
+ */
protected DefaultAssemblyArchiver( final ArchiverManager archiverManager, final DependencyResolver resolver,
final List<AssemblyArchiverPhase> assemblyPhases )
{
@@ -118,19 +126,7 @@ public class DefaultAssemblyArchiver
this.assemblyPhases = assemblyPhases;
}
- /**
- * Create the assembly archive. Generally:
- * <ol>
- * <li>Setup any directory structures for temporary files</li>
- * <li>Calculate the output directory/file for the assembly</li>
- * <li>Setup any handler components for special descriptor files we may encounter</li>
- * <li>Lookup and configure the {@link Archiver} to be used</li>
- * <li>Determine what, if any, dependency resolution will be required, and resolve any dependency-version conflicts
- * up front to produce a managed-version map for the whole assembly process.</li>
- * <li>Iterate through the available {@link AssemblyArchiverPhase} instances, executing each to handle a different
- * top-level section of the assembly descriptor, if that section is present.</li>
- * </ol>
- */
+ /** {@inheritDoc} */
public File createArchive( final Assembly assembly, final String fullName, final String format,
final AssemblerConfigurationSource configSource, boolean recompressZippedFiles )
throws ArchiveCreationException, AssemblyFormattingException, InvalidAssemblerConfigurationException
@@ -172,13 +168,25 @@ public class DefaultAssemblyArchiver
archiver.setDestFile( destFile );
- final AssemblyContext context = new DefaultAssemblyContext();
+ List<ResolvedModuleSet> resolvedModuleSets = new ArrayList<ResolvedModuleSet>();
+ for ( ModuleSet moduleSet : assembly.getModuleSets() )
+ {
+ resolvedModuleSets.add( dependencyResolver.resolve( assembly, moduleSet, configSource ) );
+ }
- dependencyResolver.resolve( assembly, configSource, context );
+ // OK, this piece of code contains all the stuff left after I extracted resolvedModuleSets.
+ // this can probably be simplified quite a lot, since the module sets now have their
+ // own artifact resolution.
+ final Set<Artifact> dependencySetArtifacts = dependencyResolver.resolve( assembly, configSource );
+
+ // CHECKSTYLE_OFF: LineLength
+ final ResolvedAssembly resolvedAssembly =
+ ResolvedAssembly.create( assembly ).withResolvedModuleSets( resolvedModuleSets ).withDependencySetArtifacts( dependencySetArtifacts );
+ // CHECKSTYLE_ON: LineLength
for ( AssemblyArchiverPhase phase : assemblyPhases )
{
- phase.execute( assembly, archiver, configSource, context );
+ phase.execute( resolvedAssembly, archiver, configSource );
}
archiver.createArchive();
@@ -216,9 +224,11 @@ public class DefaultAssemblyArchiver
}
}
+ // CHECKSTYLE_OFF: LineLength
private List<ContainerDescriptorHandler> selectContainerDescriptorHandlers( List<ContainerDescriptorHandlerConfig> requestedContainerDescriptorHandlers,
final AssemblerConfigurationSource configSource )
throws InvalidAssemblerConfigurationException
+ // CHECKSTYLE_ON: LineLength
{
getLogger().debug( "All known ContainerDescriptorHandler components: "
+ ( containerDescriptorHandlers == null ? "none; map is null." : ""
@@ -232,29 +242,32 @@ public class DefaultAssemblyArchiver
final List<ContainerDescriptorHandler> handlers = new ArrayList<ContainerDescriptorHandler>();
final List<String> hints = new ArrayList<String>();
- if (!requestedContainerDescriptorHandlers.isEmpty())
+ if ( !requestedContainerDescriptorHandlers.isEmpty() )
{
- for (final ContainerDescriptorHandlerConfig config : requestedContainerDescriptorHandlers) {
+ for ( final ContainerDescriptorHandlerConfig config : requestedContainerDescriptorHandlers )
+ {
final String hint = config.getHandlerName();
- final ContainerDescriptorHandler handler = containerDescriptorHandlers.get(hint);
+ final ContainerDescriptorHandler handler = containerDescriptorHandlers.get( hint );
- if (handler == null) {
+ if ( handler == null )
+ {
throw new InvalidAssemblerConfigurationException(
- "Cannot find ContainerDescriptorHandler with hint: "
- + hint);
+ "Cannot find ContainerDescriptorHandler with hint: "
+ + hint );
}
- getLogger().debug("Found container descriptor handler with hint: " + hint + " (component: " + handler
- + ")");
+ getLogger().debug( "Found container descriptor handler with hint: " + hint + " (component: " + handler
+ + ")" );
- if (config.getConfiguration() != null) {
- getLogger().debug("Configuring handler with:\n\n" + config.getConfiguration() + "\n\n");
+ if ( config.getConfiguration() != null )
+ {
+ getLogger().debug( "Configuring handler with:\n\n" + config.getConfiguration() + "\n\n" );
- configureContainerDescriptorHandler(handler, (Xpp3Dom) config.getConfiguration(), configSource);
+ configureContainerDescriptorHandler( handler, (Xpp3Dom) config.getConfiguration(), configSource );
}
- handlers.add(handler);
- hints.add(hint);
+ handlers.add( handler );
+ hints.add( hint );
}
}
@@ -268,13 +281,13 @@ public class DefaultAssemblyArchiver
/**
* Creates the necessary archiver to build the distribution file.
- *
+ *
* @param format Archive format
- * @param includeBaseDir
- * @param finalName
- * @param configSource
- * @param containerHandlers
- * @param recompressZippedFiles
+ * @param includeBaseDir the base directory for include.
+ * @param finalName The final name.
+ * @param configSource {@link AssemblerConfigurationSource}
+ * @param containerHandlers The list of {@link ContainerDescriptorHandler}
+ * @param recompressZippedFiles recompress zipped files.
* @return archiver Archiver generated
* @throws org.codehaus.plexus.archiver.ArchiverException
* @throws org.codehaus.plexus.archiver.manager.NoSuchArchiverException
@@ -286,9 +299,9 @@ public class DefaultAssemblyArchiver
throws ArchiverException, NoSuchArchiverException
{
Archiver archiver;
- if ( format.startsWith( "tar" ) )
+ if ( "tgz".equals( format ) || "tbz2".equals( format ) || format.startsWith( "tar" ) )
{
- archiver = createTarArchiver( format, configSource.getTarLongFileMode() );
+ archiver = createTarArchiver( format, TarLongFileMode.valueOf( configSource.getTarLongFileMode() ) );
}
else if ( "war".equals( format ) )
{
@@ -424,12 +437,12 @@ public class DefaultAssemblyArchiver
try
{
final Method configureComponent =
- ComponentConfigurator.class.getMethod( "configureComponent", new Class[] { Object.class,
- PlexusConfiguration.class, ExpressionEvaluator.class, (Class<?>) containerRealm[1],
- ConfigurationListener.class } );
+ ComponentConfigurator.class.getMethod( "configureComponent", Object.class, PlexusConfiguration.class,
+ ExpressionEvaluator.class, (Class<?>) containerRealm[1],
+ ConfigurationListener.class );
- configureComponent.invoke( configurator, component, configuration, expressionEvaluator,
- containerRealm[0], listener);
+ configureComponent.invoke( configurator, component, configuration, expressionEvaluator, containerRealm[0],
+ listener );
}
catch ( final NoSuchMethodException e )
{
@@ -483,26 +496,24 @@ public class DefaultAssemblyArchiver
return warArchiver;
}
- protected Archiver createTarArchiver( final String format, final String tarLongFileMode )
+ protected Archiver createTarArchiver( final String format, final TarLongFileMode tarLongFileMode )
throws NoSuchArchiverException, ArchiverException
{
final TarArchiver tarArchiver = (TarArchiver) archiverManager.getArchiver( "tar" );
final int index = format.indexOf( '.' );
if ( index >= 0 )
{
- // TODO: this needs a cleanup in plexus archiver - use a real
- // typesafe enum
- final TarArchiver.TarCompressionMethod tarCompressionMethod = new TarArchiver.TarCompressionMethod();
+ TarArchiver.TarCompressionMethod tarCompressionMethod;
// TODO: this should accept gz and bz2 as well so we can skip
// over the switch
final String compression = format.substring( index + 1 );
if ( "gz".equals( compression ) )
{
- tarCompressionMethod.setValue( "gzip" );
+ tarCompressionMethod = TarArchiver.TarCompressionMethod.gzip;
}
else if ( "bz2".equals( compression ) )
{
- tarCompressionMethod.setValue( "bzip2" );
+ tarCompressionMethod = TarArchiver.TarCompressionMethod.bzip2;
}
else
{
@@ -511,12 +522,16 @@ public class DefaultAssemblyArchiver
}
tarArchiver.setCompression( tarCompressionMethod );
}
+ else if ( "tgz".equals( format ) )
+ {
+ tarArchiver.setCompression( TarArchiver.TarCompressionMethod.gzip );
+ }
+ else if ( "tbz2".equals( format ) )
+ {
+ tarArchiver.setCompression( TarArchiver.TarCompressionMethod.bzip2 );
+ }
- final TarLongFileMode tarFileMode = new TarLongFileMode();
-
- tarFileMode.setValue( tarLongFileMode );
-
- tarArchiver.setLongfile( tarFileMode );
+ tarArchiver.setLongfile( tarLongFileMode );
return tarArchiver;
}
Modified: maven/plugins/branches/MASSEMBLY-704/src/main/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizer.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MASSEMBLY-704/src/main/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizer.java?rev=1633948&r1=1633947&r2=1633948&view=diff
==============================================================================
--- maven/plugins/branches/MASSEMBLY-704/src/main/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizer.java (original)
+++ maven/plugins/branches/MASSEMBLY-704/src/main/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizer.java Thu Oct 23 21:01:23 2014
@@ -133,10 +133,10 @@ public class ManifestCreationFinalizer
return Collections.singletonList( "META-INF/MANIFEST.MF" );
}
}
- catch ( final ManifestException e )
+ catch ( final ManifestException ignore )
{
}
- catch ( final DependencyResolutionRequiredException e )
+ catch ( final DependencyResolutionRequiredException ignore )
{
}
}