This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch MCOMPILER-272 in repository https://gitbox.apache.org/repos/asf/maven-compiler-plugin.git
commit bb6577c3a4685040dda4d166ec0971675035f649 Author: rfscholte <[email protected]> AuthorDate: Sat Sep 4 11:41:21 2021 +0200 [MCOMPILER-272] When annotationProcessorPaths has multiple entries, only the transitive dependencies of the first entry are added --- src/it/MCOMPILER-272/invoker.properties | 18 +++++++ src/it/MCOMPILER-272/pom.xml | 56 ++++++++++++++++++++ src/it/MCOMPILER-272/processor1/pom.xml | 48 +++++++++++++++++ .../src/main/java/processor1/Processor1.java | 38 ++++++++++++++ .../services/javax.annotation.processing.Processor | 18 +++++++ src/it/MCOMPILER-272/processor2-dep/pom.xml | 35 +++++++++++++ .../src/main/java/processor2/dep/Foo.java | 24 +++++++++ src/it/MCOMPILER-272/processor2/pom.xml | 61 ++++++++++++++++++++++ .../src/main/java/processor2/Processor2.java | 39 ++++++++++++++ .../services/javax.annotation.processing.Processor | 18 +++++++ src/it/MCOMPILER-272/project/pom.xml | 59 +++++++++++++++++++++ .../project/src/main/java/project/Project.java | 30 +++++++++++ .../plugin/compiler/AbstractCompilerMojo.java | 35 +++++-------- 13 files changed, 458 insertions(+), 21 deletions(-) diff --git a/src/it/MCOMPILER-272/invoker.properties b/src/it/MCOMPILER-272/invoker.properties new file mode 100644 index 0000000..0659ac5 --- /dev/null +++ b/src/it/MCOMPILER-272/invoker.properties @@ -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 = compile diff --git a/src/it/MCOMPILER-272/pom.xml b/src/it/MCOMPILER-272/pom.xml new file mode 100644 index 0000000..29e2d0e --- /dev/null +++ b/src/it/MCOMPILER-272/pom.xml @@ -0,0 +1,56 @@ +<?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> + + <groupId>org.apache.maven.plugins.compiler.it</groupId> + <artifactId>mcompiler-272</artifactId> + <version>1.0-SNAPSHOT</version> + <packaging>pom</packaging> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + + <modules> + <module>processor1</module> + <module>processor2</module> + <module>processor2-dep</module> + <module>project</module> + </modules> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>@project.version@</version> + <configuration> + <source>7</source> + <target>7</target> + </configuration> + </plugin> + </plugins> + </build> +</project> diff --git a/src/it/MCOMPILER-272/processor1/pom.xml b/src/it/MCOMPILER-272/processor1/pom.xml new file mode 100644 index 0000000..1142c94 --- /dev/null +++ b/src/it/MCOMPILER-272/processor1/pom.xml @@ -0,0 +1,48 @@ +<?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> + <groupId>org.apache.maven.plugins.compiler.it</groupId> + <artifactId>mcompiler-272</artifactId> + <version>1.0-SNAPSHOT</version> + </parent> + + <artifactId>processor1</artifactId> + + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <proc>none</proc> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> +</project> diff --git a/src/it/MCOMPILER-272/processor1/src/main/java/processor1/Processor1.java b/src/it/MCOMPILER-272/processor1/src/main/java/processor1/Processor1.java new file mode 100644 index 0000000..319d274 --- /dev/null +++ b/src/it/MCOMPILER-272/processor1/src/main/java/processor1/Processor1.java @@ -0,0 +1,38 @@ +/* + * 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 processor1; + +import java.util.Set; + +import javax.annotation.processing.AbstractProcessor; +import javax.annotation.processing.RoundEnvironment; +import javax.annotation.processing.SupportedAnnotationTypes; +import javax.lang.model.element.TypeElement; + +@SupportedAnnotationTypes({"java.lang.SuppressWarnings"}) +public class Processor1 + extends AbstractProcessor +{ + @Override + public boolean process ( Set<? extends TypeElement> annotations, RoundEnvironment roundEnv ) + { + System.out.println( "Run processor1" ); + return false; + } +} diff --git a/src/it/MCOMPILER-272/processor1/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/src/it/MCOMPILER-272/processor1/src/main/resources/META-INF/services/javax.annotation.processing.Processor new file mode 100644 index 0000000..1781efc --- /dev/null +++ b/src/it/MCOMPILER-272/processor1/src/main/resources/META-INF/services/javax.annotation.processing.Processor @@ -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. + +processor1.Processor1 diff --git a/src/it/MCOMPILER-272/processor2-dep/pom.xml b/src/it/MCOMPILER-272/processor2-dep/pom.xml new file mode 100644 index 0000000..c4cef9f --- /dev/null +++ b/src/it/MCOMPILER-272/processor2-dep/pom.xml @@ -0,0 +1,35 @@ +<?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> + <groupId>org.apache.maven.plugins.compiler.it</groupId> + <artifactId>mcompiler-272</artifactId> + <version>1.0-SNAPSHOT</version> + </parent> + + <artifactId>processor2-dep</artifactId> + +</project> diff --git a/src/it/MCOMPILER-272/processor2-dep/src/main/java/processor2/dep/Foo.java b/src/it/MCOMPILER-272/processor2-dep/src/main/java/processor2/dep/Foo.java new file mode 100644 index 0000000..bd1e92a --- /dev/null +++ b/src/it/MCOMPILER-272/processor2-dep/src/main/java/processor2/dep/Foo.java @@ -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 processor2.dep; + +public class Foo +{ + +} diff --git a/src/it/MCOMPILER-272/processor2/pom.xml b/src/it/MCOMPILER-272/processor2/pom.xml new file mode 100644 index 0000000..2afb33e --- /dev/null +++ b/src/it/MCOMPILER-272/processor2/pom.xml @@ -0,0 +1,61 @@ +<?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> + <groupId>org.apache.maven.plugins.compiler.it</groupId> + <artifactId>mcompiler-272</artifactId> + <version>1.0-SNAPSHOT</version> + </parent> + + <artifactId>processor2</artifactId> + + <dependencies> + <dependency> + <groupId>org.apache.maven.plugins.compiler.it</groupId> + <artifactId>processor1</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven.plugins.compiler.it</groupId> + <artifactId>processor2-dep</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <proc>none</proc> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> +</project> diff --git a/src/it/MCOMPILER-272/processor2/src/main/java/processor2/Processor2.java b/src/it/MCOMPILER-272/processor2/src/main/java/processor2/Processor2.java new file mode 100644 index 0000000..b96a20f --- /dev/null +++ b/src/it/MCOMPILER-272/processor2/src/main/java/processor2/Processor2.java @@ -0,0 +1,39 @@ +/* + * 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 processor2; + +import java.util.Set; + +import javax.annotation.processing.AbstractProcessor; +import javax.annotation.processing.RoundEnvironment; +import javax.annotation.processing.SupportedAnnotationTypes; +import javax.lang.model.element.TypeElement; + +@SupportedAnnotationTypes({"java.lang.SuppressWarnings"}) +public class Processor2 + extends AbstractProcessor +{ + @Override + public boolean process ( Set<? extends TypeElement> annotations, RoundEnvironment roundEnv ) + { + System.out.println( "Run processor2" ); + new processor2.dep.Foo(); + return false; + } +} diff --git a/src/it/MCOMPILER-272/processor2/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/src/it/MCOMPILER-272/processor2/src/main/resources/META-INF/services/javax.annotation.processing.Processor new file mode 100644 index 0000000..f8ff423 --- /dev/null +++ b/src/it/MCOMPILER-272/processor2/src/main/resources/META-INF/services/javax.annotation.processing.Processor @@ -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. + +processor2.Processor2 diff --git a/src/it/MCOMPILER-272/project/pom.xml b/src/it/MCOMPILER-272/project/pom.xml new file mode 100644 index 0000000..6fe4508 --- /dev/null +++ b/src/it/MCOMPILER-272/project/pom.xml @@ -0,0 +1,59 @@ +<?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> + <groupId>org.apache.maven.plugins.compiler.it</groupId> + <artifactId>mcompiler-272</artifactId> + <version>1.0-SNAPSHOT</version> + </parent> + + <artifactId>project</artifactId> + + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <annotationProcessorPaths> + <path> + <groupId>org.apache.maven.plugins.compiler.it</groupId> + <artifactId>processor1</artifactId> + <version>${project.version}</version> + </path> + <path> + <groupId>org.apache.maven.plugins.compiler.it</groupId> + <artifactId>processor2</artifactId> + <version>${project.version}</version> + </path> + </annotationProcessorPaths> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> +</project> diff --git a/src/it/MCOMPILER-272/project/src/main/java/project/Project.java b/src/it/MCOMPILER-272/project/src/main/java/project/Project.java new file mode 100644 index 0000000..9f00a99 --- /dev/null +++ b/src/it/MCOMPILER-272/project/src/main/java/project/Project.java @@ -0,0 +1,30 @@ +/* + * 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 project; + +import java.util.List; + +public class Project +{ + @SuppressWarnings( "rawtypes" ) + public void foo( List toto ) + { + + } +} diff --git a/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java b/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java index 7d67f4a..64fcc5d 100644 --- a/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java +++ b/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java @@ -1653,8 +1653,7 @@ public abstract class AbstractCompilerMojo try { - Set<Artifact> requiredArtifacts = new LinkedHashSet<>(); - + Set<String> elements = new LinkedHashSet<>(); for ( DependencyCoordinate coord : annotationProcessorPaths ) { ArtifactHandler handler = artifactHandlerManager.getArtifactHandler( coord.getType() ); @@ -1669,29 +1668,23 @@ public abstract class AbstractCompilerMojo handler, false ); - requiredArtifacts.add( artifact ); - } - - ArtifactResolutionRequest request = new ArtifactResolutionRequest() - .setArtifact( requiredArtifacts.iterator().next() ) - .setResolveRoot( true ) - .setResolveTransitively( true ) - .setArtifactDependencies( requiredArtifacts ) - .setLocalRepository( session.getLocalRepository() ) - .setRemoteRepositories( project.getRemoteArtifactRepositories() ); - - ArtifactResolutionResult resolutionResult = repositorySystem.resolve( request ); + ArtifactResolutionRequest request = new ArtifactResolutionRequest() + .setArtifact( artifact ) + .setResolveRoot( true ) + .setResolveTransitively( true ) + .setLocalRepository( session.getLocalRepository() ) + .setRemoteRepositories( project.getRemoteArtifactRepositories() ); - resolutionErrorHandler.throwErrors( request, resolutionResult ); + ArtifactResolutionResult resolutionResult = repositorySystem.resolve( request ); - List<String> elements = new ArrayList<>( resolutionResult.getArtifacts().size() ); + resolutionErrorHandler.throwErrors( request, resolutionResult ); - for ( Object resolved : resolutionResult.getArtifacts() ) - { - elements.add( ( (Artifact) resolved ).getFile().getAbsolutePath() ); + for ( Artifact resolved : resolutionResult.getArtifacts() ) + { + elements.add( resolved.getFile().getAbsolutePath() ); + } } - - return elements; + return new ArrayList<>( elements ); } catch ( Exception e ) {
