This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch MCOMPILER-320 in repository https://gitbox.apache.org/repos/asf/maven-compiler-plugin.git
commit 4a95b1614803158484e9114fcbdc03635e43ef0e Author: rfscholte <rfscho...@apache.org> AuthorDate: Fri Jan 19 12:27:46 2018 +0100 [MCOMPILER-320] Allow additional class path items to be given during compilation --- src/it/MCOMPILER-320_mrjar/consumer/pom.xml | 55 ++++++++++++++ src/it/MCOMPILER-320_mrjar/invoker.properties | 19 +++++ src/it/MCOMPILER-320_mrjar/lib/pom.xml | 83 ++++++++++++++++++++++ .../lib/src/main/java/asset/MyClass.java | 34 +++++++++ .../lib/src/main/java9/asset/MyClass.java | 31 ++++++++ src/it/MCOMPILER-320_mrjar/pom.xml | 36 ++++++++++ src/it/MCOMPILER-320_mrjar/verify.groovy | 26 +++++++ src/it/MCOMPILER-320_sunmisc/invoker.properties | 19 +++++ src/it/MCOMPILER-320_sunmisc/pom.xml | 58 +++++++++++++++ .../src/main/java/asset/MyClass.java | 34 +++++++++ .../setup_jdk.unsupported-stub/invoker.properties | 19 +++++ src/it/setup_jdk.unsupported-stub/pom.xml | 64 +++++++++++++++++ .../apache/maven/stub/sun/misc/BASE64Decoder.java | 28 ++++++++ 13 files changed, 506 insertions(+) diff --git a/src/it/MCOMPILER-320_mrjar/consumer/pom.xml b/src/it/MCOMPILER-320_mrjar/consumer/pom.xml new file mode 100644 index 0000000..76901f9 --- /dev/null +++ b/src/it/MCOMPILER-320_mrjar/consumer/pom.xml @@ -0,0 +1,55 @@ +<?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>mcompiler320-consumer</artifactId> + <version>1.0-SNAPSHOT</version> + + <dependencies> + <dependency> + <groupId>org.apache.maven.plugins.compiler.it</groupId> + <artifactId>mcompiler320</artifactId> + <version>1.0-SNAPSHOT</version> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>3.0.2</version> + <executions> + <execution> + <id>list</id> + <phase>compile</phase> + <goals> + <goal>list</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> diff --git a/src/it/MCOMPILER-320_mrjar/invoker.properties b/src/it/MCOMPILER-320_mrjar/invoker.properties new file mode 100644 index 0000000..8d76986 --- /dev/null +++ b/src/it/MCOMPILER-320_mrjar/invoker.properties @@ -0,0 +1,19 @@ +# 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.java.version = 9+ +invoker.goals = compile diff --git a/src/it/MCOMPILER-320_mrjar/lib/pom.xml b/src/it/MCOMPILER-320_mrjar/lib/pom.xml new file mode 100644 index 0000000..aa20eec --- /dev/null +++ b/src/it/MCOMPILER-320_mrjar/lib/pom.xml @@ -0,0 +1,83 @@ +<?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>mcompiler320</artifactId> + <version>1.0-SNAPSHOT</version> + + <url>https://issues.apache.org/jira/browse/MCOMPILER-320</url> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + + <dependencies> + <dependency> + <groupId>org.apache.maven.plugins.compiler.it</groupId> + <artifactId>jdk.unsupported-stub</artifactId> + <version>1.0.0</version> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>@project.version@</version> + <executions> + <!-- this compiles the base layer; however the release=8 option + prevents sun.misc from being visible --> + <execution> + <id>default-compile</id> + <goals> + <goal>compile</goal> + </goals> + <configuration> + <release>8</release> + </configuration> + </execution> + <!-- this compiles the Java 9 layer; sun.misc is not a problem + here but we also need to include our base classes in the compilation --> + <execution> + <id>compile-java9</id> + <phase>compile</phase> + <goals> + <goal>compile</goal> + </goals> + <configuration> + <release>9</release> + <buildDirectory>${project.build.directory}</buildDirectory> + <compileSourceRoots>${project.basedir}/src/main/java9</compileSourceRoots> + <!-- we can output directly into the appropriate target directory; + this works out nicely --> + <outputDirectory>${project.build.directory}/classes/META-INF/versions/9</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> diff --git a/src/it/MCOMPILER-320_mrjar/lib/src/main/java/asset/MyClass.java b/src/it/MCOMPILER-320_mrjar/lib/src/main/java/asset/MyClass.java new file mode 100644 index 0000000..2b3004c --- /dev/null +++ b/src/it/MCOMPILER-320_mrjar/lib/src/main/java/asset/MyClass.java @@ -0,0 +1,34 @@ +package asset; + +/* + * 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.IOException; +import sun.misc.BASE64Decoder; + +public class MyClass +{ + public void decode( String bufferString ) throws IOException + { + byte mydata[]; + BASE64Decoder base64 = new BASE64Decoder(); + + mydata = base64.decodeBuffer( bufferString ); + } +} diff --git a/src/it/MCOMPILER-320_mrjar/lib/src/main/java9/asset/MyClass.java b/src/it/MCOMPILER-320_mrjar/lib/src/main/java9/asset/MyClass.java new file mode 100644 index 0000000..e0ce482 --- /dev/null +++ b/src/it/MCOMPILER-320_mrjar/lib/src/main/java9/asset/MyClass.java @@ -0,0 +1,31 @@ +package asset; + +/* + * 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.IOException; +import java.util.Base64; + +public class MyClass +{ + public void decode( String bufferString ) throws IOException + { + byte mydata[] = Base64.getDecoder().decode( bufferString ); + } +} diff --git a/src/it/MCOMPILER-320_mrjar/pom.xml b/src/it/MCOMPILER-320_mrjar/pom.xml new file mode 100644 index 0000000..ba623a7 --- /dev/null +++ b/src/it/MCOMPILER-320_mrjar/pom.xml @@ -0,0 +1,36 @@ +<?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>mcompiler320-aggregator</artifactId> + <version>1.0-SNAPSHOT</version> + <packaging>pom</packaging> + + <url>https://issues.apache.org/jira/browse/MCOMPILER-320</url> + + <modules> + <module>lib</module> + <module>consumer</module> + </modules> +</project> diff --git a/src/it/MCOMPILER-320_mrjar/verify.groovy b/src/it/MCOMPILER-320_mrjar/verify.groovy new file mode 100644 index 0000000..e7ba57f --- /dev/null +++ b/src/it/MCOMPILER-320_mrjar/verify.groovy @@ -0,0 +1,26 @@ +/* + * 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. + */ +def logLines = new File( basedir, 'build.log').readLines() + +logLines = logLines.dropWhile{ it != "[INFO] The following files have been resolved:" } +assert !logLines.isEmpty() + +logLines.each { it -> assert !it.contains("sun.misc") } + +return true; \ No newline at end of file diff --git a/src/it/MCOMPILER-320_sunmisc/invoker.properties b/src/it/MCOMPILER-320_sunmisc/invoker.properties new file mode 100644 index 0000000..8d76986 --- /dev/null +++ b/src/it/MCOMPILER-320_sunmisc/invoker.properties @@ -0,0 +1,19 @@ +# 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.java.version = 9+ +invoker.goals = compile diff --git a/src/it/MCOMPILER-320_sunmisc/pom.xml b/src/it/MCOMPILER-320_sunmisc/pom.xml new file mode 100644 index 0000000..61ee4be --- /dev/null +++ b/src/it/MCOMPILER-320_sunmisc/pom.xml @@ -0,0 +1,58 @@ +<?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>mcompiler320</artifactId> + <version>1.0-SNAPSHOT</version> + + <url>https://issues.apache.org/jira/browse/MCOMPILER-320</url> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + + <dependencies> + <dependency> + <groupId>org.apache.maven.plugins.compiler.it</groupId> + <artifactId>jdk.unsupported-stub</artifactId> + <version>1.0.0</version> + <optional>true</optional> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>@project.version@</version> + <configuration> + <source>1.8</source> + <target>1.8</target> + </configuration> + </plugin> + </plugins> + </build> +</project> diff --git a/src/it/MCOMPILER-320_sunmisc/src/main/java/asset/MyClass.java b/src/it/MCOMPILER-320_sunmisc/src/main/java/asset/MyClass.java new file mode 100644 index 0000000..2b3004c --- /dev/null +++ b/src/it/MCOMPILER-320_sunmisc/src/main/java/asset/MyClass.java @@ -0,0 +1,34 @@ +package asset; + +/* + * 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.IOException; +import sun.misc.BASE64Decoder; + +public class MyClass +{ + public void decode( String bufferString ) throws IOException + { + byte mydata[]; + BASE64Decoder base64 = new BASE64Decoder(); + + mydata = base64.decodeBuffer( bufferString ); + } +} diff --git a/src/it/setup_jdk.unsupported-stub/invoker.properties b/src/it/setup_jdk.unsupported-stub/invoker.properties new file mode 100644 index 0000000..4b40d10 --- /dev/null +++ b/src/it/setup_jdk.unsupported-stub/invoker.properties @@ -0,0 +1,19 @@ +# 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.java.version = 1.9+ +invoker.goals = install diff --git a/src/it/setup_jdk.unsupported-stub/pom.xml b/src/it/setup_jdk.unsupported-stub/pom.xml new file mode 100644 index 0000000..6040748 --- /dev/null +++ b/src/it/setup_jdk.unsupported-stub/pom.xml @@ -0,0 +1,64 @@ +<?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>jdk.unsupported-stub</artifactId> + <version>1.0.0</version> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>@project.version@</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>3.1.0</version> + <executions> + <execution> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <relocations> + <relocation> + <pattern>org.apache.maven.stub.sun.misc</pattern> + <shadedPattern>sun.misc</shadedPattern> + </relocation> + </relocations> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> diff --git a/src/it/setup_jdk.unsupported-stub/src/main/java/org/apache/maven/stub/sun/misc/BASE64Decoder.java b/src/it/setup_jdk.unsupported-stub/src/main/java/org/apache/maven/stub/sun/misc/BASE64Decoder.java new file mode 100644 index 0000000..6dc5a80 --- /dev/null +++ b/src/it/setup_jdk.unsupported-stub/src/main/java/org/apache/maven/stub/sun/misc/BASE64Decoder.java @@ -0,0 +1,28 @@ +package org.apache.maven.stub.sun.misc; + +/* + * 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. + */ +public class BASE64Decoder +{ + public byte[] decodeBuffer( String inputString ) + throws java.io.IOException + { + throw new UnsupportedOperationException(); + } +} -- To stop receiving notification emails like this one, please contact "commits@maven.apache.org" <commits@maven.apache.org>.