Skip to content

Commit 0b8b00b

Browse files
mensindamensinda
authored
[MCOMPILER-538] Do not add target/generated-sources/annotations to the source roots (#191)
* [MCOMPILER-538] Add test case * [MCOMPILER-538] Do not add generatedSourcesDirectory to the source roots
1 parent d1b1d50 commit 0b8b00b

File tree

13 files changed

+431
-24
lines changed

13 files changed

+431
-24
lines changed

‎src/it/MCOMPILER-538/code/MyAnnotatedClass.bad.java‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
package bar;
20+
21+
import foo.MyAnnotation;
22+
23+
@MyAnnotation
24+
public class MyAnnotatedClass {
25+
MyGeneratedClass generatedClass = new MyGeneratedClass(false);
26+
27+
// foo
28+
29+
}

‎src/it/MCOMPILER-538/code/MyAnnotatedClass.good.java‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
package bar;
20+
21+
import foo.MyAnnotation;
22+
23+
@MyAnnotation
24+
public class MyAnnotatedClass {
25+
MyGeneratedClass generatedClass = new MyGeneratedClass();
26+
27+
// foo
28+
29+
}

‎src/it/MCOMPILER-538/code/pom.xml‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
Licensed to the Apache Software Foundation (ASF) under one
4+
or more contributor license agreements. See the NOTICE file
5+
distributed with this work for additional information
6+
regarding copyright ownership. The ASF licenses this file
7+
to you under the Apache License, Version 2.0 (the
8+
"License"); you may not use this file except in compliance
9+
with the License. You may obtain a copy of the License at
10+
11+
http://www.apache.org/licenses/LICENSE-2.0
12+
13+
Unless required by applicable law or agreed to in writing,
14+
software distributed under the License is distributed on an
15+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16+
KIND, either express or implied. See the License for the
17+
specific language governing permissions and limitations
18+
under the License.
19+
-->
20+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
21+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
22+
<modelVersion>4.0.0</modelVersion>
23+
<parent>
24+
<groupId>foo</groupId>
25+
<artifactId>bar</artifactId>
26+
<version>${revision}</version>
27+
</parent>
28+
<version>${revision}</version>
29+
<packaging>jar</packaging>
30+
<artifactId>code</artifactId>
31+
32+
<dependencies>
33+
<dependency>
34+
<groupId>foo</groupId>
35+
<artifactId>processor</artifactId>
36+
<version>${revision}</version>
37+
<scope>provided</scope>
38+
</dependency>
39+
</dependencies>
40+
41+
<build>
42+
<plugins>
43+
<plugin>
44+
<groupId>com.kohlschutter.mavenplugins</groupId>
45+
<artifactId>copy-rename-maven-plugin</artifactId>
46+
<version>2.0.0</version>
47+
<executions>
48+
<execution>
49+
<id>set-source</id>
50+
<phase>generate-sources</phase>
51+
<goals>
52+
<goal>copy</goal>
53+
</goals>
54+
<configuration>
55+
<fileSets>
56+
<fileSet>
57+
<sourceFile>${basedir}/MyAnnotatedClass.${it.type}.java</sourceFile>
58+
<destinationFile>${basedir}/src/main/java/bar/MyAnnotatedClass.java</destinationFile>
59+
</fileSet>
60+
</fileSets>
61+
</configuration>
62+
</execution>
63+
</executions>
64+
</plugin>
65+
66+
<plugin>
67+
<groupId>org.apache.maven.plugins</groupId>
68+
<artifactId>maven-clean-plugin</artifactId>
69+
<version>@version.maven-clean-plugin@</version>
70+
<executions>
71+
<execution>
72+
<id>clean-source-file</id>
73+
<phase>validate</phase>
74+
<goals>
75+
<goal>clean</goal>
76+
</goals>
77+
<configuration>
78+
<excludeDefaultDirectories>true</excludeDefaultDirectories>
79+
<filesets>
80+
<fileset>
81+
<directory>src/main/java</directory>
82+
<excludes>
83+
<exclude>package-info.java</exclude>
84+
</excludes>
85+
</fileset>
86+
</filesets>
87+
</configuration>
88+
</execution>
89+
</executions>
90+
</plugin>
91+
</plugins>
92+
</build>
93+
</project>

‎src/it/MCOMPILER-538/code/src/main/java/bar/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
MyAnnotatedClass.java

‎src/it/MCOMPILER-538/code/src/main/java/bar/package-info.java‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
20+
package bar;

‎src/it/MCOMPILER-538/invoker.properties‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
# NOTE: The first time, we run up to "integration-test" phase which includes the AntRun execution which saves the
19+
# timestamp of the first JAR for comparison with the timestamp of the JAR from the final "package" invocation.
20+
# Note:
21+
invoker.maven.version = 3.8.8+
22+
invoker.goals.1 = clean
23+
invoker.goals.2 = compile -Dit.type=bad -Dmaven.compiler.failOnError=false
24+
invoker.goals.3 = compile -Dit.type=good

‎src/it/MCOMPILER-538/pom.xml‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
Licensed to the Apache Software Foundation (ASF) under one
4+
or more contributor license agreements. See the NOTICE file
5+
distributed with this work for additional information
6+
regarding copyright ownership. The ASF licenses this file
7+
to you under the Apache License, Version 2.0 (the
8+
"License"); you may not use this file except in compliance
9+
with the License. You may obtain a copy of the License at
10+
11+
http://www.apache.org/licenses/LICENSE-2.0
12+
13+
Unless required by applicable law or agreed to in writing,
14+
software distributed under the License is distributed on an
15+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16+
KIND, either express or implied. See the License for the
17+
specific language governing permissions and limitations
18+
under the License.
19+
-->
20+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
21+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
22+
<modelVersion>4.0.0</modelVersion>
23+
<groupId>foo</groupId>
24+
<artifactId>bar</artifactId>
25+
<version>${revision}</version>
26+
<packaging>pom</packaging>
27+
28+
<properties>
29+
<revision>1.0-SNAPSHOT</revision>
30+
31+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
32+
</properties>
33+
34+
<modules>
35+
<module>processor</module>
36+
<module>code</module>
37+
</modules>
38+
39+
<build>
40+
<pluginManagement>
41+
<plugins>
42+
<plugin>
43+
<groupId>org.apache.maven.plugins</groupId>
44+
<artifactId>maven-compiler-plugin</artifactId>
45+
<version>@project.version@</version>
46+
</plugin>
47+
</plugins>
48+
</pluginManagement>
49+
50+
<plugins>
51+
<plugin>
52+
<groupId>org.apache.maven.plugins</groupId>
53+
<artifactId>maven-compiler-plugin</artifactId>
54+
<configuration>
55+
<encoding>UTF-8</encoding>
56+
<showWarnings>true</showWarnings>
57+
<showDeprecation>true</showDeprecation>
58+
<fork>true</fork> <!-- Change this to false and the Diagnostic.Kind.NOTE messages show up -->
59+
<useIncrementalCompilation>false</useIncrementalCompilation>
60+
<compilerArgs combine.children="append">
61+
<arg>-Xlint:all,-processing</arg>
62+
<arg>-Xdoclint:all,-missing,-accessibility</arg>
63+
<arg>-Xmaxerrs</arg>
64+
<arg>2147483647</arg>
65+
<arg>-Xmaxwarns</arg>
66+
<arg>2147483647</arg>
67+
</compilerArgs>
68+
</configuration>
69+
</plugin>
70+
</plugins>
71+
</build>
72+
</project>

‎src/it/MCOMPILER-538/processor/pom.xml‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
Licensed to the Apache Software Foundation (ASF) under one
4+
or more contributor license agreements. See the NOTICE file
5+
distributed with this work for additional information
6+
regarding copyright ownership. The ASF licenses this file
7+
to you under the Apache License, Version 2.0 (the
8+
"License"); you may not use this file except in compliance
9+
with the License. You may obtain a copy of the License at
10+
11+
http://www.apache.org/licenses/LICENSE-2.0
12+
13+
Unless required by applicable law or agreed to in writing,
14+
software distributed under the License is distributed on an
15+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16+
KIND, either express or implied. See the License for the
17+
specific language governing permissions and limitations
18+
under the License.
19+
-->
20+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
21+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
22+
<modelVersion>4.0.0</modelVersion>
23+
<parent>
24+
<groupId>foo</groupId>
25+
<artifactId>bar</artifactId>
26+
<version>${revision}</version>
27+
</parent>
28+
<version>${revision}</version>
29+
<artifactId>processor</artifactId>
30+
<packaging>jar</packaging>
31+
32+
<build>
33+
<plugins>
34+
<plugin>
35+
<groupId>org.apache.maven.plugins</groupId>
36+
<artifactId>maven-compiler-plugin</artifactId>
37+
<configuration>
38+
<proc>none</proc>
39+
</configuration>
40+
</plugin>
41+
</plugins>
42+
</build>
43+
</project>

‎src/it/MCOMPILER-538/processor/src/main/java/foo/MyAnnotation.java‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
package foo;
20+
21+
import java.lang.annotation.ElementType;
22+
import java.lang.annotation.Retention;
23+
import java.lang.annotation.RetentionPolicy;
24+
import java.lang.annotation.Target;
25+
26+
@Retention(RetentionPolicy.SOURCE)
27+
@Target(ElementType.TYPE)
28+
public @interface MyAnnotation {}

0 commit comments

Comments
 (0)