Author: andham Date: Wed Jan 21 20:54:24 2015 New Revision: 1653649 URL: http://svn.apache.org/r1653649 Log: [MDEP-466] analyze fails on multimodule project (regression)
Added: maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/invoker.properties (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module1/ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module1/pom.xml (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module1/src/ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module1/src/main/ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module1/src/main/java/ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module1/src/main/java/foo/ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module1/src/main/java/foo/Main.java (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module2/ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module2/pom.xml (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module2/src/ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module2/src/main/ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module2/src/main/java/ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module2/src/main/java/bar/ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module2/src/main/java/bar/Main.java (with props) maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/pom.xml (with props) Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?rev=1653649&r1=1653648&r2=1653649&view=diff ============================================================================== --- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Wed Jan 21 20:54:24 2015 @@ -176,7 +176,7 @@ under the License. <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-dependency-analyzer</artifactId> - <version>1.5</version> + <version>1.6</version> </dependency> <dependency> <groupId>org.apache.maven.shared</groupId> Added: maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/invoker.properties URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/invoker.properties?rev=1653649&view=auto ============================================================================== --- maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/invoker.properties (added) +++ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/invoker.properties Wed Jan 21 20:54:24 2015 @@ -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 ${project.groupId}:${project.artifactId}:${project.version}:analyze Propchange: maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/invoker.properties ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/invoker.properties ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Propchange: maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/invoker.properties ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module1/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module1/pom.xml?rev=1653649&view=auto ============================================================================== --- maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module1/pom.xml (added) +++ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module1/pom.xml Wed Jan 21 20:54:24 2015 @@ -0,0 +1,51 @@ +<?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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.maven.its.dependency</groupId> + <artifactId>test-parent</artifactId> + <version>1.0-SNAPSHOT</version> + </parent> + + <artifactId>test-module1</artifactId> + + <dependencies> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> + <version>2.0.6</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> + <version>2.0.6</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> + <version>2.0.6</version> + </dependency> + </dependencies> +</project> Propchange: maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module1/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module1/pom.xml ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Propchange: maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module1/pom.xml ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module1/src/main/java/foo/Main.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module1/src/main/java/foo/Main.java?rev=1653649&view=auto ============================================================================== --- maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module1/src/main/java/foo/Main.java (added) +++ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module1/src/main/java/foo/Main.java Wed Jan 21 20:54:24 2015 @@ -0,0 +1,32 @@ +/* + * 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. + */ +package foo; + +import org.apache.maven.artifact.Artifact; +import org.apache.maven.artifact.repository.metadata.Metadata; +import org.apache.maven.model.Model; + +public class Main +{ + public static final String SCOPE_COMPILE = Artifact.SCOPE_COMPILE; + + public Model model = null; + + public Metadata metadata = null; +} Propchange: maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module1/src/main/java/foo/Main.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module1/src/main/java/foo/Main.java ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Propchange: maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module1/src/main/java/foo/Main.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module2/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module2/pom.xml?rev=1653649&view=auto ============================================================================== --- maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module2/pom.xml (added) +++ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module2/pom.xml Wed Jan 21 20:54:24 2015 @@ -0,0 +1,41 @@ +<?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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.maven.its.dependency</groupId> + <artifactId>test-parent</artifactId> + <version>1.0-SNAPSHOT</version> + </parent> + + <artifactId>test-module2</artifactId> + + <dependencies> + <dependency> + <groupId>org.apache.maven.its.dependency</groupId> + <artifactId>test-module1</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> +</project> Propchange: maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module2/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module2/pom.xml ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Propchange: maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module2/pom.xml ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module2/src/main/java/bar/Main.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module2/src/main/java/bar/Main.java?rev=1653649&view=auto ============================================================================== --- maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module2/src/main/java/bar/Main.java (added) +++ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module2/src/main/java/bar/Main.java Wed Jan 21 20:54:24 2015 @@ -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. + */ +package bar; + +public class Main +{ + public foo.Main dummy = null; +} Propchange: maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module2/src/main/java/bar/Main.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module2/src/main/java/bar/Main.java ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Propchange: maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/module2/src/main/java/bar/Main.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/pom.xml?rev=1653649&view=auto ============================================================================== --- maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/pom.xml (added) +++ maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/pom.xml Wed Jan 21 20:54:24 2015 @@ -0,0 +1,44 @@ +<?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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.apache.maven.its.dependency</groupId> + <artifactId>test-parent</artifactId> + <version>1.0-SNAPSHOT</version> + <packaging>pom</packaging> + + <name>Test</name> + <description> + Test dependency:analyze on a multi-module project + </description> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + + <modules> + <module>module1</module> + <module>module2</module> + </modules> +</project> Propchange: maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/pom.xml ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Propchange: maven/plugins/trunk/maven-dependency-plugin/src/it/projects/analyze-multimodule-project/pom.xml ------------------------------------------------------------------------------ svn:mime-type = text/plain