diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 1111ccc4..6bdd0a10 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -33,5 +33,5 @@ jobs: jdk-matrix: '["11", "17"]' jdk-distribution-matrix: '["zulu", "temurin", "microsoft", "liberica"]' os-matrix: '["ubuntu-latest","windows-latest", "macOS-latest"]' - maven_args: 'verify javadoc:javadoc -e -B -V -fae -Pno-tests-if-not-on-osx' + maven_args: 'install javadoc:javadoc -e -B -V -fae -Pno-tests-if-not-on-osx' diff --git a/plexus-compiler-api/pom.xml b/plexus-compiler-api/pom.xml index 7bc754e6..4d0f6deb 100644 --- a/plexus-compiler-api/pom.xml +++ b/plexus-compiler-api/pom.xml @@ -5,7 +5,7 @@ org.codehaus.plexus plexus-compiler - 2.9.1-SNAPSHOT + 2.10.0-SNAPSHOT plexus-compiler-api diff --git a/plexus-compiler-its/pom.xml b/plexus-compiler-its/pom.xml index 1ffe34dd..ba3ac010 100644 --- a/plexus-compiler-its/pom.xml +++ b/plexus-compiler-its/pom.xml @@ -5,7 +5,7 @@ org.codehaus.plexus plexus-compiler - 2.9.1-SNAPSHOT + 2.10.0-SNAPSHOT plexus-compiler-its diff --git a/plexus-compiler-its/src/main/it/simple-eclipse-compiler-fail/invoker.properties b/plexus-compiler-its/src/main/it/simple-eclipse-compiler-fail/invoker.properties new file mode 100644 index 00000000..0ebe374a --- /dev/null +++ b/plexus-compiler-its/src/main/it/simple-eclipse-compiler-fail/invoker.properties @@ -0,0 +1,20 @@ +# 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.8+ +invoker.goals = clean test-compile +invoker.buildResult = failure diff --git a/plexus-compiler-its/src/main/it/simple-eclipse-compiler-fail/pom.xml b/plexus-compiler-its/src/main/it/simple-eclipse-compiler-fail/pom.xml new file mode 100644 index 00000000..5beaa3d0 --- /dev/null +++ b/plexus-compiler-its/src/main/it/simple-eclipse-compiler-fail/pom.xml @@ -0,0 +1,73 @@ + + + + + 4.0.0 + + org.codehaus.plexus.compiler.it + simple-javac + 1.0-SNAPSHOT + + Test for default configuration + + + UTF-8 + UTF-8 + 1.8 + 1.8 + + + + + junit + junit + @junit.version@ + test + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.9.0 + + eclipse + + + + org.codehaus.plexus + plexus-compiler-api + @pom.version@ + + + org.codehaus.plexus + plexus-compiler-eclipse + @pom.version@ + + + + + + + diff --git a/plexus-compiler-its/src/main/it/simple-eclipse-compiler-fail/src/main/java/MyClass.java b/plexus-compiler-its/src/main/it/simple-eclipse-compiler-fail/src/main/java/MyClass.java new file mode 100644 index 00000000..5cdd559a --- /dev/null +++ b/plexus-compiler-its/src/main/it/simple-eclipse-compiler-fail/src/main/java/MyClass.java @@ -0,0 +1,25 @@ +/* + * 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 MyClass +{ + + foo + +} diff --git a/plexus-compiler-its/src/main/it/simple-eclipse-compiler-fail/src/test/java/MyTest.java b/plexus-compiler-its/src/main/it/simple-eclipse-compiler-fail/src/test/java/MyTest.java new file mode 100644 index 00000000..44cccbd3 --- /dev/null +++ b/plexus-compiler-its/src/main/it/simple-eclipse-compiler-fail/src/test/java/MyTest.java @@ -0,0 +1,28 @@ +/* + * 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 junit.framework.TestCase; + +public class MyTest + extends TestCase +{ + + bar + +} diff --git a/plexus-compiler-its/src/main/it/simple-eclipse-compiler/invoker.properties b/plexus-compiler-its/src/main/it/simple-eclipse-compiler/invoker.properties new file mode 100644 index 00000000..f419c5fa --- /dev/null +++ b/plexus-compiler-its/src/main/it/simple-eclipse-compiler/invoker.properties @@ -0,0 +1,20 @@ +# 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.8+ +invoker.goals = clean test-compile +#invoker.buildResult = failure diff --git a/plexus-compiler-its/src/main/it/simple-eclipse-compiler/pom.xml b/plexus-compiler-its/src/main/it/simple-eclipse-compiler/pom.xml new file mode 100644 index 00000000..5beaa3d0 --- /dev/null +++ b/plexus-compiler-its/src/main/it/simple-eclipse-compiler/pom.xml @@ -0,0 +1,73 @@ + + + + + 4.0.0 + + org.codehaus.plexus.compiler.it + simple-javac + 1.0-SNAPSHOT + + Test for default configuration + + + UTF-8 + UTF-8 + 1.8 + 1.8 + + + + + junit + junit + @junit.version@ + test + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.9.0 + + eclipse + + + + org.codehaus.plexus + plexus-compiler-api + @pom.version@ + + + org.codehaus.plexus + plexus-compiler-eclipse + @pom.version@ + + + + + + + diff --git a/plexus-compiler-its/src/main/it/simple-eclipse-compiler/src/main/java/MyClass.java b/plexus-compiler-its/src/main/it/simple-eclipse-compiler/src/main/java/MyClass.java new file mode 100644 index 00000000..4945381a --- /dev/null +++ b/plexus-compiler-its/src/main/it/simple-eclipse-compiler/src/main/java/MyClass.java @@ -0,0 +1,23 @@ +/* + * 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 MyClass +{ + +} diff --git a/plexus-compiler-its/src/main/it/simple-eclipse-compiler/src/test/java/MyTest.java b/plexus-compiler-its/src/main/it/simple-eclipse-compiler/src/test/java/MyTest.java new file mode 100644 index 00000000..46ba41d4 --- /dev/null +++ b/plexus-compiler-its/src/main/it/simple-eclipse-compiler/src/test/java/MyTest.java @@ -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. + */ + +import junit.framework.TestCase; + +public class MyTest + extends TestCase +{ + +} diff --git a/plexus-compiler-its/src/main/it/simple-eclipse-compiler/verify.groovy b/plexus-compiler-its/src/main/it/simple-eclipse-compiler/verify.groovy new file mode 100644 index 00000000..06136d7f --- /dev/null +++ b/plexus-compiler-its/src/main/it/simple-eclipse-compiler/verify.groovy @@ -0,0 +1,23 @@ +/* + * 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 mainClass = new File( basedir, "target/classes/MyClass.class" ) +assert mainClass.exists() + +def testClass = new File( basedir, "target/test-classes/MyTest.class" ) +assert testClass.exists() diff --git a/plexus-compiler-its/src/main/it/simple-javac-fork/invoker.properties b/plexus-compiler-its/src/main/it/simple-javac-fork/invoker.properties new file mode 100644 index 00000000..f419c5fa --- /dev/null +++ b/plexus-compiler-its/src/main/it/simple-javac-fork/invoker.properties @@ -0,0 +1,20 @@ +# 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.8+ +invoker.goals = clean test-compile +#invoker.buildResult = failure diff --git a/plexus-compiler-its/src/main/it/simple-javac-fork/pom.xml b/plexus-compiler-its/src/main/it/simple-javac-fork/pom.xml new file mode 100644 index 00000000..054f42a6 --- /dev/null +++ b/plexus-compiler-its/src/main/it/simple-javac-fork/pom.xml @@ -0,0 +1,76 @@ + + + + + 4.0.0 + + org.codehaus.plexus.compiler.it + simple-javac + 1.0-SNAPSHOT + + Test for default configuration + + + UTF-8 + UTF-8 + 11 + 11 + + + + + junit + junit + @junit.version@ + test + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + true + + -Xlint:-path + + + + + org.codehaus.plexus + plexus-compiler-api + @pom.version@ + + + org.codehaus.plexus + plexus-compiler-javac + @pom.version@ + + + + + + + diff --git a/plexus-compiler-its/src/main/it/simple-javac-fork/src/main/java/MyClass.java b/plexus-compiler-its/src/main/it/simple-javac-fork/src/main/java/MyClass.java new file mode 100644 index 00000000..4945381a --- /dev/null +++ b/plexus-compiler-its/src/main/it/simple-javac-fork/src/main/java/MyClass.java @@ -0,0 +1,23 @@ +/* + * 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 MyClass +{ + +} diff --git a/plexus-compiler-its/src/main/it/simple-javac-fork/src/test/java/MyTest.java b/plexus-compiler-its/src/main/it/simple-javac-fork/src/test/java/MyTest.java new file mode 100644 index 00000000..46ba41d4 --- /dev/null +++ b/plexus-compiler-its/src/main/it/simple-javac-fork/src/test/java/MyTest.java @@ -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. + */ + +import junit.framework.TestCase; + +public class MyTest + extends TestCase +{ + +} diff --git a/plexus-compiler-its/src/main/it/simple-javac-fork/verify.groovy b/plexus-compiler-its/src/main/it/simple-javac-fork/verify.groovy new file mode 100644 index 00000000..06136d7f --- /dev/null +++ b/plexus-compiler-its/src/main/it/simple-javac-fork/verify.groovy @@ -0,0 +1,23 @@ +/* + * 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 mainClass = new File( basedir, "target/classes/MyClass.class" ) +assert mainClass.exists() + +def testClass = new File( basedir, "target/test-classes/MyTest.class" ) +assert testClass.exists() diff --git a/plexus-compiler-its/src/main/it/simple-javac/pom.xml b/plexus-compiler-its/src/main/it/simple-javac/pom.xml index 331d5b7d..5c5efffc 100644 --- a/plexus-compiler-its/src/main/it/simple-javac/pom.xml +++ b/plexus-compiler-its/src/main/it/simple-javac/pom.xml @@ -31,6 +31,9 @@ UTF-8 + UTF-8 + 1.8 + 1.8 @@ -49,9 +52,6 @@ maven-compiler-plugin 3.8.1 - 8 - 8 - -Xlint:-path diff --git a/plexus-compiler-manager/pom.xml b/plexus-compiler-manager/pom.xml index 534bbfa4..000d0605 100644 --- a/plexus-compiler-manager/pom.xml +++ b/plexus-compiler-manager/pom.xml @@ -5,7 +5,7 @@ org.codehaus.plexus plexus-compiler - 2.9.1-SNAPSHOT + 2.10.0-SNAPSHOT plexus-compiler-manager diff --git a/plexus-compiler-test/pom.xml b/plexus-compiler-test/pom.xml index 145adbb8..d2bec28e 100644 --- a/plexus-compiler-test/pom.xml +++ b/plexus-compiler-test/pom.xml @@ -5,7 +5,7 @@ org.codehaus.plexus plexus-compiler - 2.9.1-SNAPSHOT + 2.10.0-SNAPSHOT plexus-compiler-test diff --git a/plexus-compilers/plexus-compiler-aspectj/pom.xml b/plexus-compilers/plexus-compiler-aspectj/pom.xml index e1c09642..33edaffa 100644 --- a/plexus-compilers/plexus-compiler-aspectj/pom.xml +++ b/plexus-compilers/plexus-compiler-aspectj/pom.xml @@ -5,7 +5,7 @@ org.codehaus.plexus plexus-compilers - 2.9.1-SNAPSHOT + 2.10.0-SNAPSHOT plexus-compiler-aspectj diff --git a/plexus-compilers/plexus-compiler-csharp/pom.xml b/plexus-compilers/plexus-compiler-csharp/pom.xml index bc60b549..cf34b8c4 100644 --- a/plexus-compilers/plexus-compiler-csharp/pom.xml +++ b/plexus-compilers/plexus-compiler-csharp/pom.xml @@ -5,7 +5,7 @@ org.codehaus.plexus plexus-compilers - 2.9.1-SNAPSHOT + 2.10.0-SNAPSHOT plexus-compiler-csharp diff --git a/plexus-compilers/plexus-compiler-eclipse/pom.xml b/plexus-compilers/plexus-compiler-eclipse/pom.xml index fe895d2f..010c917c 100644 --- a/plexus-compilers/plexus-compiler-eclipse/pom.xml +++ b/plexus-compilers/plexus-compiler-eclipse/pom.xml @@ -5,7 +5,7 @@ org.codehaus.plexus plexus-compilers - 2.9.1-SNAPSHOT + 2.10.0-SNAPSHOT plexus-compiler-eclipse diff --git a/plexus-compilers/plexus-compiler-j2objc/README.md b/plexus-compilers/plexus-compiler-j2objc/README.md index 56af165d..15c349f6 100644 --- a/plexus-compilers/plexus-compiler-j2objc/README.md +++ b/plexus-compilers/plexus-compiler-j2objc/README.md @@ -23,7 +23,7 @@ J2ObjC Plexus compiler org.codehaus.plexus plexus-compiler-j2objc - 2.9.1-SNAPSHOT + 2.10.0-SNAPSHOT diff --git a/plexus-compilers/plexus-compiler-j2objc/pom.xml b/plexus-compilers/plexus-compiler-j2objc/pom.xml index 31c9fd76..2bc88538 100644 --- a/plexus-compilers/plexus-compiler-j2objc/pom.xml +++ b/plexus-compilers/plexus-compiler-j2objc/pom.xml @@ -5,7 +5,7 @@ org.codehaus.plexus plexus-compilers - 2.9.1-SNAPSHOT + 2.10.0-SNAPSHOT plexus-compiler-j2objc diff --git a/plexus-compilers/plexus-compiler-javac-errorprone/pom.xml b/plexus-compilers/plexus-compiler-javac-errorprone/pom.xml index 3be65d6c..bfce29f3 100644 --- a/plexus-compilers/plexus-compiler-javac-errorprone/pom.xml +++ b/plexus-compilers/plexus-compiler-javac-errorprone/pom.xml @@ -5,7 +5,7 @@ org.codehaus.plexus plexus-compilers - 2.9.1-SNAPSHOT + 2.10.0-SNAPSHOT plexus-compiler-javac-errorprone diff --git a/plexus-compilers/plexus-compiler-javac/pom.xml b/plexus-compilers/plexus-compiler-javac/pom.xml index 7f0638de..c821cc45 100644 --- a/plexus-compilers/plexus-compiler-javac/pom.xml +++ b/plexus-compilers/plexus-compiler-javac/pom.xml @@ -5,7 +5,7 @@ org.codehaus.plexus plexus-compilers - 2.9.1-SNAPSHOT + 2.10.0-SNAPSHOT plexus-compiler-javac diff --git a/plexus-compilers/plexus-compiler-jikes/pom.xml b/plexus-compilers/plexus-compiler-jikes/pom.xml index c7a34b2a..9e1b3c58 100644 --- a/plexus-compilers/plexus-compiler-jikes/pom.xml +++ b/plexus-compilers/plexus-compiler-jikes/pom.xml @@ -5,7 +5,7 @@ org.codehaus.plexus plexus-compilers - 2.9.1-SNAPSHOT + 2.10.0-SNAPSHOT plexus-compiler-jikes diff --git a/plexus-compilers/pom.xml b/plexus-compilers/pom.xml index c567a23d..0793c1ff 100644 --- a/plexus-compilers/pom.xml +++ b/plexus-compilers/pom.xml @@ -5,7 +5,7 @@ org.codehaus.plexus plexus-compiler - 2.9.1-SNAPSHOT + 2.10.0-SNAPSHOT plexus-compilers diff --git a/pom.xml b/pom.xml index ea6ffee4..5abf7b79 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ plexus-compiler - 2.9.1-SNAPSHOT + 2.10.0-SNAPSHOT pom Plexus Compiler