diff -Nru maven-file-management-1.2.1/debian/changelog maven-file-management-3.0.0/debian/changelog --- maven-file-management-1.2.1/debian/changelog 2011-08-22 20:56:33.000000000 +0000 +++ maven-file-management-3.0.0/debian/changelog 2017-07-19 15:25:51.000000000 +0000 @@ -1,3 +1,18 @@ +maven-file-management (3.0.0-1) unstable; urgency=medium + + * Team upload. + * New upstream release + - Removed mdo_xsd.patch (fixed upstream) + - Depend on libmaven3-core-java instead of libmaven2-core-java + - Build depend on junit4 instead of junit + * Build with the DH sequencer instead of CDBS + * Moved the package to Git + * Standards-Version updated to 4.0.0 + * Switch to debhelper level 10 + * Use XZ compression for the upstream tarball + + -- Emmanuel Bourg Wed, 19 Jul 2017 17:25:51 +0200 + maven-file-management (1.2.1-3) unstable; urgency=low * Switch to source format 3.0. diff -Nru maven-file-management-1.2.1/debian/compat maven-file-management-3.0.0/debian/compat --- maven-file-management-1.2.1/debian/compat 2011-08-22 20:35:41.000000000 +0000 +++ maven-file-management-3.0.0/debian/compat 2017-07-19 15:07:17.000000000 +0000 @@ -1 +1 @@ -7 +10 diff -Nru maven-file-management-1.2.1/debian/control maven-file-management-3.0.0/debian/control --- maven-file-management-1.2.1/debian/control 2011-08-22 20:56:33.000000000 +0000 +++ maven-file-management-3.0.0/debian/control 2017-07-19 15:25:51.000000000 +0000 @@ -2,20 +2,29 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers -Uploaders: Torsten Werner , Ludovic Claude -Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4) -Build-Depends-Indep: libmodello-maven-plugin-java, libmaven-shared-io-java, libmaven2-core-java, - libplexus-container-default-java, libplexus-utils-java, junit, default-jdk-doc, - libmaven2-core-java-doc, libplexus-container-default-java-doc, libplexus-utils-java-doc, - libmaven-javadoc-plugin-java -Standards-Version: 3.9.1 -Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-file-management -Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-file-management/ +Uploaders: + Torsten Werner , + Ludovic Claude +Build-Depends: + debhelper (>= 10), + default-jdk, + default-jdk-doc, + junit4, + libmaven-javadoc-plugin-java, + libmaven-shared-io-java, + libmaven3-core-java, + libmodello-maven-plugin-java, + libplexus-utils-java, + libplexus-utils-java-doc, + maven-debian-helper (>= 2.2) +Standards-Version: 4.0.0 +Vcs-Git: https://anonscm.debian.org/git/pkg-java/maven-file-management.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/maven-file-management.git Homepage: http://maven.apache.org/shared/file-management/ Package: libmaven-file-management-java Architecture: all -Depends: ${misc:Depends}, ${maven:Depends} +Depends: ${maven:Depends}, ${misc:Depends} Recommends: ${maven:OptionalDepends} Suggests: libmaven-file-management-java-doc Description: Maven File Management API @@ -40,7 +49,7 @@ Package: libmaven-file-management-java-doc Architecture: all Section: doc -Depends: ${misc:Depends}, ${maven:DocDepends} +Depends: ${maven:DocDepends}, ${misc:Depends} Recommends: ${maven:DocOptionalDepends} Suggests: libmaven-file-management-java Description: Documentation for Maven File Management API diff -Nru maven-file-management-1.2.1/debian/copyright maven-file-management-3.0.0/debian/copyright --- maven-file-management-1.2.1/debian/copyright 2011-08-22 20:56:33.000000000 +0000 +++ maven-file-management-3.0.0/debian/copyright 2017-07-19 15:07:17.000000000 +0000 @@ -1,6 +1,6 @@ Format: http://dep.debian.net/deps/dep5/ Upstream-Name: Maven File Management API -Upstream-Contact: Joakim Erdfelt as +Upstream-Contact: Joakim Erdfelt as Source: http://maven.apache.org/shared/file-management/ Files: * diff -Nru maven-file-management-1.2.1/debian/libmaven-file-management-java-doc.install maven-file-management-3.0.0/debian/libmaven-file-management-java-doc.install --- maven-file-management-1.2.1/debian/libmaven-file-management-java-doc.install 2011-08-22 20:56:33.000000000 +0000 +++ maven-file-management-3.0.0/debian/libmaven-file-management-java-doc.install 2017-07-19 15:07:17.000000000 +0000 @@ -1,2 +1 @@ target/apidocs/* usr/share/doc/libmaven-file-management-java/api - diff -Nru maven-file-management-1.2.1/debian/maven.ignoreRules maven-file-management-3.0.0/debian/maven.ignoreRules --- maven-file-management-1.2.1/debian/maven.ignoreRules 2011-08-22 20:56:33.000000000 +0000 +++ maven-file-management-3.0.0/debian/maven.ignoreRules 2017-07-19 15:25:51.000000000 +0000 @@ -14,3 +14,4 @@ # from the POM # junit junit jar s/3\\..*/3.x/ +org.apache.rat apache-rat-plugin * * * * diff -Nru maven-file-management-1.2.1/debian/maven.rules maven-file-management-3.0.0/debian/maven.rules --- maven-file-management-1.2.1/debian/maven.rules 2011-08-22 20:56:33.000000000 +0000 +++ maven-file-management-3.0.0/debian/maven.rules 2017-07-19 15:25:51.000000000 +0000 @@ -16,6 +16,5 @@ # and version starting with 3., replacing the version with 3.x # junit junit jar s/3\\..*/3.x/ -junit junit jar s/3\..*/3.x/ * * -org.apache.maven.shared file-management jar s/.*/debian/ * * -org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ * * +junit junit jar s/.*/4.x/ * * +org.apache.maven maven-plugin-api * s/.*/3.x/ * * diff -Nru maven-file-management-1.2.1/debian/orig-tar.sh maven-file-management-3.0.0/debian/orig-tar.sh --- maven-file-management-1.2.1/debian/orig-tar.sh 2011-08-22 20:56:33.000000000 +0000 +++ maven-file-management-3.0.0/debian/orig-tar.sh 2017-07-19 15:25:51.000000000 +0000 @@ -1,16 +1,10 @@ #!/bin/sh -e VERSION=$2 -TAR=../maven-file-management_$VERSION.orig.tar.gz +TAR=../maven-file-management_$VERSION.orig.tar.xz DIR=maven-file-management-$VERSION TAG=$(echo "file-management-$VERSION" | sed -re's/~(alpha|beta)/-\1-/') svn export http://svn.apache.org/repos/asf/maven/shared/tags/${TAG}/ $DIR -GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude '*.class' $DIR +XZ_OPT=--best tar -c -J -f $TAR --exclude '*.jar' --exclude '*.class' $DIR rm -rf $DIR ../$TAG - -# move to directory 'tarballs' -if [ -r .svn/deb-layout ]; then - . .svn/deb-layout - mv $TAR $origDir && echo "moved $TAR to $origDir" -fi diff -Nru maven-file-management-1.2.1/debian/patches/mdo_xsd.patch maven-file-management-3.0.0/debian/patches/mdo_xsd.patch --- maven-file-management-1.2.1/debian/patches/mdo_xsd.patch 2009-07-07 23:41:55.000000000 +0000 +++ maven-file-management-3.0.0/debian/patches/mdo_xsd.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ ---- a/src/main/mdo/fileset.mdo -+++ b/src/main/mdo/fileset.mdo -@@ -19,7 +19,8 @@ - under the License. - --> - -- -+ - fileset - FileSet - diff -Nru maven-file-management-1.2.1/debian/patches/series maven-file-management-3.0.0/debian/patches/series --- maven-file-management-1.2.1/debian/patches/series 2009-07-07 23:41:55.000000000 +0000 +++ maven-file-management-3.0.0/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -mdo_xsd.patch diff -Nru maven-file-management-1.2.1/debian/rules maven-file-management-3.0.0/debian/rules --- maven-file-management-1.2.1/debian/rules 2011-08-22 20:56:33.000000000 +0000 +++ maven-file-management-3.0.0/debian/rules 2017-07-19 15:25:51.000000000 +0000 @@ -1,9 +1,7 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/maven.mk - -JAVA_HOME := /usr/lib/jvm/default-java +%: + dh $@ get-orig-source: - uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename + uscan --download-current-version --force-download --rename diff -Nru maven-file-management-1.2.1/pom.xml maven-file-management-3.0.0/pom.xml --- maven-file-management-1.2.1/pom.xml 2009-01-07 02:07:24.000000000 +0000 +++ maven-file-management-3.0.0/pom.xml 2015-12-25 13:31:25.000000000 +0000 @@ -1,37 +1,39 @@ - + - + + 4.0.0 org.apache.maven.shared maven-shared-components - 10 + 22 + ../../pom/maven/maven-shared-components/pom.xml file-management - 1.2.1 + 3.0.0 - Maven File Management API + Apache Maven File Management API API to collect files from a given directory using several include/exclude rules. @@ -42,45 +44,59 @@ - 2.0.6 + ${mavenVersion} - scm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/file-management-1.2.1 - scm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/file-management-1.2.1 - http://svn.apache.org/viewvc/maven/shared/tags/file-management-1.2.1 + scm:svn:http://svn.apache.org/repos/asf/maven/shared/tags/file-management-3.0.0 + scm:svn:https://svn.apache.org/repos/asf/maven/shared/tags/file-management-3.0.0 + http://svn.apache.org/viewvc/maven/shared/tags/file-management-3.0.0 + + jira + https://issues.apache.org/jira/browse/MSHARED/component/12326425 + + + + apache.website + scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/components/${maven.site.path} + + + + 3.0 + 1.6 + 1.6 + org.apache.maven maven-plugin-api - 2.0.6 + ${mavenVersion} org.apache.maven.shared maven-shared-io - 1.1 + 3.0.0 - - org.codehaus.plexus - plexus-utils - 1.5.6 + org.apache.maven.shared + maven-shared-utils + 3.0.0 + org.codehaus.plexus - plexus-container-default - 1.0-alpha-9 + plexus-utils + 3.0.22 - junit junit - 3.8.2 + 4.11 test @@ -90,7 +106,13 @@ org.codehaus.modello modello-maven-plugin - 1.0-alpha-21 + + true + 1.1.0 + + src/main/mdo/fileset.mdo + + fileset @@ -98,22 +120,25 @@ xpp3-reader xpp3-writer java - xsd - - - src/main/mdo/fileset.mdo - - + + + site-docs + pre-site + + xdoc + - - 1.1.0 - - maven-surefire-plugin - 2.4.3 + org.apache.rat + apache-rat-plugin + + + src/test/resources/test*/**/*.txt + + diff -Nru maven-file-management-1.2.1/src/main/java/org/apache/maven/shared/model/fileset/mappers/FileNameMapper.java maven-file-management-3.0.0/src/main/java/org/apache/maven/shared/model/fileset/mappers/FileNameMapper.java --- maven-file-management-1.2.1/src/main/java/org/apache/maven/shared/model/fileset/mappers/FileNameMapper.java 2008-05-30 14:21:49.000000000 +0000 +++ maven-file-management-3.0.0/src/main/java/org/apache/maven/shared/model/fileset/mappers/FileNameMapper.java 2015-12-25 13:18:36.000000000 +0000 @@ -29,21 +29,21 @@ * via the setFrom and setTo methods. The exact meaning of these is * implementation dependent.

