diff --git a/pom.xml b/pom.xml index e1a5c8eda..fb5d46a4d 100644 --- a/pom.xml +++ b/pom.xml @@ -72,7 +72,7 @@ under the License. 1.9.2 2.4 1.13.1 - 1.0.7 + 1.1.0 9.4.43.v20210629 3.3 diff --git a/src/it/projects/MJAVADOC-677_require-static-transitive/app/pom.xml b/src/it/projects/MJAVADOC-677_require-static-transitive/app/pom.xml new file mode 100644 index 000000000..887dad5e8 --- /dev/null +++ b/src/it/projects/MJAVADOC-677_require-static-transitive/app/pom.xml @@ -0,0 +1,40 @@ + + + + 4.0.0 + + + org.apache.maven.plugins.javadoc.it + mjavadoc677 + 0.1.0-SNAPSHOT + + + app + + + + org.apache.maven.plugins.javadoc.it + lib + ${project.version} + + + \ No newline at end of file diff --git a/src/it/projects/MJAVADOC-677_require-static-transitive/app/src/main/java/com/example/app/Application.java b/src/it/projects/MJAVADOC-677_require-static-transitive/app/src/main/java/com/example/app/Application.java new file mode 100644 index 000000000..da02295fe --- /dev/null +++ b/src/it/projects/MJAVADOC-677_require-static-transitive/app/src/main/java/com/example/app/Application.java @@ -0,0 +1,27 @@ +package com.example.app; + +/* + * 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 com.example.lib.Lib; + +public class Application +{ + private Lib stringLib; +} \ No newline at end of file diff --git a/src/it/projects/MJAVADOC-677_require-static-transitive/app/src/main/java/module-info.java b/src/it/projects/MJAVADOC-677_require-static-transitive/app/src/main/java/module-info.java new file mode 100644 index 000000000..b75f4cf15 --- /dev/null +++ b/src/it/projects/MJAVADOC-677_require-static-transitive/app/src/main/java/module-info.java @@ -0,0 +1,22 @@ +/* + * 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. + */ +module com.example.app +{ + requires com.example.lib; +} \ No newline at end of file diff --git a/src/it/projects/MJAVADOC-677_require-static-transitive/awkward/pom.xml b/src/it/projects/MJAVADOC-677_require-static-transitive/awkward/pom.xml new file mode 100644 index 000000000..d84aadc3d --- /dev/null +++ b/src/it/projects/MJAVADOC-677_require-static-transitive/awkward/pom.xml @@ -0,0 +1,32 @@ + + + + 4.0.0 + + + org.apache.maven.plugins.javadoc.it + mjavadoc677 + 0.1.0-SNAPSHOT + + awkward + + \ No newline at end of file diff --git a/src/it/projects/MJAVADOC-677_require-static-transitive/awkward/src/main/java/com/example/awkward/Awkward.java b/src/it/projects/MJAVADOC-677_require-static-transitive/awkward/src/main/java/com/example/awkward/Awkward.java new file mode 100644 index 000000000..ad5d81b4c --- /dev/null +++ b/src/it/projects/MJAVADOC-677_require-static-transitive/awkward/src/main/java/com/example/awkward/Awkward.java @@ -0,0 +1,22 @@ +package com.example.awkward; +/* + * 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 Awkward +{ +} \ No newline at end of file diff --git a/src/it/projects/MJAVADOC-677_require-static-transitive/awkward/src/main/java/module-info.java b/src/it/projects/MJAVADOC-677_require-static-transitive/awkward/src/main/java/module-info.java new file mode 100644 index 000000000..0b750db66 --- /dev/null +++ b/src/it/projects/MJAVADOC-677_require-static-transitive/awkward/src/main/java/module-info.java @@ -0,0 +1,22 @@ +/* + * 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. + */ +module com.example.awkward +{ + exports com.example.awkward; +} diff --git a/src/it/projects/MJAVADOC-677_require-static-transitive/invoker.properties b/src/it/projects/MJAVADOC-677_require-static-transitive/invoker.properties new file mode 100644 index 000000000..7f5440336 --- /dev/null +++ b/src/it/projects/MJAVADOC-677_require-static-transitive/invoker.properties @@ -0,0 +1,17 @@ +# 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+ diff --git a/src/it/projects/MJAVADOC-677_require-static-transitive/lib/pom.xml b/src/it/projects/MJAVADOC-677_require-static-transitive/lib/pom.xml new file mode 100644 index 000000000..cb2af9fde --- /dev/null +++ b/src/it/projects/MJAVADOC-677_require-static-transitive/lib/pom.xml @@ -0,0 +1,42 @@ + + + + 4.0.0 + + + org.apache.maven.plugins.javadoc.it + mjavadoc677 + 0.1.0-SNAPSHOT + + + lib + + + + org.apache.maven.plugins.javadoc.it + awkward + 0.1.0-SNAPSHOT + + + + + \ No newline at end of file diff --git a/src/it/projects/MJAVADOC-677_require-static-transitive/lib/src/main/java/com/example/lib/AwkwardLib.java b/src/it/projects/MJAVADOC-677_require-static-transitive/lib/src/main/java/com/example/lib/AwkwardLib.java new file mode 100644 index 000000000..9a3b5ac87 --- /dev/null +++ b/src/it/projects/MJAVADOC-677_require-static-transitive/lib/src/main/java/com/example/lib/AwkwardLib.java @@ -0,0 +1,29 @@ +package com.example.lib; + +/* + * 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 com.example.awkward.Awkward; + +public class AwkwardLib implements Lib +{ + public void apply( Awkward awkward ) + { + } +} \ No newline at end of file diff --git a/src/it/projects/MJAVADOC-677_require-static-transitive/lib/src/main/java/com/example/lib/Lib.java b/src/it/projects/MJAVADOC-677_require-static-transitive/lib/src/main/java/com/example/lib/Lib.java new file mode 100644 index 000000000..122194fd0 --- /dev/null +++ b/src/it/projects/MJAVADOC-677_require-static-transitive/lib/src/main/java/com/example/lib/Lib.java @@ -0,0 +1,27 @@ +package com.example.lib; + +/* + * 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 com.example.awkward.Awkward; + +public interface Lib +{ + void apply(T t); +} \ No newline at end of file diff --git a/src/it/projects/MJAVADOC-677_require-static-transitive/lib/src/main/java/module-info.java b/src/it/projects/MJAVADOC-677_require-static-transitive/lib/src/main/java/module-info.java new file mode 100644 index 000000000..d5fdc03c9 --- /dev/null +++ b/src/it/projects/MJAVADOC-677_require-static-transitive/lib/src/main/java/module-info.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. + */ +module com.example.lib +{ + exports com.example.lib; + + // static transitive is an unusual but valid combination + requires static transitive com.example.awkward; +} diff --git a/src/it/projects/MJAVADOC-677_require-static-transitive/pom.xml b/src/it/projects/MJAVADOC-677_require-static-transitive/pom.xml new file mode 100644 index 000000000..95f823b6e --- /dev/null +++ b/src/it/projects/MJAVADOC-677_require-static-transitive/pom.xml @@ -0,0 +1,67 @@ + + + + 4.0.0 + + org.apache.maven.plugins.javadoc.it + mjavadoc677 + 0.1.0-SNAPSHOT + pom + + https://issues.apache.org/jira/browse/MJAVADOC-677 + + + UTF-8 + + + + awkward + lib + app + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 11 + + + + org.apache.maven.plugins + maven-javadoc-plugin + @project.version@ + + + attach-javadoc + + jar + + + + + + + \ No newline at end of file