Skip to content

Commit

Permalink
Make unit/integration tests Java 12 compatible
Browse files Browse the repository at this point in the history
  • Loading branch information
@rfscholte
rfscholte committed Mar 12, 2019
1 parent 8759478 commit d8bfa28
Show file tree
Hide file tree
Showing 28 changed files with 22 additions and 242 deletions.
1 change: 1 addition & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>3.2.0</version>
<executions>
<execution>
<id>integration-test</id>
Expand Down
2 changes: 0 additions & 2 deletions src/it/MCOMPILER-157/annotation-user/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ under the License.
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.6</source>
<target>1.6</target>
<annotationProcessors>
<annotationProcessor>org.issue.SimpleAnnotationProcessor</annotationProcessor>
</annotationProcessors>
Expand Down
3 changes: 1 addition & 2 deletions src/it/MCOMPILER-157/invoker.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,4 @@
# specific language governing permissions and limitations
# under the License.

invoker.java.version = 1.6+
invoker.goals=clean process-test-classes
invoker.goals=process-test-classes
4 changes: 0 additions & 4 deletions src/it/MCOMPILER-157/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>@project.version@</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
</plugins>
</pluginManagement>
Expand Down
2 changes: 0 additions & 2 deletions src/it/MCOMPILER-203-processorpath/annotation-user/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ under the License.
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.6</source>
<target>1.6</target>
<annotationProcessors>
<annotationProcessor>org.issue.SimpleAnnotationProcessor</annotationProcessor>
</annotationProcessors>
Expand Down
3 changes: 1 addition & 2 deletions src/it/MCOMPILER-203-processorpath/invoker.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,5 @@
# specific language governing permissions and limitations
# under the License.

invoker.java.version = 1.6+
invoker.goals=clean process-test-classes
invoker.goals=process-test-classes
invoker.goals.2=process-test-classes
4 changes: 0 additions & 4 deletions src/it/MCOMPILER-203-processorpath/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>@project.version@</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
</plugins>
</pluginManagement>
Expand Down
2 changes: 0 additions & 2 deletions src/it/MCOMPILER-224/annotation-user/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ under the License.
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<showWarnings>true</showWarnings>
<source>1.6</source>
<target>1.6</target>
<annotationProcessors>
<annotationProcessor>org.issue.MCompiler224AnnotationProcessor</annotationProcessor>
</annotationProcessors>
Expand Down
20 changes: 0 additions & 20 deletions src/it/MCOMPILER-224/invoker.properties
View file

This file was deleted.

2 changes: 0 additions & 2 deletions src/it/MCOMPILER-260_customArguments/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>@project.version@</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<compilerArgs>
<arg>-Xmaxwarns</arg>
<arg>7</arg>
Expand Down
2 changes: 1 addition & 1 deletion src/it/MCOMPILER-270_release/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>@project.version@</version>
<configuration>
<release>6</release>
<release>${java.specification.version}</release>
</configuration>
</plugin>
</plugins>
Expand Down
2 changes: 1 addition & 1 deletion src/it/MCOMPILER-275_separate-moduleinfo/invoker.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.

invoker.java.version = 9+
invoker.toolchain.jdk.version=9
4 changes: 2 additions & 2 deletions src/it/MCOMPILER-275_separate-moduleinfo/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@
<exclude>module-info.java</exclude>
</excludes>
<!-- ideally this would be 1.5, but with CI's it is hard to have a proper toolchains.xml in place -->
<source>1.6</source>
<target>1.6</target>
<source>8</source>
<target>8</target>
</configuration>
</execution>
</executions>
Expand Down
18 changes: 0 additions & 18 deletions src/it/MCOMPILER-332_release10/invoker.properties
View file

This file was deleted.

57 changes: 0 additions & 57 deletions src/it/MCOMPILER-332_release10/pom.xml
View file

This file was deleted.

23 changes: 0 additions & 23 deletions src/it/MCOMPILER-332_release10/src/main/java/MyClass.java
View file

This file was deleted.

26 changes: 0 additions & 26 deletions src/it/MCOMPILER-332_release10/src/test/java/MyTest.java
View file

This file was deleted.

25 changes: 0 additions & 25 deletions src/it/MCOMPILER-332_release10/verify.groovy
View file

This file was deleted.

2 changes: 1 addition & 1 deletion src/it/error-prone-compiler/invoker.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
# specific language governing permissions and limitations
# under the License.

invoker.java.version = 1.8+,!11
invoker.java.version = 1.8+,!11,!12
invoker.goals = clean compile
invoker.buildResult = failure
22 changes: 0 additions & 22 deletions src/it/jdk16-annotation/invoker.properties
View file

This file was deleted.

4 changes: 0 additions & 4 deletions src/it/jdk16-annotation/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,6 @@ under the License.
</configuration>
</execution>
</executions>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
2 changes: 0 additions & 2 deletions src/it/mcompiler-120/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@ under the License.
<artifactId>maven-compiler-plugin</artifactId>
<version>@project.version@</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<verbose>true</verbose>
<debug>true</debug>
<optimize>true</optimize>
Expand Down
3 changes: 1 addition & 2 deletions src/it/mcompiler-135/invoker.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,4 @@
# specific language governing permissions and limitations
# under the License.

invoker.goals = clean compile
invoker.java.version = 1.6+
invoker.goals=compile
10 changes: 4 additions & 6 deletions src/it/mcompiler-135/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,10 @@ under the License.
<version>@project.version@</version>
<configuration>
<fork>true</fork>
<source>1.6</source>
<target>1.6</target>
<compilerArguments>
<Averbose>true</Averbose>
<AaddResDir>src/main/webapp</AaddResDir>
</compilerArguments>
<compilerArguments>
<Averbose>true</Averbose>
<AaddResDir>src/main/webapp</AaddResDir>
</compilerArguments>
</configuration>
</plugin>
</plugins>
Expand Down
3 changes: 1 addition & 2 deletions src/it/mcompiler-179/invoker.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,5 @@
# specific language governing permissions and limitations
# under the License.

invoker.goals = clean compile
invoker.goals = compile
invoker.buildResult = failure
invoker.java.version = 1.6+
2 changes: 0 additions & 2 deletions src/it/mcompiler-179/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ under the License.
<artifactId>maven-compiler-plugin</artifactId>
<version>@project.version@</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<compilerArgument>-Xlint:all</compilerArgument>
<compilerArguments>
<Werror />
Expand Down
2 changes: 1 addition & 1 deletion src/it/multirelease-patterns/singleproject-toolchains/invoker.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
invoker.java.version = 9+
invoker.goals = verify -Pmulti-jar
invoker.toolchain.jdk.version=9
Loading

1 comment on commit d8bfa28

@sormuras
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 ... only some days left before 12 GA.

Please sign in to comment.