* - * @version $Id: FileNameMapper.java 661727 2008-05-30 14:21:49Z bentmann $ + * @version $Id: FileNameMapper.java 1721672 2015-12-25 13:18:36Z khmarbaise $ */ public interface FileNameMapper { /** * Sets the from part of the transformation rule. * - * @param from + * @param from The source. */ void setFrom( String from ); /** * Sets the to part of the transformation rule. * - * @param to + * @param to The destination. */ void setTo( String to ); diff -Nru maven-file-management-1.2.1/src/main/java/org/apache/maven/shared/model/fileset/mappers/GlobPatternMapper.java maven-file-management-3.0.0/src/main/java/org/apache/maven/shared/model/fileset/mappers/GlobPatternMapper.java --- maven-file-management-1.2.1/src/main/java/org/apache/maven/shared/model/fileset/mappers/GlobPatternMapper.java 2008-05-30 14:21:49.000000000 +0000 +++ maven-file-management-3.0.0/src/main/java/org/apache/maven/shared/model/fileset/mappers/GlobPatternMapper.java 2015-12-23 21:08:39.000000000 +0000 @@ -28,10 +28,10 @@ * character, use regular expressions for more complicated * situations.

* - *

This is one of the more useful Mappers, it is used by javac for + *

This is one of the more useful Mappers, it is used by javac for * example.

* - * @version $Id: GlobPatternMapper.java 661727 2008-05-30 14:21:49Z bentmann $ + * @version $Id: GlobPatternMapper.java 1721579 2015-12-23 21:08:39Z khmarbaise $ */ public class GlobPatternMapper implements FileNameMapper diff -Nru maven-file-management-1.2.1/src/main/java/org/apache/maven/shared/model/fileset/mappers/MapperException.java maven-file-management-3.0.0/src/main/java/org/apache/maven/shared/model/fileset/mappers/MapperException.java --- maven-file-management-1.2.1/src/main/java/org/apache/maven/shared/model/fileset/mappers/MapperException.java 2008-05-30 14:21:49.000000000 +0000 +++ maven-file-management-3.0.0/src/main/java/org/apache/maven/shared/model/fileset/mappers/MapperException.java 2015-12-25 13:18:36.000000000 +0000 @@ -22,7 +22,7 @@ /** * Mapper Exception * - * @version $Id: MapperException.java 661727 2008-05-30 14:21:49Z bentmann $ + * @version $Id: MapperException.java 1721672 2015-12-25 13:18:36Z khmarbaise $ */ public class MapperException extends Exception @@ -32,8 +32,8 @@ /** * Constructor * - * @param message - * @param cause + * @param message The error message + * @param cause The root cause of the problem. */ public MapperException( String message, Throwable cause ) { @@ -43,7 +43,7 @@ /** * Constructor * - * @param message + * @param message The error message. */ public MapperException( String message ) { diff -Nru maven-file-management-1.2.1/src/main/java/org/apache/maven/shared/model/fileset/mappers/MapperUtil.java maven-file-management-3.0.0/src/main/java/org/apache/maven/shared/model/fileset/mappers/MapperUtil.java --- maven-file-management-1.2.1/src/main/java/org/apache/maven/shared/model/fileset/mappers/MapperUtil.java 2008-05-30 14:21:49.000000000 +0000 +++ maven-file-management-3.0.0/src/main/java/org/apache/maven/shared/model/fileset/mappers/MapperUtil.java 2015-12-25 13:18:36.000000000 +0000 @@ -20,7 +20,7 @@ */ import org.apache.maven.shared.model.fileset.Mapper; -import org.codehaus.plexus.util.IOUtil; +import org.apache.maven.shared.utils.io.IOUtil; import java.io.IOException; import java.io.InputStream; @@ -29,11 +29,11 @@ /** * Element to define a FileNameMapper. * - * @version $Id: MapperUtil.java 661727 2008-05-30 14:21:49Z bentmann $ + * @version $Id: MapperUtil.java 1721672 2015-12-25 13:18:36Z khmarbaise $ */ public final class MapperUtil { - private static final String MAPPER_PROPERTIES = "mapper.properties"; + private static final String MAPPER_PROPERTIES = "mappers.properties"; private static Properties implementations; @@ -67,6 +67,7 @@ try { props.load( stream ); + implementations = props; } catch ( IOException e ) { @@ -83,9 +84,9 @@ /** * Returns a fully configured FileNameMapper implementation. * - * @param mapper - * @return - * @throws MapperException + * @param mapper {@link Mapper} + * @return {@link FileNameMapper} + * @throws MapperException in case of an error. */ public static FileNameMapper getFileNameMapper( Mapper mapper ) throws MapperException @@ -116,7 +117,8 @@ try { - FileNameMapper m = (FileNameMapper) Class.forName( classname ).newInstance(); + FileNameMapper m = + (FileNameMapper) Thread.currentThread().getContextClassLoader().loadClass( classname ).newInstance(); m.setFrom( mapper.getFrom() ); m.setTo( mapper.getTo() ); diff -Nru maven-file-management-1.2.1/src/main/java/org/apache/maven/shared/model/fileset/mappers/MergingMapper.java maven-file-management-3.0.0/src/main/java/org/apache/maven/shared/model/fileset/mappers/MergingMapper.java --- maven-file-management-1.2.1/src/main/java/org/apache/maven/shared/model/fileset/mappers/MergingMapper.java 2008-05-30 14:21:49.000000000 +0000 +++ maven-file-management-3.0.0/src/main/java/org/apache/maven/shared/model/fileset/mappers/MergingMapper.java 2015-12-25 13:18:36.000000000 +0000 @@ -24,14 +24,14 @@ * target file name. * *

This is the default FileNameMapper for the archiving tasks and - * uptodate.

+ * up-to-date.

* - * @version $Id: MergingMapper.java 661727 2008-05-30 14:21:49Z bentmann $ + * @version $Id: MergingMapper.java 1721672 2015-12-25 13:18:36Z khmarbaise $ */ public class MergingMapper implements FileNameMapper { - protected String mergedFile = null; + private String mergedFile = null; /** {@inheritDoc} */ public void setFrom( String from ) diff -Nru maven-file-management-1.2.1/src/main/java/org/apache/maven/shared/model/fileset/mappers/PackageNameMapper.java maven-file-management-3.0.0/src/main/java/org/apache/maven/shared/model/fileset/mappers/PackageNameMapper.java --- maven-file-management-1.2.1/src/main/java/org/apache/maven/shared/model/fileset/mappers/PackageNameMapper.java 2008-05-30 14:21:49.000000000 +0000 +++ maven-file-management-3.0.0/src/main/java/org/apache/maven/shared/model/fileset/mappers/PackageNameMapper.java 2015-12-23 21:08:39.000000000 +0000 @@ -23,14 +23,14 @@ /** * Maps directory name matches into a dotted package name. This is - * useful for matching JUnit test cases againt their XML formatter + * useful for matching JUnit test cases against their XML formatter * results. * 
  * <mapper classname="org.apache.tools.ant.util.PackageNameMapper"
  *         from="*Test.java" to="${test.data.dir}/TEST-*Test.xml"/>
  *
* - * @version $Id: PackageNameMapper.java 661727 2008-05-30 14:21:49Z bentmann $ + * @version $Id: PackageNameMapper.java 1721579 2015-12-23 21:08:39Z khmarbaise $ */ public class PackageNameMapper extends GlobPatternMapper diff -Nru maven-file-management-1.2.1/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java maven-file-management-3.0.0/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java --- maven-file-management-1.2.1/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java 2008-09-11 15:46:15.000000000 +0000 +++ maven-file-management-3.0.0/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java 2015-12-25 13:18:36.000000000 +0000 @@ -19,25 +19,10 @@ * under the License. */ -import org.apache.maven.plugin.logging.Log; -import org.apache.maven.shared.io.logging.DefaultMessageHolder; -import org.apache.maven.shared.io.logging.MessageHolder; -import org.apache.maven.shared.io.logging.MessageLevels; -import org.apache.maven.shared.io.logging.MojoLogSink; -import org.apache.maven.shared.io.logging.PlexusLoggerSink; -import org.apache.maven.shared.model.fileset.FileSet; -import org.apache.maven.shared.model.fileset.mappers.FileNameMapper; -import org.apache.maven.shared.model.fileset.mappers.MapperException; -import org.apache.maven.shared.model.fileset.mappers.MapperUtil; -import org.codehaus.plexus.logging.Logger; -import org.codehaus.plexus.util.DirectoryScanner; -import org.codehaus.plexus.util.FileUtils; - import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; import java.util.Collections; import java.util.HashSet; import java.util.Iterator; @@ -47,12 +32,26 @@ import java.util.Map; import java.util.Set; +import org.apache.maven.plugin.logging.Log; +import org.apache.maven.shared.io.logging.DefaultMessageHolder; +import org.apache.maven.shared.io.logging.MessageHolder; +import org.apache.maven.shared.io.logging.MessageLevels; +import org.apache.maven.shared.io.logging.MojoLogSink; +import org.apache.maven.shared.io.logging.PlexusLoggerSink; +import org.apache.maven.shared.model.fileset.FileSet; +import org.apache.maven.shared.model.fileset.mappers.FileNameMapper; +import org.apache.maven.shared.model.fileset.mappers.MapperException; +import org.apache.maven.shared.model.fileset.mappers.MapperUtil; +import org.apache.maven.shared.utils.io.DirectoryScanner; +import org.apache.maven.shared.utils.io.FileUtils; +import org.codehaus.plexus.logging.Logger; + /** * Provides operations for use with FileSet instances, such as retrieving the included/excluded files, deleting all * matching entries, etc. * * @author jdcasey - * @version $Id: FileSetManager.java 694312 2008-09-11 15:46:15Z bentmann $ + * @version $Id: FileSetManager.java 1721672 2015-12-25 13:18:36Z khmarbaise $ */ public class FileSetManager { @@ -76,13 +75,13 @@ { if ( verbose ) { - this.messages = new DefaultMessageHolder( MessageLevels.LEVEL_DEBUG, MessageLevels.LEVEL_INFO, - new MojoLogSink( log ) ); + this.messages = + new DefaultMessageHolder( MessageLevels.LEVEL_DEBUG, MessageLevels.LEVEL_INFO, new MojoLogSink( log ) ); } else { - this.messages = new DefaultMessageHolder( MessageLevels.LEVEL_INFO, MessageLevels.LEVEL_INFO, - new MojoLogSink( log ) ); + this.messages = + new DefaultMessageHolder( MessageLevels.LEVEL_INFO, MessageLevels.LEVEL_INFO, new MojoLogSink( log ) ); } this.verbose = verbose; @@ -95,8 +94,8 @@ */ public FileSetManager( Log log ) { - this.messages = new DefaultMessageHolder( MessageLevels.LEVEL_INFO, MessageLevels.LEVEL_INFO, - new MojoLogSink( log ) ); + this.messages = + new DefaultMessageHolder( MessageLevels.LEVEL_INFO, MessageLevels.LEVEL_INFO, new MojoLogSink( log ) ); this.verbose = false; } @@ -129,8 +128,8 @@ */ public FileSetManager( Logger log ) { - this.messages = new DefaultMessageHolder( MessageLevels.LEVEL_INFO, MessageLevels.LEVEL_INFO, - new PlexusLoggerSink( log ) ); + this.messages = + new DefaultMessageHolder( MessageLevels.LEVEL_INFO, MessageLevels.LEVEL_INFO, new PlexusLoggerSink( log ) ); this.verbose = false; } @@ -147,17 +146,16 @@ // ---------------------------------------------------------------------- /** - * - * @param fileSet + * @param fileSet {@link FileSet} * @return the included files as map * @throws MapperException if any * @see #getIncludedFiles(FileSet) */ - public Map mapIncludedFiles( FileSet fileSet ) + public Map mapIncludedFiles( FileSet fileSet ) throws MapperException { String[] sourcePaths = getIncludedFiles( fileSet ); - Map mappedPaths = new LinkedHashMap(); + Map mappedPaths = new LinkedHashMap(); FileNameMapper fileMapper = MapperUtil.getFileNameMapper( fileSet.getMapper() ); @@ -184,8 +182,7 @@ /** * Get all the filenames which have been included by the rules in this fileset. * - * @param fileSet - * The fileset defining rules for inclusion/exclusion, and base directory. + * @param fileSet The fileset defining rules for inclusion/exclusion, and base directory. * @return the array of matching filenames, relative to the basedir of the file-set. */ public String[] getIncludedFiles( FileSet fileSet ) @@ -203,8 +200,7 @@ /** * Get all the directory names which have been included by the rules in this fileset. * - * @param fileSet - * The fileset defining rules for inclusion/exclusion, and base directory. + * @param fileSet The fileset defining rules for inclusion/exclusion, and base directory. * @return the array of matching dirnames, relative to the basedir of the file-set. */ public String[] getIncludedDirectories( FileSet fileSet ) @@ -222,8 +218,7 @@ /** * Get all the filenames which have been excluded by the rules in this fileset. * - * @param fileSet - * The fileset defining rules for inclusion/exclusion, and base directory. + * @param fileSet The fileset defining rules for inclusion/exclusion, and base directory. * @return the array of non-matching filenames, relative to the basedir of the file-set. */ public String[] getExcludedFiles( FileSet fileSet ) @@ -241,8 +236,7 @@ /** * Get all the directory names which have been excluded by the rules in this fileset. * - * @param fileSet - * The fileset defining rules for inclusion/exclusion, and base directory. + * @param fileSet The fileset defining rules for inclusion/exclusion, and base directory. * @return the array of non-matching dirnames, relative to the basedir of the file-set. */ public String[] getExcludedDirectories( FileSet fileSet ) @@ -274,25 +268,25 @@ * * @param fileSet The file-set matching rules, along with search base directory. * @param throwsError Throw IOException when errors have occurred by deleting files or directories. - * @throws IOException If a matching file cannot be deleted and throwsError=true, otherwise - * print warning messages. + * @throws IOException If a matching file cannot be deleted and throwsError=true, otherwise print + * warning messages. */ public void delete( FileSet fileSet, boolean throwsError ) throws IOException { - Set deletablePaths = findDeletablePaths( fileSet ); + Set deletablePaths = findDeletablePaths( fileSet ); if ( messages != null && messages.isDebugEnabled() ) { - messages - .addDebugMessage( "Found deletable paths: " + String.valueOf( deletablePaths ).replace( ',', '\n' ) ).flush(); + String paths = String.valueOf( deletablePaths ).replace( ',', '\n' ); + messages.addDebugMessage( "Found deletable paths: " + paths ).flush(); } - List warnMessages = new LinkedList(); + List warnMessages = new LinkedList(); - for ( Iterator it = deletablePaths.iterator(); it.hasNext(); ) + for ( Iterator it = deletablePaths.iterator(); it.hasNext(); ) { - String path = (String) it.next(); + String path = it.next(); File file = new File( fileSet.getDirectory(), path ); @@ -306,7 +300,7 @@ { messages.addInfoMessage( "Deleting directory: " + file ).flush(); } - + removeDir( file, fileSet.isFollowSymlinks(), throwsError, warnMessages ); } else @@ -315,7 +309,7 @@ { messages.addInfoMessage( "Deleting symlink to directory: " + file ).flush(); } - + if ( !file.delete() ) { String message = "Unable to delete symlink " + file.getAbsolutePath(); @@ -354,11 +348,9 @@ if ( messages != null && messages.isWarningEnabled() && !throwsError && ( warnMessages.size() > 0 ) ) { - for ( Iterator it = warnMessages.iterator(); it.hasNext(); ) + for ( Iterator it = warnMessages.iterator(); it.hasNext(); ) { - String msg = (String) it.next(); - - messages.addWarningMessage( msg ).flush(); + messages.addWarningMessage( it.next() ).flush(); } } } @@ -382,24 +374,22 @@ } if ( messages != null && messages.isDebugEnabled() ) { - messages.addDebugMessage( - "Checking for symlink:\nFile's canonical path: " - + fileInCanonicalParent.getCanonicalPath() - + "\nFile's absolute path with canonical parent: " - + fileInCanonicalParent.getPath() ).flush(); + messages.addDebugMessage( "Checking for symlink:\nFile's canonical path: " + + fileInCanonicalParent.getCanonicalPath() + "\nFile's absolute path with canonical parent: " + + fileInCanonicalParent.getPath() ).flush(); } return !fileInCanonicalParent.getCanonicalFile().equals( fileInCanonicalParent.getAbsoluteFile() ); } - private Set findDeletablePaths( FileSet fileSet ) + private Set findDeletablePaths( FileSet fileSet ) { - Set includes = findDeletableDirectories( fileSet ); + Set includes = findDeletableDirectories( fileSet ); includes.addAll( findDeletableFiles( fileSet, includes ) ); return includes; } - private Set findDeletableDirectories( FileSet fileSet ) + private Set findDeletableDirectories( FileSet fileSet ) { if ( verbose && messages != null ) { @@ -410,19 +400,19 @@ if ( scanner == null ) { - return Collections.EMPTY_SET; + return Collections.emptySet(); } - Set includes = new HashSet( Arrays.asList( scanner.getIncludedDirectories() ) ); - Collection excludes = new ArrayList( Arrays.asList( scanner.getExcludedDirectories() ) ); - Collection linksForDeletion = new ArrayList(); + Set includes = new HashSet( Arrays.asList( scanner.getIncludedDirectories() ) ); + List excludes = new ArrayList( Arrays.asList( scanner.getExcludedDirectories() ) ); + List linksForDeletion = new ArrayList(); if ( !fileSet.isFollowSymlinks() ) { if ( verbose && messages != null ) { - messages - .addInfoMessage( "Adding symbolic link dirs which were previously excluded to the list being deleted." ).flush(); + messages.addInfoMessage( "Adding symbolic link dirs which were previously excluded" + + " to the list being deleted." ).flush(); } // we need to see which entries were only excluded because they're symlinks... @@ -435,14 +425,15 @@ messages.addDebugMessage( "Marked for preserve (with followSymlinks == false): " + excludes ).flush(); } - List includedDirsAndSymlinks = Arrays.asList( scanner.getIncludedDirectories() ); + List includedDirsAndSymlinks = Arrays.asList( scanner.getIncludedDirectories() ); linksForDeletion.addAll( excludes ); linksForDeletion.retainAll( includedDirsAndSymlinks ); if ( messages != null && messages.isDebugEnabled() ) { - messages.addDebugMessage( "Symlinks marked for deletion (originally mismarked): " + linksForDeletion ).flush(); + messages.addDebugMessage( "Symlinks marked for deletion (originally mismarked): " + + linksForDeletion ).flush(); } excludes.removeAll( includedDirsAndSymlinks ); @@ -455,7 +446,7 @@ return includes; } - private Set findDeletableFiles( FileSet fileSet, Set deletableDirectories ) + private Set findDeletableFiles( FileSet fileSet, Set deletableDirectories ) { if ( verbose && messages != null ) { @@ -469,17 +460,17 @@ return deletableDirectories; } - Set includes = deletableDirectories; + Set includes = deletableDirectories; includes.addAll( Arrays.asList( scanner.getIncludedFiles() ) ); - Collection excludes = new ArrayList( Arrays.asList( scanner.getExcludedFiles() ) ); - Collection linksForDeletion = new ArrayList(); + List excludes = new ArrayList( Arrays.asList( scanner.getExcludedFiles() ) ); + List linksForDeletion = new ArrayList(); if ( !fileSet.isFollowSymlinks() ) { if ( verbose && messages != null ) { - messages - .addInfoMessage( "Adding symbolic link files which were previously excluded to the list being deleted." ).flush(); + messages.addInfoMessage( "Adding symbolic link files which were previously excluded " + + "to the list being deleted." ).flush(); } // we need to see which entries were only excluded because they're symlinks... @@ -492,14 +483,15 @@ messages.addDebugMessage( "Marked for preserve (with followSymlinks == false): " + excludes ).flush(); } - List includedFilesAndSymlinks = Arrays.asList( scanner.getIncludedFiles() ); + List includedFilesAndSymlinks = Arrays.asList( scanner.getIncludedFiles() ); linksForDeletion.addAll( excludes ); linksForDeletion.retainAll( includedFilesAndSymlinks ); if ( messages != null && messages.isDebugEnabled() ) { - messages.addDebugMessage( "Symlinks marked for deletion (originally mismarked): " + linksForDeletion ).flush(); + messages.addDebugMessage( "Symlinks marked for deletion (originally mismarked): " + + linksForDeletion ).flush(); } excludes.removeAll( includedFilesAndSymlinks ); @@ -521,11 +513,11 @@ * @param deletablePaths The relative paths to files/directories which are scheduled for deletion, must not be * null. */ - private void excludeParentDirectoriesOfExcludedPaths( Collection excludedPaths, Set deletablePaths ) + private void excludeParentDirectoriesOfExcludedPaths( List excludedPaths, Set deletablePaths ) { - for ( Iterator it = excludedPaths.iterator(); it.hasNext(); ) + for ( Iterator it = excludedPaths.iterator(); it.hasNext(); ) { - String path = (String) it.next(); + String path = it.next(); String parentPath = new File( path ).getParent(); @@ -574,7 +566,7 @@ * @param warnMessages A list of warning messages used when throwsError=false. * @throws IOException If a matching file cannot be deleted and throwsError=true. */ - private void removeDir( File dir, boolean followSymlinks, boolean throwsError, List warnMessages ) + private void removeDir( File dir, boolean followSymlinks, boolean throwsError, List warnMessages ) throws IOException { String[] list = dir.list(); diff -Nru maven-file-management-1.2.1/src/main/mdo/fileset.mdo maven-file-management-3.0.0/src/main/mdo/fileset.mdo --- maven-file-management-1.2.1/src/main/mdo/fileset.mdo 2008-05-30 14:21:49.000000000 +0000 +++ maven-file-management-3.0.0/src/main/mdo/fileset.mdo 2015-11-27 16:09:51.000000000 +0000 @@ -19,7 +19,8 @@ under the License. --> - + fileset FileSet @@ -45,7 +46,7 @@ followSymlinks 1.0.0+ boolean - false + false Specifies whether symbolic links should be traversed, or handled as-is. @@ -64,7 +65,7 @@ useDefaultExcludes 1.1.0 boolean - true + true Whether to include exclusion patterns for common temporary and SCM control files (true by default). @@ -152,7 +153,7 @@ public String[] getIncludesArray() { String[] includesArry = null; - java.util.Collection includes = getIncludes(); + java.util.List includes = getIncludes(); if ( includes != null && !includes.isEmpty() ) { includesArry = (String[]) includes.toArray( new String[0] ); @@ -171,7 +172,7 @@ public String[] getExcludesArray() { String[] excludesArry = null; - java.util.Collection excludes = getExcludes(); + java.util.List excludes = getExcludes(); if ( excludes != null && !excludes.isEmpty() ) { excludesArry = (String[]) excludes.toArray( new String[0] ); diff -Nru maven-file-management-1.2.1/src/main/resources/mappers.properties maven-file-management-3.0.0/src/main/resources/mappers.properties --- maven-file-management-1.2.1/src/main/resources/mappers.properties 2008-05-30 14:21:49.000000000 +0000 +++ maven-file-management-3.0.0/src/main/resources/mappers.properties 2009-02-04 19:55:31.000000000 +0000 @@ -14,10 +14,10 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -identity=org.apache.maven.plugin.assembly.mappers.IdentityMapper -flatten=org.apache.maven.plugin.assembly.mappers.FlatFileNameMapper -glob=org.apache.maven.plugin.assembly.mappers.GlobPatternMapper -merge=org.apache.maven.plugin.assembly.mappers.MergingMapper -regexp=org.apache.maven.plugin.assembly.mappers.RegexpPatternMapper -package=org.apache.maven.plugin.assembly.mappers.PackageNameMapper -unpackage=org.apache.maven.plugin.assembly.mappers.UnPackageNameMapper +identity=org.apache.maven.shared.model.fileset.mappers.IdentityMapper +flatten=org.apache.maven.shared.model.fileset.mappers.FlatFileNameMapper +glob=org.apache.maven.shared.model.fileset.mappers.GlobPatternMapper +merge=org.apache.maven.shared.model.fileset.mappers.MergingMapper +regexp=org.apache.maven.shared.model.fileset.mappers.RegexpPatternMapper +package=org.apache.maven.shared.model.fileset.mappers.PackageNameMapper +unpackage=org.apache.maven.shared.model.fileset.mappers.UnPackageNameMapper diff -Nru maven-file-management-1.2.1/src/site/apt/examples/mojo.apt maven-file-management-3.0.0/src/site/apt/examples/mojo.apt --- maven-file-management-1.2.1/src/site/apt/examples/mojo.apt 2008-05-30 14:21:49.000000000 +0000 +++ maven-file-management-3.0.0/src/site/apt/examples/mojo.apt 1970-01-01 00:00:00.000000000 +0000 @@ -1,143 +0,0 @@ - ------ - Using Maven File Management API In A MOJO - ------ - Vincent Siveton - ------ - November 2007 - ------ - -~~ 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. - -~~ NOTE: For help with the syntax of this file, see: -~~ http://maven.apache.org/doxia/references/apt-format.html - -Using Maven File Management API In A MOJO - - This part explains how to use the Maven File Management API in a Maven Plugin. - -* Add File Management API dependency - - The first step is to add the File Management API as a Maven dependency, i.e. in the <<>>: - -+-----+ - - ... - - - org.apache.maven.shared - file-management - 1.2 - - ... - - ... - -+-----+ - -* Add FileSet in a MOJO - - The second step is to create your MOJO and add a <<>> object: - -+-----+ -/** - * My MOJO - * - * @goal myGoal - */ -public class MyMojo - extends AbstractMojo -{ - /** - * A list of fileSet rules to select files and directories. - * - * @parameter - */ - private List filesets; - - /** - * A specific fileSet rule to select files and directories. - * - * @parameter - */ - private FileSet fileset; - - ... -} -+-----+ - - To use the <<>> object, you need to instantiate the <<>>. - -+-----+ -FileSetManager fileSetManager = new FileSetManager(); - -String[] includedFiles = fileSetManager.getIncludedFiles( fileset ); -String[] includedDir = fileSetManager.getIncludedDirectories( fileset ); -String[] excludedFiles = fileSetManager.getExcludedFiles( fileset ); -String[] excludedDir = fileSetManager.getExcludedDirectories( fileset ); -fileSetManager.delete( fileset ); -+-----+ - -* Configure your Maven Plugin - - The last step is the Maven Plugin configuration. - -+-----+ - - ... - - - - your-plugin-groupId - your-plugin-artifactId - your-plugin-version - - - - - some/relative/path - - **/*.txt - - - **/log.log - - false - - - - - - some/relative/path - - **/*.txt - - - **/log.log - - false - - - ... - - - ... - - - ... - -+-----+ diff -Nru maven-file-management-1.2.1/src/site/apt/examples/mojo.apt.vm maven-file-management-3.0.0/src/site/apt/examples/mojo.apt.vm --- maven-file-management-1.2.1/src/site/apt/examples/mojo.apt.vm 1970-01-01 00:00:00.000000000 +0000 +++ maven-file-management-3.0.0/src/site/apt/examples/mojo.apt.vm 2015-12-25 13:23:04.000000000 +0000 @@ -0,0 +1,140 @@ + ------ + Using Maven File Management API In A MOJO + ------ + Vincent Siveton + ------ + November 2007 + ------ + +~~ 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. + +~~ NOTE: For help with the syntax of this file, see: +~~ http://maven.apache.org/doxia/references/apt-format.html + +Using Maven File Management API In A MOJO + + This part explains how to use the Maven File Management API in a Maven Plugin. + +* Add File Management API dependency + + The first step is to add the File Management API as a Maven dependency, i.e. in the <<>>: + ++-----+ + + ... + + + org.apache.maven.shared + file-management + ${project.version} + + ... + + ... + ++-----+ + +* Add FileSet in a MOJO + + The second step is to create your MOJO and add a <<>> object: + ++-----+ +/** + * My MOJO + */ +@Mojo( name = "myGoal" ) +public class MyMojo + extends AbstractMojo +{ + /** + * A list of fileSet rules to select files and directories. + */ + @Parameter + private FileSet[] filesets; + + /** + * A specific fileSet rule to select files and directories. + */ + @Parameter + private FileSet fileset; + + ... +} ++-----+ + + To use the <<>> object, you need to instantiate the <<>>. + ++-----+ +FileSetManager fileSetManager = new FileSetManager(); + +String[] includedFiles = fileSetManager.getIncludedFiles( fileset ); +String[] includedDir = fileSetManager.getIncludedDirectories( fileset ); +String[] excludedFiles = fileSetManager.getExcludedFiles( fileset ); +String[] excludedDir = fileSetManager.getExcludedDirectories( fileset ); +fileSetManager.delete( fileset ); ++-----+ + +* Configure your Maven Plugin + + The last step is the Maven Plugin configuration. + ++-----+ + + ... + + + + your-plugin-groupId + your-plugin-artifactId + your-plugin-version + + + + + some/relative/path + + **/*.txt + + + **/log.log + + false + + + + + + some/relative/path + + **/*.txt + + + **/log.log + + false + + + ... + + + ... + + + ... + ++-----+ diff -Nru maven-file-management-1.2.1/src/site/apt/index.apt maven-file-management-3.0.0/src/site/apt/index.apt --- maven-file-management-1.2.1/src/site/apt/index.apt 2008-05-30 14:21:49.000000000 +0000 +++ maven-file-management-3.0.0/src/site/apt/index.apt 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ - ------ - Introduction - ------ - Vincent Siveton - ------ - November 2007 - ------ - -~~ 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. - -~~ NOTE: For help with the syntax of this file, see: -~~ http://maven.apache.org/doxia/references/apt-format.html - -Maven File Management API - - The Maven File Management API provides an API to collect files from a given directory using - several include/exclude rules. - -* Brief History - - This original code is based on the <<>> package from the {{{http://ant.apache.org/}Ant}} - build tool. - -* Examples - - To provide you with better understanding on some usages of this API, - you can take a look into the following examples: - - * {{{examples/mojo.html}Using the API in a Maven Plugin}} - - [] diff -Nru maven-file-management-1.2.1/src/site/apt/index.apt.vm maven-file-management-3.0.0/src/site/apt/index.apt.vm --- maven-file-management-1.2.1/src/site/apt/index.apt.vm 1970-01-01 00:00:00.000000000 +0000 +++ maven-file-management-3.0.0/src/site/apt/index.apt.vm 2013-07-23 21:29:43.000000000 +0000 @@ -0,0 +1,46 @@ + ------ + Introduction + ------ + Vincent Siveton + ------ + 2013-07-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. + +~~ NOTE: For help with the syntax of this file, see: +~~ http://maven.apache.org/doxia/references/apt-format.html + +${project.name} + + The Maven File Management API provides an API to collect files from a given directory using + several include/exclude rules. + +* Brief History + + This original code is based on the <<>> package from the {{{http://ant.apache.org/}Ant}} + build tool. + +* Examples + + To provide you with better understanding on some usages of this API, + you can take a look into the following examples: + + * {{{./examples/mojo.html}Using the API in a Maven Plugin}} + + [] diff -Nru maven-file-management-1.2.1/src/site/resources/download.cgi maven-file-management-3.0.0/src/site/resources/download.cgi --- maven-file-management-1.2.1/src/site/resources/download.cgi 1970-01-01 00:00:00.000000000 +0000 +++ maven-file-management-3.0.0/src/site/resources/download.cgi 2014-05-18 14:26:56.000000000 +0000 @@ -0,0 +1,22 @@ +#!/bin/sh +# +# 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. +# +# Just call the standard mirrors.cgi script. It will use download.html +# as the input template. +exec /www/www.apache.org/dyn/mirrors/mirrors.cgi $* \ No newline at end of file diff -Nru maven-file-management-1.2.1/src/site/site.xml maven-file-management-3.0.0/src/site/site.xml --- maven-file-management-1.2.1/src/site/site.xml 2008-05-30 14:21:49.000000000 +0000 +++ maven-file-management-3.0.0/src/site/site.xml 2014-05-14 19:20:21.000000000 +0000 @@ -19,10 +19,20 @@ under the License. --> - + + + + + + + + + + + diff -Nru maven-file-management-1.2.1/src/site/xdoc/download.xml.vm maven-file-management-3.0.0/src/site/xdoc/download.xml.vm --- maven-file-management-1.2.1/src/site/xdoc/download.xml.vm 1970-01-01 00:00:00.000000000 +0000 +++ maven-file-management-3.0.0/src/site/xdoc/download.xml.vm 2015-06-19 23:25:50.000000000 +0000 @@ -0,0 +1,126 @@ + + + + + + + Download ${project.name} Source + + +
+ +

${project.name} ${project.version} is distributed in source format. Use a source archive if you intend to build + ${project.name} yourself. Otherwise, simply use the ready-made binary artifacts from central repository.

+ +

You will be prompted for a mirror - if the file is not found on yours, please be patient, as it may take 24 + hours to reach all mirrors.

+ +

In order to guard against corrupted downloads/installations, it is highly recommended to + verify the signature + of the release bundles against the public KEYS used by the Apache Maven + developers.

+ +

${project.name} is distributed under the Apache License, version 2.0.

+ +

We strongly encourage our users to configure a Maven repository mirror closer to their location, please read How to Use Mirrors for Repositories.

+ + + + +

+ [if-any logo] + + logo + + [end] + The currently selected mirror is + [preferred]. + If you encounter a problem with this mirror, + please select another mirror. + If all mirrors are failing, there are + backup + mirrors + (at the end of the mirrors list) that should be available. +

+ +
+ Other mirrors: + + +
+ +

+ You may also consult the + complete list of + mirrors. +

+ + + + + +

This is the current stable version of ${project.name}.

+ + + + + + + + + + + + + + + + + + +
LinkChecksumSignature
${project.name} ${project.version} (Source zip)maven/shared/${project.artifactId}-${project.version}-source-release.zipmaven/shared/${project.artifactId}-${project.version}-source-release.zip.md5maven/shared/${project.artifactId}-${project.version}-source-release.zip.asc
+ + + + +

Older non-recommended releases can be found on our archive site.

+ + +
+ + + diff -Nru maven-file-management-1.2.1/src/test/java/org/apache/maven/shared/model/fileset/mappers/MapperUtilTest.java maven-file-management-3.0.0/src/test/java/org/apache/maven/shared/model/fileset/mappers/MapperUtilTest.java --- maven-file-management-1.2.1/src/test/java/org/apache/maven/shared/model/fileset/mappers/MapperUtilTest.java 1970-01-01 00:00:00.000000000 +0000 +++ maven-file-management-3.0.0/src/test/java/org/apache/maven/shared/model/fileset/mappers/MapperUtilTest.java 2015-11-27 16:09:51.000000000 +0000 @@ -0,0 +1,103 @@ +package org.apache.maven.shared.model.fileset.mappers; + +/* + * 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 static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.fail; + +import org.apache.maven.shared.model.fileset.Mapper; +import org.junit.Test; + +/** + * A test-case for the MapperUtil. + * + * @version $Id: MapperUtilTest.java 1716893 2015-11-27 16:09:51Z khmarbaise $ + */ +public class MapperUtilTest +{ + + @Test + public void getFileNameMapperShouldReturnNull() + throws MapperException + { + assertNull( MapperUtil.getFileNameMapper( null ) ); + } + + @Test + public void getFileNameMapperShouldReturnIdentityMapper() + throws MapperException + { + Mapper mapper = new Mapper(); + FileNameMapper fileNameMapper = MapperUtil.getFileNameMapper( mapper ); + assertNotNull( fileNameMapper ); + assertEquals( "/var/some-file.text", fileNameMapper.mapFileName( "/var/some-file.text" ) ); + } + + @Test + public void getFileNameMapperShouldFileNameMapperType() + throws MapperException + { + // check with FileNameMapper type + Mapper mapper = new Mapper(); + mapper.setType( "glob" ); + mapper.setFrom( "*.java" ); + mapper.setTo( "*.class" ); + FileNameMapper fileNameMapper = MapperUtil.getFileNameMapper( mapper ); + assertNotNull( fileNameMapper ); + assertEquals( "/var/SomeClasses.class", fileNameMapper.mapFileName( "/var/SomeClasses.java" ) ); + } + + @Test + public void testGetFileNameMapper() throws MapperException + { + Mapper mapper = null; + try + { + assertNull( MapperUtil.getFileNameMapper( mapper ) ); + } + catch ( MapperException e ) + { + fail( "Unexpected exception " + e ); + } + mapper = new Mapper(); + try + { + // default to identity mapper. + FileNameMapper fileNameMapper = MapperUtil.getFileNameMapper( mapper ); + assertNotNull( fileNameMapper ); + assertEquals( "/var/some-file.text", fileNameMapper.mapFileName( "/var/some-file.text" ) ); + } + catch ( MapperException e ) + { + fail( "Unexpected exception " + e ); + } + // check with FileNameMapper type + mapper = new Mapper(); + mapper.setType( "glob" ); + mapper.setFrom( "*.java" ); + mapper.setTo( "*.class" ); + + FileNameMapper fileNameMapper = MapperUtil.getFileNameMapper( mapper ); + assertNotNull( fileNameMapper ); + assertEquals( "/var/SomeClasses.class", fileNameMapper.mapFileName( "/var/SomeClasses.java" ) ); + } +} diff -Nru maven-file-management-1.2.1/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java maven-file-management-3.0.0/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java --- maven-file-management-1.2.1/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java 2008-09-11 15:56:47.000000000 +0000 +++ maven-file-management-3.0.0/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java 2015-11-27 16:09:51.000000000 +0000 @@ -27,40 +27,39 @@ import java.util.Iterator; import java.util.Set; -import junit.framework.Assert; -import junit.framework.TestCase; - import org.apache.maven.shared.model.fileset.FileSet; -import org.codehaus.plexus.util.FileUtils; -import org.codehaus.plexus.util.cli.CommandLineException; -import org.codehaus.plexus.util.cli.Commandline; +import org.apache.maven.shared.utils.cli.CommandLineException; +import org.apache.maven.shared.utils.cli.Commandline; +import org.apache.maven.shared.utils.io.FileUtils; + +import junit.framework.TestCase; /** * Test the FileSet * - * @version $Id: FileSetUtilsTest.java 694321 2008-09-11 15:56:47Z bentmann $ + * @version $Id: FileSetUtilsTest.java 1716893 2015-11-27 16:09:51Z khmarbaise $ */ public class FileSetUtilsTest extends TestCase { - private Set testDirectories = new HashSet(); + private Set testDirectories = new HashSet(); - private Set linkFiles = new HashSet(); + private Set linkFiles = new HashSet(); /** {@inheritDoc} */ public void tearDown() throws IOException { - for ( Iterator it = linkFiles.iterator(); it.hasNext(); ) + for ( Iterator it = linkFiles.iterator(); it.hasNext(); ) { - File linkFile = (File) it.next(); + File linkFile = it.next(); linkFile.delete(); } - for ( Iterator it = testDirectories.iterator(); it.hasNext(); ) + for ( Iterator it = testDirectories.iterator(); it.hasNext(); ) { - File dir = (File) it.next(); + File dir = it.next(); FileUtils.deleteDirectory( dir ); } @@ -82,13 +81,13 @@ String[] included = fileSetManager.getIncludedFiles( set ); - Assert.assertEquals( 1, included.length ); + assertEquals( 1, included.length ); } /** * @throws IOException if any * @throws InterruptedException if any - * @throws CommandLineException if any + * @throws org.apache.maven.shared.utils.cli.CommandLineException if any */ public void testIncludesDontFollowSymlinks() throws IOException, InterruptedException, CommandLineException @@ -112,7 +111,7 @@ String[] included = fileSetManager.getIncludedFiles( set ); - Assert.assertEquals( 1, included.length ); + assertEquals( 1, included.length ); } /** @@ -143,7 +142,7 @@ fileSetManager.delete( set ); - Assert.assertFalse( subdir.exists() ); + assertFalse( subdir.exists() ); } /** @@ -164,7 +163,7 @@ fileSetManager.delete( set ); - Assert.assertFalse( "file in marked subdirectory still exists.", subdirFile.exists() ); + assertFalse( "file in marked subdirectory still exists.", subdirFile.exists() ); } /** @@ -192,7 +191,7 @@ fileSetManager.delete( set ); - Assert.assertFalse( "directory still exists", directory.exists() ); + assertFalse( "directory still exists", directory.exists() ); } /** @@ -212,7 +211,7 @@ fileSetManager.delete( set ); - Assert.assertTrue( "excluded file has been deleted", new File( directory, "excluded.txt" ).exists() ); + assertTrue( "excluded file has been deleted", new File( directory, "excluded.txt" ).exists() ); } /** @@ -232,7 +231,7 @@ fileSetManager.delete( set ); - Assert.assertTrue( "excluded directory has been deleted", new File( directory, "excluded" ).exists() ); + assertTrue( "excluded directory has been deleted", new File( directory, "excluded" ).exists() ); } /** @@ -252,9 +251,9 @@ fileSetManager.delete( set ); - Assert.assertTrue( "excluded file has been deleted", new File( directory, "excluded.txt" ).exists() ); - Assert.assertTrue( "excluded directory has been deleted", new File( directory, "excluded" ).exists() ); - Assert.assertFalse( "included file has not been deleted", new File( directory, "included.txt" ).exists() ); + assertTrue( "excluded file has been deleted", new File( directory, "excluded.txt" ).exists() ); + assertTrue( "excluded directory has been deleted", new File( directory, "excluded" ).exists() ); + assertFalse( "included file has not been deleted", new File( directory, "included.txt" ).exists() ); } /** @@ -274,9 +273,9 @@ fileSetManager.delete( set ); - Assert.assertTrue( "excluded file has been deleted", new File( directory, "excluded.txt" ).exists() ); - Assert.assertTrue( "excluded directory has been deleted", new File( directory, "excluded" ).exists() ); - Assert.assertFalse( "included file has not been deleted", new File( directory, "included.txt" ).exists() ); + assertTrue( "excluded file has been deleted", new File( directory, "excluded.txt" ).exists() ); + assertTrue( "excluded directory has been deleted", new File( directory, "excluded" ).exists() ); + assertFalse( "included file has not been deleted", new File( directory, "included.txt" ).exists() ); } /** @@ -301,12 +300,12 @@ fileSetManager.delete( set ); - Assert.assertTrue( "excluded file has been deleted", new File( directory, "excluded.txt" ).exists() ); - Assert.assertTrue( "excluded directory has been deleted", new File( directory, "excluded" ).exists() ); - Assert.assertFalse( "included dirlink has not been deleted", new File( directory, "dirlink" ).exists() ); - Assert.assertFalse( "included filelink has not been deleted", new File( directory, "filelink" ).exists() ); - Assert.assertFalse( "included directory has not been deleted", new File( directory, "dir0" ).exists() ); - Assert.assertFalse( "included directory has not been deleted", new File( directory, "dir1" ).exists() ); + assertTrue( "excluded file has been deleted", new File( directory, "excluded.txt" ).exists() ); + assertTrue( "excluded directory has been deleted", new File( directory, "excluded" ).exists() ); + assertFalse( "included dirlink has not been deleted", new File( directory, "dirlink" ).exists() ); + assertFalse( "included filelink has not been deleted", new File( directory, "filelink" ).exists() ); + assertFalse( "included directory has not been deleted", new File( directory, "dir0" ).exists() ); + assertFalse( "included directory has not been deleted", new File( directory, "dir1" ).exists() ); } /** @@ -345,13 +344,11 @@ private File setupTestDirectory( String directoryName ) throws IOException { - System.out.println( "Setting up directory for test: " + directoryName ); - URL sourceResource = getClass().getClassLoader().getResource( directoryName ); if ( sourceResource == null ) { - Assert.fail( "Source directory for test: " + directoryName + " cannot be found." ); + fail( "Source directory for test: " + directoryName + " cannot be found." ); } File sourceDir = new File( URLDecoder.decode( sourceResource.getPath(), "UTF-8" ) );