patching file src/test/java/org/apache/maven/plugin/jar/JarMojoIntegrationTest.java patching file src/test/java/org/apache/maven/plugin/jar/TestJarMojoIntegrationTest.java patching file src/test/java/org/apache/maven/plugin/jar/AbstractJarPluginTestCase.java patching file src/test/resources/it/mjar-30-01/src/test/java/foo/project001/AppTest.java patching file src/test/resources/it/mjar-30-01/src/test/resources/test-default-configuration.properties patching file src/test/resources/it/mjar-30-01/src/main/java/foo/project001/App.java patching file src/test/resources/it/mjar-30-01/src/main/resources/default-configuration.properties patching file src/test/resources/it/mjar-30-01/pom.xml patching file src/test/resources/it/project-004/src/main/java/service/TestInterface.java patching file src/test/resources/it/project-004/src/main/java/service/impl/TestImplementation.java patching file src/test/resources/it/project-004/src/main/java/TestCompile1.java patching file src/test/resources/it/project-004/src/main/resources/notIncluded.xml patching file src/test/resources/it/project-004/pom.xml patching file src/test/resources/it/mjar-30-02/src/main/java/service/TestInterface.java patching file src/test/resources/it/mjar-30-02/src/main/java/service/impl/TestImplementation.java patching file src/test/resources/it/mjar-30-02/src/main/java/TestCompile1.java patching file src/test/resources/it/mjar-30-02/src/main/resources/notIncluded.xml patching file src/test/resources/it/mjar-30-02/pom.xml patching file src/test/resources/it/mjar-30-03/src/test/java/foo/project003/AppTest.java patching file src/test/resources/it/mjar-30-03/src/test/resources/test-default-configuration.properties patching file src/test/resources/it/mjar-30-03/src/test/resources/excluded-file.txt patching file src/test/resources/it/mjar-30-03/src/main/java/foo/project003/App.java patching file src/test/resources/it/mjar-30-03/src/main/resources/default-configuration.properties patching file src/test/resources/it/mjar-30-03/src/main/resources/excluded-file.txt patching file src/test/resources/it/mjar-30-03/pom.xml patching file src/test/resources/it/mjar-80-01/src/test/java/foo/project003/AppTest.java patching file src/test/resources/it/mjar-80-01/src/test/java/foo/project003/AppIntegrationTest.java patching file src/test/resources/it/mjar-80-01/src/test/resources/test-default-configuration.properties patching file src/test/resources/it/mjar-80-01/src/main/java/foo/project003/App.java patching file src/test/resources/it/mjar-80-01/src/main/resources/default-configuration.properties patching file src/test/resources/it/mjar-80-01/src/main/resources/excluded-file.txt patching file src/test/resources/it/mjar-80-01/pom.xml patching file src/test/resources/it/mjar-80-02/src/test/java/foo/project003/AppTest.java patching file src/test/resources/it/mjar-80-02/src/test/java/foo/project003/AppIntegrationTest.java patching file src/test/resources/it/mjar-80-02/src/test/resources/test-default-configuration.properties patching file src/test/resources/it/mjar-80-02/src/main/java/foo/project003/App.java patching file src/test/resources/it/mjar-80-02/src/main/resources/default-configuration.properties patching file src/test/resources/it/mjar-80-02/src/main/resources/excluded-file.txt patching file src/test/resources/it/mjar-80-02/pom.xml patching file src/test/resources/it/mjar-80-03/src/test/java/foo/project003/AppTest.java patching file src/test/resources/it/mjar-80-03/src/test/java/foo/project003/AppIntegrationTest.java patching file src/test/resources/it/mjar-80-03/src/test/resources/test-default-configuration.properties patching file src/test/resources/it/mjar-80-03/src/test/resources/excluded-file.txt patching file src/test/resources/it/mjar-80-03/src/main/java/foo/project003/App.java patching file src/test/resources/it/mjar-80-03/src/main/resources/default-configuration.properties patching file src/test/resources/it/mjar-80-03/src/main/resources/excluded-file.txt patching file src/test/resources/it/mjar-80-03/pom.xml patching file src/main/java/org/apache/maven/plugin/jar/AbstractJarMojo.java Hunk #1 succeeded at 28 with fuzz 2. missing header for unified diff at line 1957 of patch can't find file to patch at input line 1957 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |3 +36,27 @@ | extends AbstractMojo | { | |- private static final String[] DEFAULT_EXCLUDES = new String[]{"**/package.html"}; |+ private static final String[] DEFAULT_EXCLUDES = new String[] { "**/package.html" }; | |- private static final String[] DEFAULT_INCLUDES = new String[]{"**/**"}; |+ private static final String[] DEFAULT_INCLUDES = new String[] { "**/**" }; | | /** |+ * List of files to include, fileset pattern. |+ * |+ * @parameter |+ */ |+ private String[] includes; |+ |+ /** |+ * List of files to exclude, fileset pattern. |+ * |+ * @parameter |+ */ |+ private String[] excludes; |+ |+ /** | * Directory containing the generated JAR. |- * |+ * | * @parameter expression="${project.build.directory}" | * @required | */ -------------------------- File to patch: Skip this patch? [y] Skipping patch. 1 out of 1 hunk ignored missing header for unified diff at line 1972 of patch can't find file to patch at input line 1972 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |The Jar archiver. |- * |+ * | * @parameter expression="${component.org.codehaus.plexus.archiver.Archiver#jar}" | * @required | */ -------------------------- File to patch: Skip this patch? [y] Skipping patch. 1 out of 1 hunk ignored missing header for unified diff at line 1996 of patch can't find file to patch at input line 1996 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |1 @@ | | /** | * The maven archive configuration to use. |- * |- * See the Javadocs for MavenArchiveConfiguration. |- * |+ * |+ * See the |+ * Javadocs for MavenArchiveConfiguration. |+ * | * @parameter | */ | private MavenArchiveConfiguration archive = new MavenArchiveConfiguration(); -------------------------- File to patch: Skip this patch? [y] Skipping patch. 1 out of 1 hunk ignored missing header for unified diff at line 2012 of patch can't find file to patch at input line 2012 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- | * Overload this to produce a test-jar, for example. | */ | protected abstract String getClassifier(); |- |+ | /** | * Overload this to produce a test-jar, for example. | */ -------------------------- File to patch: Skip this patch? [y] Skipping patch. 1 out of 1 hunk ignored missing header for unified diff at line 2030 of patch can't find file to patch at input line 2030 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- | @@ | } | else | { |- archiver.getArchiver().addDirectory( contentDirectory, DEFAULT_INCLUDES, DEFAULT_EXCLUDES ); |+ archiver.getArchiver().addDirectory( contentDirectory, getIncludes(), getExcludes() ); | } | | archiver.createArchive( project, archive ); -------------------------- File to patch: Skip this patch? [y] Skipping patch. 1 out of 1 hunk ignored patching file src/site/apt/usage.apt