diff --git a/pom.xml b/pom.xml index 45b8a10..2a22017 100644 --- a/pom.xml +++ b/pom.xml @@ -74,8 +74,15 @@ + + + staged-releases + https://repository.apache.org/content/repositories/maven-1469 + + + - 3.2.0 + 3.3.0 3.0 7 diff --git a/src/it/MJAR-260-invalid-automatic-module-name/invoker.properties b/src/it/MJAR-260-invalid-automatic-module-name/invoker.properties new file mode 100644 index 0000000..4789d91 --- /dev/null +++ b/src/it/MJAR-260-invalid-automatic-module-name/invoker.properties @@ -0,0 +1,18 @@ +# 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.buildResult=failure diff --git a/src/it/MJAR-260-invalid-automatic-module-name/pom.xml b/src/it/MJAR-260-invalid-automatic-module-name/pom.xml new file mode 100644 index 0000000..4046808 --- /dev/null +++ b/src/it/MJAR-260-invalid-automatic-module-name/pom.xml @@ -0,0 +1,46 @@ + + + + 4.0.0 + org.apache.maven.plugins + mjar260-invalid-automatic-module-name + MJAR-260-invalid-automatic-module-name + jar + 1.0-SNAPSHOT + + jar plugin it + + + + + org.apache.maven.plugins + maven-jar-plugin + @project.version@ + + + + in-valid.name.with.new.keyword + + + + + + + diff --git a/src/it/MJAR-260-invalid-automatic-module-name/src/main/java/myproject/HelloWorld.java b/src/it/MJAR-260-invalid-automatic-module-name/src/main/java/myproject/HelloWorld.java new file mode 100644 index 0000000..fd0ad83 --- /dev/null +++ b/src/it/MJAR-260-invalid-automatic-module-name/src/main/java/myproject/HelloWorld.java @@ -0,0 +1,36 @@ +package myproject; + +/* + * 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. + */ + +/** + * The classic Hello World App. + */ +public class HelloWorld { + + /** + * Main method. + * + * @param args Not used + */ + public static void main( String[] args ) + { + System.out.println( "Hi!" ); + } +} \ No newline at end of file diff --git a/src/it/MJAR-260-invalid-automatic-module-name/verify.bsh b/src/it/MJAR-260-invalid-automatic-module-name/verify.bsh new file mode 100644 index 0000000..2096dc1 --- /dev/null +++ b/src/it/MJAR-260-invalid-automatic-module-name/verify.bsh @@ -0,0 +1,69 @@ + +/* + * 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.*; +import java.nio.file.*; +import java.util.*; +import java.util.jar.*; +import org.codehaus.plexus.util.*; + +boolean result = true; + +try +{ + File target = new File( basedir, "target" ); + if ( !target.exists() || !target.isDirectory() ) + { + System.err.println( "target file is missing or not a directory." ); + return false; + } + + File artifact = new File( target, "mjar260-invalid-automatic-module-name-1.0-SNAPSHOT.jar" ); + if ( artifact.exists() || artifact.isDirectory() ) + { + System.err.println( "artifact file is created or a directory." ); + return false; + } + + String log = new String(Files.readAllBytes(basedir.toPath().resolve("build.log")), "UTF-8"); + String[] snippets = new String[] { + "[INFO] BUILD FAILURE", + "[ERROR] Failed to execute goal org.apache.maven.plugins:maven-jar-plugin", + "Caused by: org.apache.maven.plugin.MojoExecutionException: Error assembling JAR", + "Caused by: org.codehaus.plexus.archiver.jar.ManifestException: Invalid automatic module name: 'in-valid.name.with.new.keyword'" + }; + + System.out.println("\nVerifying log snippets..."); + for (String snippet : snippets) { + if (!log.contains(snippet)) { + System.err.println("XXX| Snippet `" + snippet + "` not found"); + result = false; + continue; + } + System.out.println(" | `" + snippet + "` found in log"); + } +} +catch( Throwable e ) +{ + e.printStackTrace(); + result = false; +} + +return result; diff --git a/src/it/MJAR-260-valid-automatic-module-name/pom.xml b/src/it/MJAR-260-valid-automatic-module-name/pom.xml new file mode 100644 index 0000000..ede7f61 --- /dev/null +++ b/src/it/MJAR-260-valid-automatic-module-name/pom.xml @@ -0,0 +1,46 @@ + + + + 4.0.0 + org.apache.maven.plugins + mjar260-valid-automatic-module-name + MJAR-260-valid-automatic-module-name + jar + 1.0-SNAPSHOT + + jar plugin it + + + + + org.apache.maven.plugins + maven-jar-plugin + @project.version@ + + + + valid.automatic.module.name + + + + + + + diff --git a/src/it/MJAR-260-valid-automatic-module-name/src/main/java/myproject/HelloWorld.java b/src/it/MJAR-260-valid-automatic-module-name/src/main/java/myproject/HelloWorld.java new file mode 100644 index 0000000..fd0ad83 --- /dev/null +++ b/src/it/MJAR-260-valid-automatic-module-name/src/main/java/myproject/HelloWorld.java @@ -0,0 +1,36 @@ +package myproject; + +/* + * 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. + */ + +/** + * The classic Hello World App. + */ +public class HelloWorld { + + /** + * Main method. + * + * @param args Not used + */ + public static void main( String[] args ) + { + System.out.println( "Hi!" ); + } +} \ No newline at end of file diff --git a/src/it/MJAR-260-valid-automatic-module-name/verify.bsh b/src/it/MJAR-260-valid-automatic-module-name/verify.bsh new file mode 100644 index 0000000..86db5ed --- /dev/null +++ b/src/it/MJAR-260-valid-automatic-module-name/verify.bsh @@ -0,0 +1,52 @@ + +/* + * 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.*; +import java.util.*; +import java.util.jar.*; +import org.codehaus.plexus.util.*; + +boolean result = true; + +try +{ + File target = new File( basedir, "target" ); + if ( !target.exists() || !target.isDirectory() ) + { + System.err.println( "target file is missing or not a directory." ); + return false; + } + + File artifact = new File( target, "mjar260-valid-automatic-module-name-1.0-SNAPSHOT.jar" ); + if ( !artifact.exists() || artifact.isDirectory() ) + { + System.err.println( "artifact file is missing or a directory." ); + return false; + } + + +} +catch( Throwable e ) +{ + e.printStackTrace(); + result = false; +} + +return result;