This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch ARCHETYPE-606 in repository https://gitbox.apache.org/repos/asf/maven-archetype.git
commit f0f65712d65decb6842805f2e1f049282c027c6a Author: Peter Lamby <[email protected]> AuthorDate: Mon Oct 12 11:06:28 2020 +0200 Fix IT --- .../{verify.bsh => setup.bsh} | 30 +++++----------------- .../META-INF/maven/archetype-metadata.xml | 6 +++++ .../main/resources/archetype-resources/.gitignore | 1 - 3 files changed, 13 insertions(+), 24 deletions(-) diff --git a/maven-archetype-plugin/src/it/projects/ARCHETYPE-606_include-gitignore/verify.bsh b/maven-archetype-plugin/src/it/projects/ARCHETYPE-606_include-gitignore/setup.bsh similarity index 56% rename from maven-archetype-plugin/src/it/projects/ARCHETYPE-606_include-gitignore/verify.bsh rename to maven-archetype-plugin/src/it/projects/ARCHETYPE-606_include-gitignore/setup.bsh index 2d245ae..8affb5d 100644 --- a/maven-archetype-plugin/src/it/projects/ARCHETYPE-606_include-gitignore/verify.bsh +++ b/maven-archetype-plugin/src/it/projects/ARCHETYPE-606_include-gitignore/setup.bsh @@ -1,4 +1,3 @@ - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -18,29 +17,14 @@ * under the License. */ +// This is a workaround. The invoker-plugin does not copy the .gitignore file to the clone +// target directory. So we create the .gitignore here in the setup task. + import java.io.*; import org.codehaus.plexus.util.*; -basedir = new File( basedir, "target/test-classes/projects/basic/project/project/basic" ); -if ( !basedir.exists() ) { - throw new Exception( basedir + " is missing." ); -} - -File main = new File( basedir, "src/main" ); - -// check <fileset packaged="true"> -File app = new File( main, "java/build/archetype/App.java" ); -if ( !app.isFile() ) -{ - throw new Exception( app + " file is missing or not a file." ); -} - -File buildLog = new File( basedir, "build.log" ); - -String content = FileUtils.fileRead( buildLog, "UTF-8" ); +srcGitignore = new File ( basedir, "src/main/resources/archetype-resources/.gitignore" ); +targetGitignore = new File ( basedir, "src/test/resources/projects/basic/reference/.gitignore" ); -int idx = content.indexOf( "Yeah Baby, it rocks!" ); -if ( idx < 0 ) -{ - throw new Exception( "build.log missing System.out.println from verify.groovy" ); -} +FileUtils.fileWrite(srcGitignore, "UTF-8", "#Dummy"); +FileUtils.fileWrite(targetGitignore, "UTF-8", "#Dummy"); \ No newline at end of file diff --git a/maven-archetype-plugin/src/it/projects/ARCHETYPE-606_include-gitignore/src/main/resources/META-INF/maven/archetype-metadata.xml b/maven-archetype-plugin/src/it/projects/ARCHETYPE-606_include-gitignore/src/main/resources/META-INF/maven/archetype-metadata.xml index 28ff4bf..abe5546 100644 --- a/maven-archetype-plugin/src/it/projects/ARCHETYPE-606_include-gitignore/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/maven-archetype-plugin/src/it/projects/ARCHETYPE-606_include-gitignore/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -24,6 +24,12 @@ under the License. xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd"; name="build-archetype-IT"> <fileSets> + <fileSet encoding="UTF-8"> + <directory></directory> + <includes> + <include>.gitignore</include> + </includes> + </fileSet> <fileSet filtered="true" packaged="true" encoding="UTF-8"> <directory>src/main/java</directory> <includes> diff --git a/maven-archetype-plugin/src/it/projects/ARCHETYPE-606_include-gitignore/src/main/resources/archetype-resources/.gitignore b/maven-archetype-plugin/src/it/projects/ARCHETYPE-606_include-gitignore/src/main/resources/archetype-resources/.gitignore deleted file mode 100644 index 403f980..0000000 --- a/maven-archetype-plugin/src/it/projects/ARCHETYPE-606_include-gitignore/src/main/resources/archetype-resources/.gitignore +++ /dev/null @@ -1 +0,0 @@ -# Dummy
