From 2ee29d169fae2d49dec6f730d9bfc09054b3767c Mon Sep 17 00:00:00 2001 From: Robert Scholte Date: Fri, 3 Aug 2018 10:04:31 +0200 Subject: [PATCH 01/24] [MASSEMBLY-893] Typo in FAQ --- src/site/fml/faq.fml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/site/fml/faq.fml b/src/site/fml/faq.fml index cdf39f755..cc9cad29c 100644 --- a/src/site/fml/faq.fml +++ b/src/site/fml/faq.fml @@ -99,7 +99,7 @@ under the License. to be adjusted or have the files they reference moved into the new child module alongside the descriptor itself.

In cases where you absolutely must use module-binaries references, you should create an assembly-child POM mentioned above, then insert - <useAllReactorProjects>true<useAllReactorProjects> to each of your moduleSet sections. Then, bind the assembly + <useAllReactorProjects>true</useAllReactorProjects> to each of your moduleSet sections. Then, bind the assembly in your assembly-child POM (normally to the package phase) using the single goal. When you execute the build from the top-level POM, Maven should generated your assembly in the new child project.

From 0d232afa0adb6db94663a5bd7e6cb9726204809a Mon Sep 17 00:00:00 2001 From: Andrey Turbanov Date: Sat, 25 Aug 2018 19:03:45 +0300 Subject: [PATCH 02/24] collapse identical catch blocks --- .../archive/DefaultAssemblyArchiver.java | 26 +++---------------- .../archive/ManifestCreationFinalizer.java | 6 +---- .../archive/phase/FileItemAssemblyPhase.java | 6 +---- .../assembly/io/DefaultAssemblyReader.java | 14 ++-------- .../assembly/mojos/AbstractAssemblyMojo.java | 6 +---- .../archive/DefaultAssemblyArchiverTest.java | 6 +---- 6 files changed, 10 insertions(+), 54 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiver.java b/src/main/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiver.java index e54fc01b8..9cc75e152 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiver.java +++ b/src/main/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiver.java @@ -183,12 +183,7 @@ public File createArchive( final Assembly assembly, final String fullName, final archiver.createArchive(); } - catch ( final ArchiverException e ) - { - throw new ArchiveCreationException( - "Error creating assembly archive " + assembly.getId() + ": " + e.getMessage(), e ); - } - catch ( final IOException e ) + catch ( final ArchiverException | IOException e ) { throw new ArchiveCreationException( "Error creating assembly archive " + assembly.getId() + ": " + e.getMessage(), e ); @@ -385,12 +380,7 @@ private void configureArchiver( final Archiver archiver, final AssemblerConfigur { config = Xpp3DomBuilder.build( new StringReader( configSource.getArchiverConfig() ) ); } - catch ( final XmlPullParserException e ) - { - throw new ArchiverException( "Failed to parse archiver configuration for: " + archiver.getClass().getName(), - e ); - } - catch ( final IOException e ) + catch ( final XmlPullParserException | IOException e ) { throw new ArchiverException( "Failed to parse archiver configuration for: " + archiver.getClass().getName(), e ); @@ -443,11 +433,7 @@ private void configureComponent( final Object component, final Xpp3Dom config, configureComponent.invoke( configurator, component, configuration, expressionEvaluator, containerRealm[0], listener ); } - catch ( final NoSuchMethodException e ) - { - throw new RuntimeException( e ); - } - catch ( final IllegalAccessException e ) + catch ( final NoSuchMethodException | IllegalAccessException e ) { throw new RuntimeException( e ); } @@ -472,11 +458,7 @@ private Object[] getContainerRealm() final Method getContainerRealm = container.getClass().getMethod( "getContainerRealm" ); return new Object[]{ getContainerRealm.invoke( container ), getContainerRealm.getReturnType() }; } - catch ( final NoSuchMethodException e ) - { - throw new RuntimeException( e ); - } - catch ( final IllegalAccessException e ) + catch ( final NoSuchMethodException | IllegalAccessException e ) { throw new RuntimeException( e ); } diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/ManifestCreationFinalizer.java b/src/main/java/org/apache/maven/plugins/assembly/archive/ManifestCreationFinalizer.java index 4ed1d3e61..35229818c 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/archive/ManifestCreationFinalizer.java +++ b/src/main/java/org/apache/maven/plugins/assembly/archive/ManifestCreationFinalizer.java @@ -136,11 +136,7 @@ public List getVirtualFiles() return Collections.singletonList( "META-INF/MANIFEST.MF" ); } } - catch ( final ManifestException ignore ) - { - // noop - } - catch ( final DependencyResolutionRequiredException ignore ) + catch ( final ManifestException | DependencyResolutionRequiredException ignore ) { // noop } diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhase.java b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhase.java index 799f39fde..67701a4ed 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhase.java +++ b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhase.java @@ -122,11 +122,7 @@ else if ( outputDirectory.length() < 1 ) int mode = TypeConversionUtils.modeToInt( fileItem.getFileMode(), getLogger() ); archiver.addResource( restoUse, target, mode ); } - catch ( final ArchiverException e ) - { - throw new ArchiveCreationException( "Error adding file to archive: " + e.getMessage(), e ); - } - catch ( IOException e ) + catch ( final ArchiverException | IOException e ) { throw new ArchiveCreationException( "Error adding file to archive: " + e.getMessage(), e ); } diff --git a/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java b/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java index 2dfd47a9f..7ef826e10 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java +++ b/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java @@ -360,12 +360,7 @@ public Assembly readAssembly( Reader reader, final String locationDescription, f reader.close(); reader = null; } - catch ( final IOException e ) - { - throw new AssemblyReadException( "Error reading descriptor: " + locationDescription + ": " + e.getMessage(), - e ); - } - catch ( final XmlPullParserException e ) + catch ( final IOException | XmlPullParserException e ) { throw new AssemblyReadException( "Error reading descriptor: " + locationDescription + ": " + e.getMessage(), e ); @@ -454,12 +449,7 @@ protected void mergeComponentsWithMainAssembly( final Assembly assembly, final F reader = new InputStreamReader( resolvedLocation.getInputStream() ); component = new ComponentXpp3Reader( transformer ).read( reader ); } - catch ( final IOException e ) - { - throw new AssemblyReadException( "Error reading component descriptor: " + location + " (resolved to: " - + resolvedLocation.getSpecification() + ")", e ); - } - catch ( final XmlPullParserException e ) + catch ( final IOException | XmlPullParserException e ) { throw new AssemblyReadException( "Error reading component descriptor: " + location + " (resolved to: " + resolvedLocation.getSpecification() + ")", e ); diff --git a/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java b/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java index c6a00ffff..d74da756c 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java +++ b/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java @@ -527,11 +527,7 @@ else if ( attach ) } } } - catch ( final ArchiveCreationException e ) - { - throw new MojoExecutionException( "Failed to create assembly: " + e.getMessage(), e ); - } - catch ( final AssemblyFormattingException e ) + catch ( final ArchiveCreationException | AssemblyFormattingException e ) { throw new MojoExecutionException( "Failed to create assembly: " + e.getMessage(), e ); } diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiverTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiverTest.java index b404ab3b6..dbb6cf461 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiverTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiverTest.java @@ -166,11 +166,7 @@ public void testCreateArchive() { macMgr.archiver.createArchive(); } - catch ( final ArchiverException e ) - { - fail( "Should never happen" ); - } - catch ( final IOException e ) + catch ( final ArchiverException | IOException e ) { fail( "Should never happen" ); } From 3076fd3adfecd7502f31e08aa4b7f4894b184426 Mon Sep 17 00:00:00 2001 From: Andrey Turbanov Date: Sat, 25 Aug 2018 19:10:03 +0300 Subject: [PATCH 03/24] Use diamond operator from java 7 --- .../archive/DefaultAssemblyArchiver.java | 12 +- .../archiver/AssemblyProxyArchiver.java | 8 +- .../archive/phase/ModuleSetAssemblyPhase.java | 14 +- .../phase/wrappers/RepoInfoWrapper.java | 2 +- .../archive/task/AddDependencySetsTask.java | 4 +- .../archive/task/AddDirectoryTask.java | 4 +- .../archive/task/AddFileSetsTask.java | 2 +- .../artifact/DefaultDependencyResolver.java | 4 +- .../artifact/ResolutionManagementInfo.java | 2 +- .../AbstractLineAggregatingHandler.java | 6 +- .../ComponentsXmlArchiverFileFilter.java | 2 +- .../SimpleAggregatingDescriptorHandler.java | 2 +- .../assembly/format/ReaderFormatter.java | 2 +- .../interpolation/AssemblyInterpolator.java | 6 +- .../assembly/io/DefaultAssemblyReader.java | 8 +- .../DefaultRepositoryAssembler.java | 544 +++++++++--------- .../assembly/utils/AssemblyFormatUtils.java | 2 +- .../plugins/assembly/utils/FilterUtils.java | 8 +- .../utils/InterpolationConstants.java | 4 +- .../plugins/assembly/utils/ProjectUtils.java | 6 +- .../archiver/AssemblyProxyArchiverTest.java | 4 +- .../AssemblyArchiverPhaseComparatorTest.java | 2 +- .../phase/ModuleSetAssemblyPhaseTest.java | 18 +- .../task/AddDependencySetsTaskTest.java | 4 +- .../ResolutionManagementInfoTest.java | 4 +- .../ComponentsXmlArchiverFileFilterTest.java | 10 +- .../io/DefaultAssemblyReaderTest.java | 8 +- .../assembly/testutils/TestFileManager.java | 2 +- .../assembly/utils/FilterUtilsTest.java | 8 +- .../assembly/utils/ProjectUtilsTest.java | 16 +- .../utils/TypeConversionUtilsTest.java | 4 +- 31 files changed, 361 insertions(+), 361 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiver.java b/src/main/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiver.java index 9cc75e152..f90292861 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiver.java +++ b/src/main/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiver.java @@ -123,7 +123,7 @@ protected DefaultAssemblyArchiver( final ArchiverManager archiverManager, private List sortedPhases() { - List sorted = new ArrayList( assemblyPhases ); + List sorted = new ArrayList<>( assemblyPhases ); Collections.sort( sorted, new AssemblyArchiverPhaseComparator() ); return sorted; } @@ -225,11 +225,11 @@ private List selectContainerDescriptorHandlers( if ( requestedContainerDescriptorHandlers == null ) { - requestedContainerDescriptorHandlers = new ArrayList(); + requestedContainerDescriptorHandlers = new ArrayList<>(); } - final List handlers = new ArrayList(); - final List hints = new ArrayList(); + final List handlers = new ArrayList<>(); + final List hints = new ArrayList<>(); if ( !requestedContainerDescriptorHandlers.isEmpty() ) { @@ -306,8 +306,8 @@ else if ( "war".equals( format ) ) ( (AbstractZipArchiver) archiver ).setRecompressAddedZips( recompressZippedFiles ); } - final List extraSelectors = new ArrayList(); - final List extraFinalizers = new ArrayList(); + final List extraSelectors = new ArrayList<>(); + final List extraFinalizers = new ArrayList<>(); if ( archiver instanceof JarArchiver ) { if ( mergeManifestMode != null ) diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java index 329b7b43f..2f6c805e0 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java +++ b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java @@ -64,7 +64,7 @@ public class AssemblyProxyArchiver private final Archiver delegate; - private final ThreadLocal inPublicApi = new ThreadLocal(); + private final ThreadLocal inPublicApi = new ThreadLocal<>(); private final Logger logger; @@ -98,7 +98,7 @@ public AssemblyProxyArchiver( final String rootPrefix, final Archiver delegate, this.rootPrefix += "/"; } - final List selectors = new ArrayList(); + final List selectors = new ArrayList<>(); FinalizerEnabled finalizer = ( delegate instanceof FinalizerEnabled ) ? (FinalizerEnabled) delegate : null; @@ -734,7 +734,7 @@ private void doAddFileSet( final FileSet fs ) } else if ( assemblyWorkPath.startsWith( fsPath ) ) { - final List newEx = new ArrayList(); + final List newEx = new ArrayList<>(); if ( fs.getExcludes() != null ) { newEx.addAll( Arrays.asList( fs.getExcludes() ) ); @@ -748,7 +748,7 @@ else if ( assemblyWorkPath.startsWith( fsPath ) ) newEx.add( workDirExclude ); - final List newIn = new ArrayList(); + final List newIn = new ArrayList<>(); if ( fs.getIncludes() != null ) { for ( final String include : fs.getIncludes() ) diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhase.java b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhase.java index 92e7b8138..ed778b3ca 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhase.java +++ b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhase.java @@ -149,7 +149,7 @@ public static Set getModuleProjects( final ModuleSet moduleSet, { if ( !moduleSet.isIncludeSubModules() ) { - moduleProjects = new LinkedHashSet( configSource.getReactorProjects() ); + moduleProjects = new LinkedHashSet<>( configSource.getReactorProjects() ); } project = configSource.getReactorProjects().get( 0 ); @@ -254,13 +254,13 @@ void addModuleBinaries( final Assembly assembly, ModuleSet moduleSet, final Modu return; } - final Set moduleProjects = new LinkedHashSet(); + final Set moduleProjects = new LinkedHashSet<>(); MavenProjects.select( projects, "pom", log( getLogger() ), addTo( moduleProjects ) ); final String classifier = binaries.getAttachmentClassifier(); - final Map chosenModuleArtifacts = new HashMap(); + final Map chosenModuleArtifacts = new HashMap<>(); for ( final MavenProject project : moduleProjects ) { @@ -347,7 +347,7 @@ void addModuleBinaries( final Assembly assembly, ModuleSet moduleSet, final Modu private List validateModuleVersions( Set moduleProjects ) { - List result = new ArrayList(); + List result = new ArrayList<>(); if ( moduleProjects != null && !moduleProjects.isEmpty() ) { @@ -416,7 +416,7 @@ void addModuleSourceFileSets( final ModuleSources sources, final Set fileSets = new ArrayList(); + final List fileSets = new ArrayList<>(); if ( isDeprecatedModuleSourcesConfigPresent( sources ) ) { @@ -445,7 +445,7 @@ void addModuleSourceFileSets( final ModuleSources sources, final Set moduleFileSets = new ArrayList(); + final List moduleFileSets = new ArrayList<>(); for ( final FileSet fileSet : fileSets ) { @@ -514,7 +514,7 @@ FileSet createFileSet( @Nonnull final FileSet fileSet, @Nonnull final ModuleSour fs.setDirectory( sourcePath ); fs.setDirectoryMode( fileSet.getDirectoryMode() ); - final List excludes = new ArrayList(); + final List excludes = new ArrayList<>(); final List originalExcludes = fileSet.getExcludes(); if ( ( originalExcludes != null ) && !originalExcludes.isEmpty() ) diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/RepoInfoWrapper.java b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/RepoInfoWrapper.java index 9a0fa8e4a..f606f7bda 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/RepoInfoWrapper.java +++ b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/RepoInfoWrapper.java @@ -65,7 +65,7 @@ public List getGroupVersionAlignments() if ( convertedAlignments == null || alignments.size() != convertedAlignments.size() ) { - final List l = new ArrayList( alignments.size() ); + final List l = new ArrayList<>( alignments.size() ); for ( final org.apache.maven.plugins.assembly.model.GroupVersionAlignment alignment : alignments ) { diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTask.java b/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTask.java index 959c1e1d4..3f180357f 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTask.java +++ b/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTask.java @@ -64,7 +64,7 @@ public class AddDependencySetsTask static { - final List nonArch = new ArrayList(); + final List nonArch = new ArrayList<>(); nonArch.add( "pom" ); @@ -283,7 +283,7 @@ private MavenProject buildProjectStub( final Artifact depArtifact ) Set resolveDependencyArtifacts( final DependencySet dependencySet ) throws InvalidAssemblerConfigurationException { - final Set dependencyArtifacts = new LinkedHashSet(); + final Set dependencyArtifacts = new LinkedHashSet<>(); if ( resolvedArtifacts != null ) { dependencyArtifacts.addAll( resolvedArtifacts ); diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDirectoryTask.java b/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDirectoryTask.java index 2664ae166..749fd424c 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDirectoryTask.java +++ b/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDirectoryTask.java @@ -103,11 +103,11 @@ else if ( "..".equals( outputDirectory ) ) List directoryExcludes; if ( excludes != null && !excludes.isEmpty() ) { - directoryExcludes = new ArrayList( excludes ); + directoryExcludes = new ArrayList<>( excludes ); } else { - directoryExcludes = new ArrayList(); + directoryExcludes = new ArrayList<>(); } try diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java b/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java index 1b855fa52..7ea776ead 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java +++ b/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java @@ -58,7 +58,7 @@ public AddFileSetsTask( final List fileSets ) public AddFileSetsTask( final FileSet... fileSets ) { - this.fileSets = new ArrayList( Arrays.asList( fileSets ) ); + this.fileSets = new ArrayList<>( Arrays.asList( fileSets ) ); } public void execute( final Archiver archiver, final AssemblerConfigurationSource configSource ) diff --git a/src/main/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolver.java b/src/main/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolver.java index 81a98cbd5..7d224dc9c 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolver.java +++ b/src/main/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolver.java @@ -57,7 +57,7 @@ public Map> resolveDependencySets( final Assembly a List dependencySets ) throws DependencyResolutionException { - Map> result = new LinkedHashMap>(); + Map> result = new LinkedHashMap<>(); for ( DependencySet dependencySet : dependencySets ) { @@ -80,7 +80,7 @@ public Map> resolveDependencySets( final Assembly a List dependencySets ) throws DependencyResolutionException { - Map> result = new LinkedHashMap>(); + Map> result = new LinkedHashMap<>(); for ( DependencySet dependencySet : dependencySets ) { diff --git a/src/main/java/org/apache/maven/plugins/assembly/artifact/ResolutionManagementInfo.java b/src/main/java/org/apache/maven/plugins/assembly/artifact/ResolutionManagementInfo.java index 59904a49c..a66c4ac82 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/artifact/ResolutionManagementInfo.java +++ b/src/main/java/org/apache/maven/plugins/assembly/artifact/ResolutionManagementInfo.java @@ -32,7 +32,7 @@ */ class ResolutionManagementInfo { - private final LinkedHashSet artifacts = new LinkedHashSet(); + private final LinkedHashSet artifacts = new LinkedHashSet<>(); Set getArtifacts() { diff --git a/src/main/java/org/apache/maven/plugins/assembly/filter/AbstractLineAggregatingHandler.java b/src/main/java/org/apache/maven/plugins/assembly/filter/AbstractLineAggregatingHandler.java index 20663ed4e..49a16b9ee 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/filter/AbstractLineAggregatingHandler.java +++ b/src/main/java/org/apache/maven/plugins/assembly/filter/AbstractLineAggregatingHandler.java @@ -44,7 +44,7 @@ abstract class AbstractLineAggregatingHandler implements ContainerDescriptorHandler { - private Map> catalog = new HashMap>(); + private Map> catalog = new HashMap<>(); private boolean excludeOverride = false; @@ -121,7 +121,7 @@ public void finalizeArchiveExtraction( final UnArchiver unArchiver ) @Override public List getVirtualFiles() { - return new ArrayList( catalog.keySet() ); + return new ArrayList<>( catalog.keySet() ); } @Override @@ -142,7 +142,7 @@ public boolean isSelected( @Nonnull final FileInfo fileInfo ) List lines = catalog.get( name ); if ( lines == null ) { - lines = new ArrayList(); + lines = new ArrayList<>(); catalog.put( name, lines ); } diff --git a/src/main/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilter.java b/src/main/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilter.java index cc627c5b7..75031ba3a 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilter.java +++ b/src/main/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilter.java @@ -83,7 +83,7 @@ void addComponentsXml( final Reader componentsReader ) { if ( components == null ) { - components = new LinkedHashMap(); + components = new LinkedHashMap<>(); } final String role = component.getChild( "role" ).getValue(); diff --git a/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java b/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java index cf34995f3..0c6c9a3d3 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java +++ b/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java @@ -59,7 +59,7 @@ public class SimpleAggregatingDescriptorHandler private final StringWriter aggregateWriter = new StringWriter(); - private final List filenames = new ArrayList(); + private final List filenames = new ArrayList<>(); // calculated, temporary values. diff --git a/src/main/java/org/apache/maven/plugins/assembly/format/ReaderFormatter.java b/src/main/java/org/apache/maven/plugins/assembly/format/ReaderFormatter.java index 960cd6994..4120b8bb7 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/format/ReaderFormatter.java +++ b/src/main/java/org/apache/maven/plugins/assembly/format/ReaderFormatter.java @@ -59,7 +59,7 @@ private static Reader createReaderFilter( @Nonnull Reader source, String escapeS // if these are NOT set, just use the defaults, which are '${*}' and '@'. if ( delimiters != null && !delimiters.isEmpty() ) { - LinkedHashSet delims = new LinkedHashSet(); + LinkedHashSet delims = new LinkedHashSet<>(); for ( String delim : delimiters ) { if ( delim == null ) diff --git a/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolator.java b/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolator.java index fe55eaa2f..536cafb3b 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolator.java +++ b/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolator.java @@ -47,7 +47,7 @@ public class AssemblyInterpolator static { - final Set blacklist = new HashSet(); + final Set blacklist = new HashSet<>(); blacklist.add( "outputFileNameMapping" ); blacklist.add( "outputDirectoryMapping" ); @@ -65,7 +65,7 @@ public static AssemblyXpp3Reader.ContentTransformer assemblyInterpolator( final FixedStringSearchInterpolator interpolator, final InterpolationState is, final Logger logger ) { final Set blacklistFields = - new HashSet( FieldBasedObjectInterpolator.DEFAULT_BLACKLISTED_FIELD_NAMES ); + new HashSet<>( FieldBasedObjectInterpolator.DEFAULT_BLACKLISTED_FIELD_NAMES ); blacklistFields.addAll( INTERPOLATION_BLACKLIST ); return new AssemblyXpp3Reader.ContentTransformer() @@ -93,7 +93,7 @@ public static ComponentXpp3Reader.ContentTransformer componentInterpolator( final FixedStringSearchInterpolator interpolator, final InterpolationState is, final Logger logger ) { final Set blacklistFields = - new HashSet( FieldBasedObjectInterpolator.DEFAULT_BLACKLISTED_FIELD_NAMES ); + new HashSet<>( FieldBasedObjectInterpolator.DEFAULT_BLACKLISTED_FIELD_NAMES ); blacklistFields.addAll( INTERPOLATION_BLACKLIST ); return new ComponentXpp3Reader.ContentTransformer() diff --git a/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java b/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java index 7ef826e10..ab2047756 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java +++ b/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java @@ -94,14 +94,14 @@ public List readAssemblies( final AssemblerConfigurationSource configS { final Locator locator = new Locator(); - final List strategies = new ArrayList(); + final List strategies = new ArrayList<>(); strategies.add( new RelativeFileLocatorStrategy( configSource.getBasedir() ) ); strategies.add( new FileLocatorStrategy() ); - final List refStrategies = new ArrayList(); + final List refStrategies = new ArrayList<>(); refStrategies.add( new PrefixedClasspathLocatorStrategy( "/assemblies/" ) ); - final List assemblies = new ArrayList(); + final List assemblies = new ArrayList<>(); final String[] descriptors = configSource.getDescriptors(); final String[] descriptorRefs = configSource.getDescriptorReferences(); @@ -161,7 +161,7 @@ public List readAssemblies( final AssemblerConfigurationSource configS } // check unique IDs - final Set ids = new HashSet(); + final Set ids = new HashSet<>(); for ( final Assembly assembly : assemblies ) { if ( !ids.add( assembly.getId() ) ) diff --git a/src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java b/src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java index 30f05c517..31318b0f3 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java +++ b/src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java @@ -1,272 +1,272 @@ -package org.apache.maven.plugins.assembly.repository; - -/* - * 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.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.apache.maven.artifact.Artifact; -import org.apache.maven.artifact.resolver.filter.AndArtifactFilter; -import org.apache.maven.artifact.resolver.filter.ArtifactFilter; -import org.apache.maven.model.Dependency; -import org.apache.maven.plugins.assembly.repository.model.GroupVersionAlignment; -import org.apache.maven.plugins.assembly.repository.model.RepositoryInfo; -import org.apache.maven.project.MavenProject; -import org.apache.maven.project.ProjectBuildingRequest; -import org.apache.maven.shared.artifact.TransferUtils; -import org.apache.maven.shared.artifact.filter.PatternExcludesArtifactFilter; -import org.apache.maven.shared.artifact.filter.PatternIncludesArtifactFilter; -import org.apache.maven.shared.artifact.filter.ScopeArtifactFilter; -import org.apache.maven.shared.artifact.resolve.ArtifactResolver; -import org.apache.maven.shared.artifact.resolve.ArtifactResolverException; -import org.apache.maven.shared.artifact.resolve.ArtifactResult; -import org.apache.maven.shared.dependencies.resolve.DependencyResolver; -import org.apache.maven.shared.dependencies.resolve.DependencyResolverException; -import org.apache.maven.shared.repository.RepositoryManager; -import org.apache.maven.shared.utils.io.FileUtils; -import org.codehaus.plexus.component.annotations.Component; -import org.codehaus.plexus.component.annotations.Requirement; -import org.codehaus.plexus.logging.AbstractLogEnabled; -import org.codehaus.plexus.logging.Logger; - -/** - * @author Jason van Zyl - */ - -// todo will need to pop the processed project cache using reflection -@Component( role = RepositoryAssembler.class ) -public class DefaultRepositoryAssembler - extends AbstractLogEnabled - implements RepositoryAssembler -{ - @Requirement - protected ArtifactResolver artifactResolver; - - @Requirement - private DependencyResolver dependencyResolver; - - @Requirement - private RepositoryManager repositoryManager; - - public void buildRemoteRepository( File repositoryDirectory, RepositoryInfo repository, - RepositoryBuilderConfigSource configSource ) - throws RepositoryAssemblyException - { - MavenProject project = configSource.getProject(); - ProjectBuildingRequest buildingRequest = configSource.getProjectBuildingRequest(); - - Iterable result = null; - - Collection dependencies = project.getDependencies(); - - if ( dependencies == null ) - { - Logger logger = getLogger(); - - if ( logger.isDebugEnabled() ) - { - logger.debug( "dependency-artifact set for project: " + project.getId() - + " is null. Skipping repository processing." ); - } - - return; - } - - Collection managedDependencies = null; - if ( project.getDependencyManagement() != null ) - { - managedDependencies = project.getDependencyManagement().getDependencies(); - } - - // Older Aether versions use an cache which can't be cleared. So can't delete repoDir and use it again. - // Instead create a temporary repository, delete it at end (should be in a finally-block) - - File tempRepo = new File( repositoryDirectory.getParentFile(), repositoryDirectory.getName() + "_tmp" ); - - buildingRequest = repositoryManager.setLocalRepositoryBasedir( buildingRequest, tempRepo ); - - try - { - result = dependencyResolver.resolveDependencies( buildingRequest, dependencies, managedDependencies, null ); - } - catch ( DependencyResolverException e ) - { - throw new RepositoryAssemblyException( "Error resolving artifacts: " + e.getMessage(), e ); - } - - ArtifactFilter filter = buildRepositoryFilter( repository, project ); - - buildingRequest = repositoryManager.setLocalRepositoryBasedir( buildingRequest, repositoryDirectory ); - - Map groupVersionAlignments = - createGroupVersionAlignments( repository.getGroupVersionAlignments() ); - - assembleRepositoryArtifacts( buildingRequest, result, filter, groupVersionAlignments ); - - if ( repository.isIncludeMetadata() ) - { -// assembleRepositoryMetadata( result, filter, centralRepository, targetRepository ); - } - - try - { - FileUtils.deleteDirectory( tempRepo ); - } - catch ( IOException e ) - { - // noop - } - } - - private ArtifactFilter buildRepositoryFilter( RepositoryInfo repository, MavenProject project ) - { - AndArtifactFilter filter = new AndArtifactFilter(); - - ArtifactFilter scopeFilter = new ScopeArtifactFilter( repository.getScope() ); - filter.add( scopeFilter ); - - // ---------------------------------------------------------------------------- - // Includes - // - // We'll take everything if no includes are specified to try and make - // this - // process more maintainable. Don't want to have to update the assembly - // descriptor everytime the POM is updated. - // ---------------------------------------------------------------------------- - - List includes = repository.getIncludes(); - - if ( ( includes == null ) || includes.isEmpty() ) - { - List patterns = new ArrayList(); - - Set projectArtifacts = project.getDependencyArtifacts(); - - if ( projectArtifacts != null ) - { - for ( Artifact artifact : projectArtifacts ) - { - patterns.add( artifact.getDependencyConflictId() ); - } - } - - PatternIncludesArtifactFilter includeFilter = new PatternIncludesArtifactFilter( patterns, true ); - - filter.add( includeFilter ); - } - else - { - filter.add( new PatternIncludesArtifactFilter( repository.getIncludes(), true ) ); - } - - // ---------------------------------------------------------------------------- - // Excludes - // - // We still want to make it easy to exclude a few things even if we - // slurp - // up everything. - // ---------------------------------------------------------------------------- - - List excludes = repository.getExcludes(); - - if ( ( excludes != null ) && !excludes.isEmpty() ) - { - filter.add( new PatternExcludesArtifactFilter( repository.getExcludes(), true ) ); - } - - return filter; - } - - private void assembleRepositoryArtifacts( ProjectBuildingRequest buildingRequest, Iterable result, - ArtifactFilter filter, - Map groupVersionAlignments ) - throws RepositoryAssemblyException - { - try - { - for ( ArtifactResult ar : result ) - { - Artifact a = ar.getArtifact(); - - if ( filter.include( a ) ) - { - getLogger().debug( "Re-resolving: " + a + " for repository assembly." ); - - setAlignment( a, groupVersionAlignments ); - - artifactResolver.resolveArtifact( buildingRequest, TransferUtils.toArtifactCoordinate( a ) ); - - a.setVersion( a.getBaseVersion() ); - - File targetFile = new File( repositoryManager.getLocalRepositoryBasedir( buildingRequest ), - repositoryManager.getPathForLocalArtifact( buildingRequest, a ) ); - - FileUtils.copyFile( a.getFile(), targetFile ); - -// writeChecksums( targetFile ); - } - } - } - catch ( ArtifactResolverException e ) - { - throw new RepositoryAssemblyException( "Error resolving artifacts: " + e.getMessage(), e ); - } - catch ( IOException e ) - { - throw new RepositoryAssemblyException( "Error writing artifact metdata.", e ); - } - } - - // CHECKSTYLE_OFF: LineLength - protected Map createGroupVersionAlignments( List versionAlignments ) - // CHECKSTYLE_ON: LineLength - { - Map groupVersionAlignments = new HashMap(); - - if ( versionAlignments != null ) - { - for ( GroupVersionAlignment alignment : versionAlignments ) - { - groupVersionAlignments.put( alignment.getId(), alignment ); - } - } - - return groupVersionAlignments; - } - - private void setAlignment( Artifact artifact, Map groupVersionAlignments ) - { - GroupVersionAlignment alignment = groupVersionAlignments.get( artifact.getGroupId() ); - - if ( alignment != null ) - { - if ( !alignment.getExcludes().contains( artifact.getArtifactId() ) ) - { - artifact.setVersion( alignment.getVersion() ); - } - } - } -} +package org.apache.maven.plugins.assembly.repository; + +/* + * 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.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.apache.maven.artifact.Artifact; +import org.apache.maven.artifact.resolver.filter.AndArtifactFilter; +import org.apache.maven.artifact.resolver.filter.ArtifactFilter; +import org.apache.maven.model.Dependency; +import org.apache.maven.plugins.assembly.repository.model.GroupVersionAlignment; +import org.apache.maven.plugins.assembly.repository.model.RepositoryInfo; +import org.apache.maven.project.MavenProject; +import org.apache.maven.project.ProjectBuildingRequest; +import org.apache.maven.shared.artifact.TransferUtils; +import org.apache.maven.shared.artifact.filter.PatternExcludesArtifactFilter; +import org.apache.maven.shared.artifact.filter.PatternIncludesArtifactFilter; +import org.apache.maven.shared.artifact.filter.ScopeArtifactFilter; +import org.apache.maven.shared.artifact.resolve.ArtifactResolver; +import org.apache.maven.shared.artifact.resolve.ArtifactResolverException; +import org.apache.maven.shared.artifact.resolve.ArtifactResult; +import org.apache.maven.shared.dependencies.resolve.DependencyResolver; +import org.apache.maven.shared.dependencies.resolve.DependencyResolverException; +import org.apache.maven.shared.repository.RepositoryManager; +import org.apache.maven.shared.utils.io.FileUtils; +import org.codehaus.plexus.component.annotations.Component; +import org.codehaus.plexus.component.annotations.Requirement; +import org.codehaus.plexus.logging.AbstractLogEnabled; +import org.codehaus.plexus.logging.Logger; + +/** + * @author Jason van Zyl + */ + +// todo will need to pop the processed project cache using reflection +@Component( role = RepositoryAssembler.class ) +public class DefaultRepositoryAssembler + extends AbstractLogEnabled + implements RepositoryAssembler +{ + @Requirement + protected ArtifactResolver artifactResolver; + + @Requirement + private DependencyResolver dependencyResolver; + + @Requirement + private RepositoryManager repositoryManager; + + public void buildRemoteRepository( File repositoryDirectory, RepositoryInfo repository, + RepositoryBuilderConfigSource configSource ) + throws RepositoryAssemblyException + { + MavenProject project = configSource.getProject(); + ProjectBuildingRequest buildingRequest = configSource.getProjectBuildingRequest(); + + Iterable result = null; + + Collection dependencies = project.getDependencies(); + + if ( dependencies == null ) + { + Logger logger = getLogger(); + + if ( logger.isDebugEnabled() ) + { + logger.debug( "dependency-artifact set for project: " + project.getId() + + " is null. Skipping repository processing." ); + } + + return; + } + + Collection managedDependencies = null; + if ( project.getDependencyManagement() != null ) + { + managedDependencies = project.getDependencyManagement().getDependencies(); + } + + // Older Aether versions use an cache which can't be cleared. So can't delete repoDir and use it again. + // Instead create a temporary repository, delete it at end (should be in a finally-block) + + File tempRepo = new File( repositoryDirectory.getParentFile(), repositoryDirectory.getName() + "_tmp" ); + + buildingRequest = repositoryManager.setLocalRepositoryBasedir( buildingRequest, tempRepo ); + + try + { + result = dependencyResolver.resolveDependencies( buildingRequest, dependencies, managedDependencies, null ); + } + catch ( DependencyResolverException e ) + { + throw new RepositoryAssemblyException( "Error resolving artifacts: " + e.getMessage(), e ); + } + + ArtifactFilter filter = buildRepositoryFilter( repository, project ); + + buildingRequest = repositoryManager.setLocalRepositoryBasedir( buildingRequest, repositoryDirectory ); + + Map groupVersionAlignments = + createGroupVersionAlignments( repository.getGroupVersionAlignments() ); + + assembleRepositoryArtifacts( buildingRequest, result, filter, groupVersionAlignments ); + + if ( repository.isIncludeMetadata() ) + { +// assembleRepositoryMetadata( result, filter, centralRepository, targetRepository ); + } + + try + { + FileUtils.deleteDirectory( tempRepo ); + } + catch ( IOException e ) + { + // noop + } + } + + private ArtifactFilter buildRepositoryFilter( RepositoryInfo repository, MavenProject project ) + { + AndArtifactFilter filter = new AndArtifactFilter(); + + ArtifactFilter scopeFilter = new ScopeArtifactFilter( repository.getScope() ); + filter.add( scopeFilter ); + + // ---------------------------------------------------------------------------- + // Includes + // + // We'll take everything if no includes are specified to try and make + // this + // process more maintainable. Don't want to have to update the assembly + // descriptor everytime the POM is updated. + // ---------------------------------------------------------------------------- + + List includes = repository.getIncludes(); + + if ( ( includes == null ) || includes.isEmpty() ) + { + List patterns = new ArrayList<>(); + + Set projectArtifacts = project.getDependencyArtifacts(); + + if ( projectArtifacts != null ) + { + for ( Artifact artifact : projectArtifacts ) + { + patterns.add( artifact.getDependencyConflictId() ); + } + } + + PatternIncludesArtifactFilter includeFilter = new PatternIncludesArtifactFilter( patterns, true ); + + filter.add( includeFilter ); + } + else + { + filter.add( new PatternIncludesArtifactFilter( repository.getIncludes(), true ) ); + } + + // ---------------------------------------------------------------------------- + // Excludes + // + // We still want to make it easy to exclude a few things even if we + // slurp + // up everything. + // ---------------------------------------------------------------------------- + + List excludes = repository.getExcludes(); + + if ( ( excludes != null ) && !excludes.isEmpty() ) + { + filter.add( new PatternExcludesArtifactFilter( repository.getExcludes(), true ) ); + } + + return filter; + } + + private void assembleRepositoryArtifacts( ProjectBuildingRequest buildingRequest, Iterable result, + ArtifactFilter filter, + Map groupVersionAlignments ) + throws RepositoryAssemblyException + { + try + { + for ( ArtifactResult ar : result ) + { + Artifact a = ar.getArtifact(); + + if ( filter.include( a ) ) + { + getLogger().debug( "Re-resolving: " + a + " for repository assembly." ); + + setAlignment( a, groupVersionAlignments ); + + artifactResolver.resolveArtifact( buildingRequest, TransferUtils.toArtifactCoordinate( a ) ); + + a.setVersion( a.getBaseVersion() ); + + File targetFile = new File( repositoryManager.getLocalRepositoryBasedir( buildingRequest ), + repositoryManager.getPathForLocalArtifact( buildingRequest, a ) ); + + FileUtils.copyFile( a.getFile(), targetFile ); + +// writeChecksums( targetFile ); + } + } + } + catch ( ArtifactResolverException e ) + { + throw new RepositoryAssemblyException( "Error resolving artifacts: " + e.getMessage(), e ); + } + catch ( IOException e ) + { + throw new RepositoryAssemblyException( "Error writing artifact metdata.", e ); + } + } + + // CHECKSTYLE_OFF: LineLength + protected Map createGroupVersionAlignments( List versionAlignments ) + // CHECKSTYLE_ON: LineLength + { + Map groupVersionAlignments = new HashMap<>(); + + if ( versionAlignments != null ) + { + for ( GroupVersionAlignment alignment : versionAlignments ) + { + groupVersionAlignments.put( alignment.getId(), alignment ); + } + } + + return groupVersionAlignments; + } + + private void setAlignment( Artifact artifact, Map groupVersionAlignments ) + { + GroupVersionAlignment alignment = groupVersionAlignments.get( artifact.getGroupId() ); + + if ( alignment != null ) + { + if ( !alignment.getExcludes().contains( artifact.getArtifactId() ) ) + { + artifact.setVersion( alignment.getVersion() ); + } + } + } +} diff --git a/src/main/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtils.java b/src/main/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtils.java index 4697ae9ca..3777d78f5 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtils.java +++ b/src/main/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtils.java @@ -313,7 +313,7 @@ public static String fixRelativeRefs( @Nonnull String src ) if ( value.contains( "." + sep ) ) { - List parts = new ArrayList(); + List parts = new ArrayList<>(); parts.addAll( Arrays.asList( value.split( sep.replace( "\\", "\\\\" ) ) ) ); for ( ListIterator it = parts.listIterator(); it.hasNext(); ) diff --git a/src/main/java/org/apache/maven/plugins/assembly/utils/FilterUtils.java b/src/main/java/org/apache/maven/plugins/assembly/utils/FilterUtils.java index f3edf94ef..a99c4d267 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/utils/FilterUtils.java +++ b/src/main/java/org/apache/maven/plugins/assembly/utils/FilterUtils.java @@ -54,7 +54,7 @@ public static Set filterProjects( final Set projects final List excludes, final boolean actTransitively, final Logger logger ) { - final List allFilters = new ArrayList(); + final List allFilters = new ArrayList<>(); final AndArtifactFilter filter = new AndArtifactFilter(); @@ -75,7 +75,7 @@ public static Set filterProjects( final Set projects allFilters.add( excludeFilter ); } - Set result = new LinkedHashSet( projects.size() ); + Set result = new LinkedHashSet<>( projects.size() ); for ( MavenProject project : projects ) { final Artifact artifact = project.getArtifact(); @@ -102,7 +102,7 @@ public static void filterArtifacts( final Set artifacts, final List allFilters = new ArrayList(); + final List allFilters = new ArrayList<>(); final AndArtifactFilter filter = new AndArtifactFilter(); @@ -211,7 +211,7 @@ public static ScopeFilter newScopeFilter( final String rootScope ) */ public static ScopeFilter newScopeFilter( final Collection rootScopes ) { - Set scopes = new HashSet(); + Set scopes = new HashSet<>(); for ( String rootScope : rootScopes ) { diff --git a/src/main/java/org/apache/maven/plugins/assembly/utils/InterpolationConstants.java b/src/main/java/org/apache/maven/plugins/assembly/utils/InterpolationConstants.java index e0fdf99eb..c990a9f5e 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/utils/InterpolationConstants.java +++ b/src/main/java/org/apache/maven/plugins/assembly/utils/InterpolationConstants.java @@ -37,13 +37,13 @@ public final class InterpolationConstants static { - final List projectPrefixes = new ArrayList(); + final List projectPrefixes = new ArrayList<>(); projectPrefixes.add( "pom." ); projectPrefixes.add( "project." ); PROJECT_PREFIXES = Collections.unmodifiableList( projectPrefixes ); - final List projectPropertiesPrefixes = new ArrayList(); + final List projectPropertiesPrefixes = new ArrayList<>(); projectPropertiesPrefixes.add( "pom.properties." ); projectPropertiesPrefixes.add( "project.properties." ); diff --git a/src/main/java/org/apache/maven/plugins/assembly/utils/ProjectUtils.java b/src/main/java/org/apache/maven/plugins/assembly/utils/ProjectUtils.java index 269b7793c..c9a682148 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/utils/ProjectUtils.java +++ b/src/main/java/org/apache/maven/plugins/assembly/utils/ProjectUtils.java @@ -62,9 +62,9 @@ public static Set getProjectModules( @Nonnull final MavenProject p { final Set singleParentSet = Collections.singleton( project ); - final Set moduleCandidates = new LinkedHashSet( reactorProjects ); + final Set moduleCandidates = new LinkedHashSet<>( reactorProjects ); - final Set modules = new LinkedHashSet(); + final Set modules = new LinkedHashSet<>(); // we temporarily add the master project to the modules set, since this // set is pulling double duty as a set of @@ -96,7 +96,7 @@ public static Set getProjectModules( @Nonnull final MavenProject p Set currentPotentialParents; if ( includeSubModules ) { - currentPotentialParents = new LinkedHashSet( modules ); + currentPotentialParents = new LinkedHashSet<>( modules ); } else { diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiverTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiverTest.java index 7b1ac8f17..b86499763 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiverTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiverTest.java @@ -126,7 +126,7 @@ public void addFile_NoPerms_CallAcceptFilesOnlyOnce() EasyMock.expectLastCall().anyTimes(); final CounterSelector counter = new CounterSelector( true ); - final List selectors = new ArrayList(); + final List selectors = new ArrayList<>(); selectors.add( counter ); mm.replayAll(); @@ -157,7 +157,7 @@ public void addDirectory_NoPerms_CallAcceptFilesOnlyOnce() delegate.setDestFile( output ); final CounterSelector counter = new CounterSelector( true ); - final List selectors = new ArrayList(); + final List selectors = new ArrayList<>(); selectors.add( counter ); final AssemblyProxyArchiver archiver = diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/AssemblyArchiverPhaseComparatorTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/AssemblyArchiverPhaseComparatorTest.java index abef5a2b8..d6815ac83 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/AssemblyArchiverPhaseComparatorTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/AssemblyArchiverPhaseComparatorTest.java @@ -41,7 +41,7 @@ public class AssemblyArchiverPhaseComparatorTest public void comparatorSortsCorrectly() throws Exception { - List items = new ArrayList(); + List items = new ArrayList<>(); Unordered2 u2 = new Unordered2(); items.add( u2 ); Ordered2 o2 = new Ordered2(); diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java index 86b9de0fb..20decc159 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java @@ -277,7 +277,7 @@ public void testExecute_ShouldAddOneModuleSetWithOneModuleInIt() final File moduleArtifactFile = moduleArtifactMock.setNewFile(); module.setArtifact( moduleArtifactMock.getArtifact() ); - final List projects = new ArrayList(); + final List projects = new ArrayList<>(); projects.add( module ); @@ -648,7 +648,7 @@ public void testGetModuleProjects_ShouldReturnNothingWhenReactorContainsTwoSibli final MavenProject project2 = createProject( "group", "artifact2", "version", null ); - final List projects = new ArrayList(); + final List projects = new ArrayList<>(); projects.add( project ); projects.add( project2 ); @@ -679,7 +679,7 @@ public void testGetModuleProjects_ShouldReturnModuleOfCurrentProject() final MavenProject project2 = createProject( "group", "artifact2", "version", project ); - final List projects = new ArrayList(); + final List projects = new ArrayList<>(); projects.add( project ); projects.add( project2 ); @@ -715,7 +715,7 @@ public void testGetModuleProjects_ShouldReturnDescendentModulesOfCurrentProject( final MavenProject project2 = createProject( "group", "artifact2", "version", project ); final MavenProject project3 = createProject( "group", "artifact3", "version", project2 ); - final List projects = new ArrayList(); + final List projects = new ArrayList<>(); projects.add( project ); projects.add( project2 ); projects.add( project3 ); @@ -732,7 +732,7 @@ public void testGetModuleProjects_ShouldReturnDescendentModulesOfCurrentProject( assertEquals( 2, moduleProjects.size() ); - final List check = new ArrayList(); + final List check = new ArrayList<>(); check.add( project2 ); check.add( project3 ); @@ -758,7 +758,7 @@ public void testGetModuleProjects_ShouldExcludeModuleAndDescendentsTransitively( final MavenProject project3 = createProject( "group", "artifact3", "version", project2 ); addArtifact( project3, mm, true ); - final List projects = new ArrayList(); + final List projects = new ArrayList<>(); projects.add( project ); projects.add( project2 ); projects.add( project3 ); @@ -789,7 +789,7 @@ private ArtifactMock addArtifact( final MavenProject project, final EasyMockSupp if ( expectDepTrailCheck ) { - final LinkedList depTrail = new LinkedList(); + final LinkedList depTrail = new LinkedList<>(); MavenProject parent = project.getParent(); while ( parent != null ) @@ -811,7 +811,7 @@ private void verifyResultIs( final List check, final Set checkTooMany = new HashSet( moduleProjects ); + final Set checkTooMany = new HashSet<>( moduleProjects ); checkTooMany.removeAll( check ); if ( !checkTooMany.isEmpty() ) @@ -826,7 +826,7 @@ private void verifyResultIs( final List check, final Set checkTooFew = new HashSet( check ); + final Set checkTooFew = new HashSet<>( check ); checkTooFew.removeAll( moduleProjects ); if ( !checkTooFew.isEmpty() ) diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java index 8ab9625a6..b322df9b1 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java @@ -299,7 +299,7 @@ public void testGetDependencyArtifacts_ShouldFilterOneDependencyArtifactViaInclu { final MavenProject project = new MavenProject( new Model() ); - final Set artifacts = new HashSet(); + final Set artifacts = new HashSet<>(); final ArtifactMock am = new ArtifactMock( mockManager, "group", "artifact", "1.0", "jar", false ); am.setDependencyTrail( Collections.singletonList( project.getId() ) ); @@ -335,7 +335,7 @@ public void testGetDependencyArtifacts_ShouldIgnoreTransitivePathFilteringWhenIn { final MavenProject project = new MavenProject( new Model() ); - final Set artifacts = new HashSet(); + final Set artifacts = new HashSet<>(); final ArtifactMock am = new ArtifactMock( mockManager, "group", "artifact", "1.0", "jar", false ); artifacts.add( am.getArtifact() ); diff --git a/src/test/java/org/apache/maven/plugins/assembly/artifact/ResolutionManagementInfoTest.java b/src/test/java/org/apache/maven/plugins/assembly/artifact/ResolutionManagementInfoTest.java index 86c2b717f..9f682113b 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/artifact/ResolutionManagementInfoTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/artifact/ResolutionManagementInfoTest.java @@ -68,14 +68,14 @@ public void testAddMultiArtifactWithReplacemen() Artifact a3 = new DefaultArtifact( "groupid", "a3", VersionRange.createFromVersion( "1.0" ), "test", "jar", null, new DefaultArtifactHandler() ); - rmi.addArtifacts( new HashSet( Arrays.asList( a1, a2, a3 ) ) ); + rmi.addArtifacts( new HashSet<>( Arrays.asList( a1, a2, a3 ) ) ); Artifact b2 = new DefaultArtifact( "groupid", "a2", VersionRange.createFromVersion( "1.0" ), "compile", "jar", null, new DefaultArtifactHandler() ); Artifact b3 = new DefaultArtifact( "groupid", "a3", VersionRange.createFromVersion( "1.0" ), "compile", "jar", null, new DefaultArtifactHandler() ); - rmi.addArtifacts( new HashSet( Arrays.asList( b2, b3 ) ) ); + rmi.addArtifacts( new HashSet<>( Arrays.asList( b2, b3 ) ) ); assertEquals( 3, rmi.getArtifacts().size() ); int compile = 0; int test = 0; diff --git a/src/test/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilterTest.java b/src/test/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilterTest.java index f09163181..df2718ac1 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilterTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilterTest.java @@ -117,7 +117,7 @@ public void testAddComponentsXml_ShouldAddComponentWithRoleHint() public void testAddComponentsXml_ShouldAddTwoComponentsWithRoleHints() throws IOException, XmlPullParserException { - final List defs = new ArrayList(); + final List defs = new ArrayList<>(); defs.add( new ComponentDef( "role", "hint", "org.apache.maven.Impl" ) ); defs.add( new ComponentDef( "role", "hint2", "org.apache.maven.Impl2" ) ); @@ -146,7 +146,7 @@ public void testAddToArchive_ShouldWriteComponentWithoutHintToFile() { final Xpp3Dom dom = createComponentDom( new ComponentDef( "role", null, "impl" ) ); - filter.components = new LinkedHashMap(); + filter.components = new LinkedHashMap<>(); filter.components.put( "role", dom ); final FileCatchingArchiver fca = new FileCatchingArchiver(); @@ -173,7 +173,7 @@ public void testAddToArchive_ShouldWriteComponentWithHintToFile() { final Xpp3Dom dom = createComponentDom( new ComponentDef( "role", "hint", "impl" ) ); - filter.components = new LinkedHashMap(); + filter.components = new LinkedHashMap<>(); filter.components.put( "rolehint", dom ); final FileCatchingArchiver fca = new FileCatchingArchiver(); @@ -198,7 +198,7 @@ public void testAddToArchive_ShouldWriteComponentWithHintToFile() public void testAddToArchive_ShouldWriteTwoComponentToFile() throws IOException, ArchiverException, JDOMException { - filter.components = new LinkedHashMap(); + filter.components = new LinkedHashMap<>(); final Xpp3Dom dom = createComponentDom( new ComponentDef( "role", "hint", "impl" ) ); @@ -239,7 +239,7 @@ public void testAddToArchive_ShouldWriteTwoComponentToFile() public void testAddToArchive_ShouldWriteTwoComponentToArchivedFile() throws IOException, ArchiverException, JDOMException { - filter.components = new LinkedHashMap(); + filter.components = new LinkedHashMap<>(); final Xpp3Dom dom = createComponentDom( new ComponentDef( "role", "hint", "impl" ) ); diff --git a/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java b/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java index 8acff0083..9e4dda2c8 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReaderTest.java @@ -883,7 +883,7 @@ public void testReadAssemblies_ShouldGetAssemblyDescriptorFromFileArray() final Assembly assembly2 = new Assembly(); assembly2.setId( "test2" ); - final List assemblies = new ArrayList(); + final List assemblies = new ArrayList<>(); assemblies.add( assembly1 ); assemblies.add( assembly2 ); @@ -935,7 +935,7 @@ public void testReadAssemblies_ShouldGetAssemblyDescriptorFromDirectory() final Assembly assembly2 = new Assembly(); assembly2.setId( "test2" ); - final List assemblies = new ArrayList(); + final List assemblies = new ArrayList<>(); assemblies.add( assembly1 ); assemblies.add( assembly2 ); @@ -966,7 +966,7 @@ public void testReadAssemblies_ShouldGetTwoAssemblyDescriptorsFromDirectoryWithT final Assembly assembly2 = new Assembly(); assembly2.setId( "test2" ); - final List assemblies = new ArrayList(); + final List assemblies = new ArrayList<>(); assemblies.add( assembly1 ); assemblies.add( assembly2 ); @@ -993,7 +993,7 @@ public void testReadAssemblies_ShouldGetTwoAssemblyDescriptorsFromDirectoryWithT private List writeAssembliesToFile( final List assemblies, final File dir ) throws IOException { - final List files = new ArrayList(); + final List files = new ArrayList<>(); for ( final Assembly assembly : assemblies ) { diff --git a/src/test/java/org/apache/maven/plugins/assembly/testutils/TestFileManager.java b/src/test/java/org/apache/maven/plugins/assembly/testutils/TestFileManager.java index a5a57e000..ae5280c9c 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/testutils/TestFileManager.java +++ b/src/test/java/org/apache/maven/plugins/assembly/testutils/TestFileManager.java @@ -35,7 +35,7 @@ public class TestFileManager public static final String TEMP_DIR_PATH = System.getProperty( "java.io.tmpdir" ); - private final List filesToDelete = new ArrayList(); + private final List filesToDelete = new ArrayList<>(); private final String baseFilename; diff --git a/src/test/java/org/apache/maven/plugins/assembly/utils/FilterUtilsTest.java b/src/test/java/org/apache/maven/plugins/assembly/utils/FilterUtilsTest.java index 27be910c2..c1793b034 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/utils/FilterUtilsTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/utils/FilterUtilsTest.java @@ -81,13 +81,13 @@ public void testFilterArtifacts_ShouldThrowExceptionUsingStrictModeWithUnmatched expect( artifact.getDependencyConflictId() ).andReturn( "group:artifact:type" ).atLeastOnce(); - final List includes = new ArrayList(); + final List includes = new ArrayList<>(); includes.add( "other.group:other-artifact:type:version" ); final List excludes = Collections.emptyList(); - final Set artifacts = new HashSet(); + final Set artifacts = new HashSet<>(); artifacts.add( artifact ); mockManager.replayAll(); @@ -258,7 +258,7 @@ private void verifyArtifactFiltering( final String groupId, final String artifac exclusions = Collections.emptyList(); } - final Set artifacts = new HashSet(); + final Set artifacts = new HashSet<>(); artifacts.add( mac.artifact ); FilterUtils.filterArtifacts( artifacts, inclusions, exclusions, false, depTrail != null, logger, @@ -307,7 +307,7 @@ private void verifyProjectFiltering( final String groupId, final String artifact // make sure the mock is satisfied...you can't disable this expectation. pmac.mac.artifact.getDependencyConflictId(); - final Set projects = new HashSet(); + final Set projects = new HashSet<>(); projects.add( pmac ); List inclusions; diff --git a/src/test/java/org/apache/maven/plugins/assembly/utils/ProjectUtilsTest.java b/src/test/java/org/apache/maven/plugins/assembly/utils/ProjectUtilsTest.java index e007fa18f..bd8aa33a5 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/utils/ProjectUtilsTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/utils/ProjectUtilsTest.java @@ -60,7 +60,7 @@ public void testGetProjectModules_ShouldIncludeDirectModuleOfMasterProject() module.setFile( new File( "module/pom.xml" ) ); - final List projects = new ArrayList( 2 ); + final List projects = new ArrayList<>( 2 ); projects.add( master ); projects.add( module ); @@ -105,7 +105,7 @@ public void testGetProjectModules_ShouldIncludeInDirectModuleOfMasterWhenInclude subModule.setFile( new File( "project/module/submodule/pom.xml" ) ); - final List projects = new ArrayList( 3 ); + final List projects = new ArrayList<>( 3 ); projects.add( master ); projects.add( module ); @@ -117,7 +117,7 @@ public void testGetProjectModules_ShouldIncludeInDirectModuleOfMasterWhenInclude assertNotNull( result ); assertEquals( 2, result.size() ); - final List verify = new ArrayList( projects ); + final List verify = new ArrayList<>( projects ); verify.remove( master ); verifyProjectsPresent( verify, result ); @@ -142,7 +142,7 @@ public void testGetProjectModules_ShouldExcludeInDirectModuleOfMasterWhenInclude subModule.setFile( new File( "project/module/submodule/pom.xml" ) ); - final List projects = new ArrayList( 3 ); + final List projects = new ArrayList<>( 3 ); projects.add( master ); projects.add( module ); @@ -154,7 +154,7 @@ public void testGetProjectModules_ShouldExcludeInDirectModuleOfMasterWhenInclude assertNotNull( result ); assertEquals( 1, result.size() ); - final List verify = new ArrayList( projects ); + final List verify = new ArrayList<>( projects ); verify.remove( master ); verify.remove( subModule ); @@ -172,7 +172,7 @@ public void testGetProjectModules_ShouldExcludeNonModuleOfMasterProject() other.setFile( new File( "other/pom.xml" ) ); - final List projects = new ArrayList( 3 ); + final List projects = new ArrayList<>( 3 ); projects.add( master ); projects.add( other ); @@ -186,9 +186,9 @@ public void testGetProjectModules_ShouldExcludeNonModuleOfMasterProject() private void verifyProjectsPresent( final List verify, final Set result ) { - final List verifyCopy = new ArrayList( verify ); + final List verifyCopy = new ArrayList<>( verify ); - final List unexpected = new ArrayList(); + final List unexpected = new ArrayList<>(); for ( final MavenProject project : result ) { diff --git a/src/test/java/org/apache/maven/plugins/assembly/utils/TypeConversionUtilsTest.java b/src/test/java/org/apache/maven/plugins/assembly/utils/TypeConversionUtilsTest.java index ad695e566..8b4976d22 100644 --- a/src/test/java/org/apache/maven/plugins/assembly/utils/TypeConversionUtilsTest.java +++ b/src/test/java/org/apache/maven/plugins/assembly/utils/TypeConversionUtilsTest.java @@ -67,7 +67,7 @@ public void testModeToInt_FailOnInvalidOctalValue() public void testVerifyModeSanity_WarnOnNonsensicalOctalValue_002() { - final List messages = new ArrayList( 2 ); + final List messages = new ArrayList<>( 2 ); messages.add( "World has write access, but user does not." ); messages.add( "World has write access, but group does not." ); @@ -76,7 +76,7 @@ public void testVerifyModeSanity_WarnOnNonsensicalOctalValue_002() public void testVerifyModeSanity_WarnOnNonsensicalOctalValue_020() { - final List messages = new ArrayList( 1 ); + final List messages = new ArrayList<>( 1 ); messages.add( "Group has write access, but user does not." ); checkFileModeSanity( "020", false, messages ); From 96f6c82bf418eacf2a92631c83a29c7b0baf37c0 Mon Sep 17 00:00:00 2001 From: Andrey Turbanov Date: Sat, 25 Aug 2018 19:33:08 +0300 Subject: [PATCH 04/24] fix typos use java7 methods/classes --- .../plugins/assembly/AssemblerConfigurationSource.java | 6 +++--- .../assembly/archive/ManifestCreationFinalizer.java | 4 +++- .../assembly/archive/archiver/AssemblyProxyArchiver.java | 5 +---- .../archive/phase/AssemblyArchiverPhaseComparator.java | 2 +- .../assembly/archive/task/AddDependencySetsTask.java | 4 ++-- .../assembly/filter/ComponentsXmlArchiverFileFilter.java | 3 +-- .../filter/SimpleAggregatingDescriptorHandler.java | 5 +++-- .../maven/plugins/assembly/format/ReaderFormatter.java | 4 +--- .../plugins/assembly/mojos/AbstractAssemblyMojo.java | 8 ++++---- 9 files changed, 19 insertions(+), 22 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/assembly/AssemblerConfigurationSource.java b/src/main/java/org/apache/maven/plugins/assembly/AssemblerConfigurationSource.java index bcbd02a1a..a0230b21c 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/AssemblerConfigurationSource.java +++ b/src/main/java/org/apache/maven/plugins/assembly/AssemblerConfigurationSource.java @@ -46,7 +46,7 @@ public interface AssemblerConfigurationSource String[] getDescriptorReferences(); /** - * @return The descriptor source direcotoy. + * @return The descriptor source directory. */ File getDescriptorSourceDirectory(); @@ -86,7 +86,7 @@ public interface AssemblerConfigurationSource File getOutputDirectory(); /** - * @return The working direcotory. + * @return The working directory. */ File getWorkingDirectory(); @@ -151,7 +151,7 @@ public interface AssemblerConfigurationSource MavenSession getMavenSession(); /** - * @return The archiver configu. + * @return The archiver configuration. */ String getArchiverConfig(); diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/ManifestCreationFinalizer.java b/src/main/java/org/apache/maven/plugins/assembly/archive/ManifestCreationFinalizer.java index 35229818c..c886e4b0f 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/archive/ManifestCreationFinalizer.java +++ b/src/main/java/org/apache/maven/plugins/assembly/archive/ManifestCreationFinalizer.java @@ -38,6 +38,7 @@ import java.io.IOException; import java.io.InputStreamReader; import java.io.Reader; +import java.nio.charset.StandardCharsets; import java.util.Collections; import java.util.List; @@ -84,7 +85,8 @@ public void finalizeArchiveCreation( final Archiver archiver ) Reader manifestFileReader = null; try { - manifestFileReader = new InputStreamReader( new FileInputStream( manifestFile ), "UTF-8" ); + manifestFileReader = new InputStreamReader( new FileInputStream( manifestFile ), + StandardCharsets.UTF_8 ); manifest = new Manifest( manifestFileReader ); manifestFileReader.close(); manifestFileReader = null; diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java index 2f6c805e0..5f6303591 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java +++ b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java @@ -117,10 +117,7 @@ public AssemblyProxyArchiver( final String rootPrefix, final Archiver delegate, if ( extraSelectors != null ) { - for ( final FileSelector selector : extraSelectors ) - { - selectors.add( selector ); - } + selectors.addAll( extraSelectors ); } if ( ( extraFinalizers != null ) && finalizer != null ) diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/AssemblyArchiverPhaseComparator.java b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/AssemblyArchiverPhaseComparator.java index c67153aa9..f796ae408 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/AssemblyArchiverPhaseComparator.java +++ b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/AssemblyArchiverPhaseComparator.java @@ -44,6 +44,6 @@ public int compare( AssemblyArchiverPhase o1, AssemblyArchiverPhase o2 ) { return +1; } - return new Integer( ( (PhaseOrder) o1 ).order() ).compareTo( ( (PhaseOrder) o2 ).order() ); + return Integer.compare( ( (PhaseOrder) o1 ).order(), ( (PhaseOrder) o2 ).order() ); } } diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTask.java b/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTask.java index 3f180357f..f0330bce3 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTask.java +++ b/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTask.java @@ -190,10 +190,10 @@ private boolean isUnpackWithOptions( DependencySet dependencySet ) private boolean unpackTransformsContent( DependencySet dependencySet ) { - return isUnpackWithOptions( dependencySet ) && isConentModifyingOption( dependencySet.getUnpackOptions() ); + return isUnpackWithOptions( dependencySet ) && isContentModifyingOption( dependencySet.getUnpackOptions() ); } - private boolean isConentModifyingOption( UnpackOptions opts ) + private boolean isContentModifyingOption( UnpackOptions opts ) { return ( opts.isFiltered() || opts.getLineEnding() != null ); } diff --git a/src/main/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilter.java b/src/main/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilter.java index 75031ba3a..ba1345b0c 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilter.java +++ b/src/main/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilter.java @@ -203,8 +203,7 @@ public boolean isSelected( @Nonnull final FileInfo fileInfo ) catch ( final XmlPullParserException e ) { final IOException error = - new IOException( "Error finalizing component-set for archive. Reason: " + e.getMessage() ); - error.initCause( e ); + new IOException( "Error finalizing component-set for archive. Reason: " + e.getMessage(), e ); throw error; } diff --git a/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java b/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java index 0c6c9a3d3..a344c1abe 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java +++ b/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java @@ -39,6 +39,7 @@ import java.io.Reader; import java.io.StringWriter; import java.io.Writer; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Collections; import java.util.Date; @@ -110,7 +111,7 @@ private File writePropertiesFile() f.deleteOnExit(); writer = AssemblyFileUtils.isPropertyFile( f ) - ? new OutputStreamWriter( new FileOutputStream( f ), "ISO-8859-1" ) + ? new OutputStreamWriter( new FileOutputStream( f ), StandardCharsets.ISO_8859_1 ) : new OutputStreamWriter( new FileOutputStream( f ) ); // Still platform encoding writer.write( commentChars + " Aggregated on " + new Date() + " from: " ); @@ -196,7 +197,7 @@ private void readProperties( final FileInfo fileInfo ) writer = new StringWriter(); reader = AssemblyFileUtils.isPropertyFile( fileInfo.getName() ) - ? new InputStreamReader( fileInfo.getContents(), "ISO-8859-1" ) + ? new InputStreamReader( fileInfo.getContents(), StandardCharsets.ISO_8859_1 ) : new InputStreamReader( fileInfo.getContents() ); // platform encoding IOUtil.copy( reader, writer ); diff --git a/src/main/java/org/apache/maven/plugins/assembly/format/ReaderFormatter.java b/src/main/java/org/apache/maven/plugins/assembly/format/ReaderFormatter.java index 4120b8bb7..6b50534e1 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/format/ReaderFormatter.java +++ b/src/main/java/org/apache/maven/plugins/assembly/format/ReaderFormatter.java @@ -85,15 +85,13 @@ private static Reader createReaderFilter( @Nonnull Reader source, String escapeS } catch ( MavenFilteringException e ) { - IOException ioe = new IOException( "Error filtering file '" + source + "': " + e.getMessage() ); - ioe.initCause( e ); // plain old Java 5... + IOException ioe = new IOException( "Error filtering file '" + source + "': " + e.getMessage(), e ); throw ioe; } } private static boolean isForbiddenFiletypes( PlexusIoResource plexusIoResource ) - throws IOException { String fileName = plexusIoResource.getName().toLowerCase(); return ( fileName.endsWith( ".zip" ) || fileName.endsWith( ".jar" ) ); diff --git a/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java b/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java index d74da756c..0034e0408 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java +++ b/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java @@ -63,7 +63,7 @@ public abstract class AbstractAssemblyMojo extends AbstractMojo implements AssemblerConfigurationSource { - protected FixedStringSearchInterpolator commanndLinePropertiesInterpolator; + protected FixedStringSearchInterpolator commandLinePropertiesInterpolator; protected FixedStringSearchInterpolator envInterpolator; @@ -888,11 +888,11 @@ public void setDelimiters( List delimiters ) @Nonnull public FixedStringSearchInterpolator getCommandLinePropsInterpolator() { - if ( commanndLinePropertiesInterpolator == null ) + if ( commandLinePropertiesInterpolator == null ) { - this.commanndLinePropertiesInterpolator = createCommandLinePropertiesInterpolator(); + this.commandLinePropertiesInterpolator = createCommandLinePropertiesInterpolator(); } - return commanndLinePropertiesInterpolator; + return commandLinePropertiesInterpolator; } @Override From 8f5c7a0cf19a4e765a6c83bd62f5465abd4b2a20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= Date: Wed, 29 Aug 2018 14:42:27 +0200 Subject: [PATCH 05/24] [MNGSITE-341] use https for sigs, hashes and KEYS --- src/site/xdoc/download.xml.vm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/site/xdoc/download.xml.vm b/src/site/xdoc/download.xml.vm index cf13dc936..7047d2c69 100644 --- a/src/site/xdoc/download.xml.vm +++ b/src/site/xdoc/download.xml.vm @@ -34,7 +34,7 @@ under the License.

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 + 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.

@@ -108,8 +108,8 @@ under the License. ${project.name} ${project.version} (Source zip) maven/plugins/${project.artifactId}-${project.version}-source-release.zip - maven/plugins/${project.artifactId}-${project.version}-source-release.zip.sha1 - maven/plugins/${project.artifactId}-${project.version}-source-release.zip.asc + maven/plugins/${project.artifactId}-${project.version}-source-release.zip.sha1 + maven/plugins/${project.artifactId}-${project.version}-source-release.zip.asc From 68b915827c9465251c38704866e6df707bb2bb58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= Date: Wed, 29 Aug 2018 14:53:27 +0200 Subject: [PATCH 06/24] [MPOM-205] use sha512 checksums instead of sha1 --- src/site/xdoc/download.xml.vm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/site/xdoc/download.xml.vm b/src/site/xdoc/download.xml.vm index 7047d2c69..3f710359a 100644 --- a/src/site/xdoc/download.xml.vm +++ b/src/site/xdoc/download.xml.vm @@ -108,7 +108,7 @@ under the License. ${project.name} ${project.version} (Source zip) maven/plugins/${project.artifactId}-${project.version}-source-release.zip - maven/plugins/${project.artifactId}-${project.version}-source-release.zip.sha1 + maven/plugins/${project.artifactId}-${project.version}-source-release.zip.sha512 maven/plugins/${project.artifactId}-${project.version}-source-release.zip.asc From 81609ea89efa1921f2d33605ac95813b4e8c7d86 Mon Sep 17 00:00:00 2001 From: olivier lamy Date: Fri, 23 Nov 2018 17:42:13 +1000 Subject: [PATCH 07/24] we do not use anymore svn :) Signed-off-by: olivier lamy --- .../maven/plugins/assembly/AssemblerConfigurationSource.java | 2 +- .../assembly/InvalidAssemblerConfigurationException.java | 2 +- .../plugins/assembly/archive/ArchiveCreationException.java | 2 +- .../plugins/assembly/archive/ArchiveExpansionException.java | 2 +- .../maven/plugins/assembly/archive/AssemblyArchiver.java | 2 +- .../plugins/assembly/archive/DefaultAssemblyArchiver.java | 2 +- .../plugins/assembly/archive/ManifestCreationFinalizer.java | 2 +- .../assembly/archive/archiver/AssemblyProxyArchiver.java | 2 +- .../assembly/archive/archiver/PrefixedArchivedFileSet.java | 2 +- .../plugins/assembly/archive/archiver/PrefixedFileSet.java | 2 +- .../plugins/assembly/archive/archiver/SarUnArchiver.java | 2 +- .../plugins/assembly/archive/phase/AssemblyArchiverPhase.java | 2 +- .../assembly/archive/phase/DependencySetAssemblyPhase.java | 2 +- .../plugins/assembly/archive/phase/FileItemAssemblyPhase.java | 2 +- .../plugins/assembly/archive/phase/FileSetAssemblyPhase.java | 2 +- .../assembly/archive/phase/ModuleSetAssemblyPhase.java | 2 +- .../assembly/archive/phase/RepositoryAssemblyPhase.java | 2 +- .../archive/phase/wrappers/GroupVersionAlignmentWrapper.java | 2 +- .../phase/wrappers/RepoBuilderConfigSourceWrapper.java | 2 +- .../assembly/archive/phase/wrappers/RepoInfoWrapper.java | 2 +- .../maven/plugins/assembly/archive/task/AddArtifactTask.java | 2 +- .../plugins/assembly/archive/task/AddDependencySetsTask.java | 2 +- .../maven/plugins/assembly/archive/task/AddDirectoryTask.java | 2 +- .../maven/plugins/assembly/archive/task/AddFileSetsTask.java | 2 +- .../maven/plugins/assembly/archive/task/ArchiverTask.java | 2 +- .../plugins/assembly/artifact/DefaultDependencyResolver.java | 2 +- .../assembly/artifact/DependencyResolutionException.java | 2 +- .../maven/plugins/assembly/artifact/DependencyResolver.java | 4 ++-- .../assembly/filter/ComponentsXmlArchiverFileFilter.java | 2 +- .../plugins/assembly/filter/ContainerDescriptorHandler.java | 2 +- .../assembly/filter/SimpleAggregatingDescriptorHandler.java | 2 +- .../plugins/assembly/format/AssemblyFormattingException.java | 2 +- .../interpolation/AssemblyInterpolationException.java | 2 +- .../plugins/assembly/interpolation/AssemblyInterpolator.java | 2 +- .../maven/plugins/assembly/io/AssemblyReadException.java | 2 +- .../org/apache/maven/plugins/assembly/io/AssemblyReader.java | 2 +- .../maven/plugins/assembly/io/DefaultAssemblyReader.java | 2 +- .../plugins/assembly/io/PrefixedClasspathLocatorStrategy.java | 2 +- .../plugins/assembly/io/RelativeFileLocatorStrategy.java | 2 +- .../maven/plugins/assembly/mojos/AbstractAssemblyMojo.java | 2 +- .../maven/plugins/assembly/mojos/SingleAssemblyMojo.java | 2 +- .../maven/plugins/assembly/utils/AssemblyFileUtils.java | 2 +- .../maven/plugins/assembly/utils/AssemblyFormatUtils.java | 2 +- .../org/apache/maven/plugins/assembly/utils/FilterUtils.java | 2 +- .../org/apache/maven/plugins/assembly/utils/ProjectUtils.java | 2 +- .../maven/plugins/assembly/utils/TypeConversionUtils.java | 2 +- 46 files changed, 47 insertions(+), 47 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/assembly/AssemblerConfigurationSource.java b/src/main/java/org/apache/maven/plugins/assembly/AssemblerConfigurationSource.java index a0230b21c..98fc13792 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/AssemblerConfigurationSource.java +++ b/src/main/java/org/apache/maven/plugins/assembly/AssemblerConfigurationSource.java @@ -31,7 +31,7 @@ import java.util.List; /** - * @version $Id$ + * */ public interface AssemblerConfigurationSource { diff --git a/src/main/java/org/apache/maven/plugins/assembly/InvalidAssemblerConfigurationException.java b/src/main/java/org/apache/maven/plugins/assembly/InvalidAssemblerConfigurationException.java index 2615f47d4..3fe2b14c7 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/InvalidAssemblerConfigurationException.java +++ b/src/main/java/org/apache/maven/plugins/assembly/InvalidAssemblerConfigurationException.java @@ -20,7 +20,7 @@ */ /** - * @version $Id$ + * */ public class InvalidAssemblerConfigurationException extends Exception diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/ArchiveCreationException.java b/src/main/java/org/apache/maven/plugins/assembly/archive/ArchiveCreationException.java index c16747f9b..70079839c 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/archive/ArchiveCreationException.java +++ b/src/main/java/org/apache/maven/plugins/assembly/archive/ArchiveCreationException.java @@ -20,7 +20,7 @@ */ /** - * @version $Id$ + * */ public class ArchiveCreationException extends Exception diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/ArchiveExpansionException.java b/src/main/java/org/apache/maven/plugins/assembly/archive/ArchiveExpansionException.java index f6fff88d1..f3c56ef09 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/archive/ArchiveExpansionException.java +++ b/src/main/java/org/apache/maven/plugins/assembly/archive/ArchiveExpansionException.java @@ -20,7 +20,7 @@ */ /** - * @version $Id$ + * */ public class ArchiveExpansionException extends Exception diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/AssemblyArchiver.java b/src/main/java/org/apache/maven/plugins/assembly/archive/AssemblyArchiver.java index 30458dc86..e8c5c9dcc 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/archive/AssemblyArchiver.java +++ b/src/main/java/org/apache/maven/plugins/assembly/archive/AssemblyArchiver.java @@ -29,7 +29,7 @@ /** * Creates an archive * - * @version $Id$ + * */ public interface AssemblyArchiver { diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiver.java b/src/main/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiver.java index f90292861..8419f3d1e 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiver.java +++ b/src/main/java/org/apache/maven/plugins/assembly/archive/DefaultAssemblyArchiver.java @@ -83,7 +83,7 @@ * interpret the various sections of the assembly descriptor and determine which files to add, and other associated * activities. * - * @version $Id$ + * */ @Component( role = AssemblyArchiver.class, instantiationStrategy = "per-lookup" ) public class DefaultAssemblyArchiver diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/ManifestCreationFinalizer.java b/src/main/java/org/apache/maven/plugins/assembly/archive/ManifestCreationFinalizer.java index c886e4b0f..dbd76276d 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/archive/ManifestCreationFinalizer.java +++ b/src/main/java/org/apache/maven/plugins/assembly/archive/ManifestCreationFinalizer.java @@ -43,7 +43,7 @@ import java.util.List; /** - * @version $Id$ + * */ public class ManifestCreationFinalizer extends AbstractArchiveFinalizer diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java index 5f6303591..7b9a6218d 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java +++ b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java @@ -56,7 +56,7 @@ * * * @author jdcasey - * @version $Id$ + * */ public class AssemblyProxyArchiver implements Archiver diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedArchivedFileSet.java b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedArchivedFileSet.java index 73bfb73ce..bfe122da5 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedArchivedFileSet.java +++ b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedArchivedFileSet.java @@ -26,7 +26,7 @@ import java.io.File; /** - * @version $Id$ + * */ class PrefixedArchivedFileSet implements ArchivedFileSet diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedFileSet.java b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedFileSet.java index 1ceead190..922b29e3a 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedFileSet.java +++ b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedFileSet.java @@ -26,7 +26,7 @@ import java.io.File; /** - * @version $Id$ + * */ class PrefixedFileSet implements FileSet diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/SarUnArchiver.java b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/SarUnArchiver.java index 559aa8bad..343843cda 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/SarUnArchiver.java +++ b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/SarUnArchiver.java @@ -23,7 +23,7 @@ /** * @author jdcasey - * @version $Id$ + * * //todo delete this class once the plexus maven plugin can merge a generated components.xml with an * existing one. */ diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/AssemblyArchiverPhase.java b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/AssemblyArchiverPhase.java index 7de310c96..269e95975 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/AssemblyArchiverPhase.java +++ b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/AssemblyArchiverPhase.java @@ -31,7 +31,7 @@ * Handles one top-level section of the assembly descriptor, to determine which files to include in the assembly archive * for that section. * - * @version $Id$ + * */ public interface AssemblyArchiverPhase { diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/DependencySetAssemblyPhase.java b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/DependencySetAssemblyPhase.java index 40aabe6e9..09e9ff104 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/DependencySetAssemblyPhase.java +++ b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/DependencySetAssemblyPhase.java @@ -44,7 +44,7 @@ /** * Handles the top-level <dependencySets/> section of the assembly descriptor. * - * @version $Id$ + * */ @Component( role = AssemblyArchiverPhase.class, hint = "dependency-sets" ) public class DependencySetAssemblyPhase diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhase.java b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhase.java index 67701a4ed..6246b57ef 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhase.java +++ b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/FileItemAssemblyPhase.java @@ -43,7 +43,7 @@ /** * Handles the top-level <files/> section of the assembly descriptor. * - * @version $Id$ + * */ @Component( role = AssemblyArchiverPhase.class, hint = "file-items" ) public class FileItemAssemblyPhase diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/FileSetAssemblyPhase.java b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/FileSetAssemblyPhase.java index 6d0c661e7..98ce40db3 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/FileSetAssemblyPhase.java +++ b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/FileSetAssemblyPhase.java @@ -35,7 +35,7 @@ /** * Handles the <fileSets/> top-level section of the assembly descriptor. * - * @version $Id$ + * */ @Component( role = AssemblyArchiverPhase.class, hint = "file-sets" ) public class FileSetAssemblyPhase diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhase.java b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhase.java index ed778b3ca..81cf4c700 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhase.java +++ b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhase.java @@ -69,7 +69,7 @@ /** * Handles the <moduleSets/> top-level section of the assembly descriptor. * - * @version $Id$ + * */ @Component( role = AssemblyArchiverPhase.class, hint = "module-sets" ) public class ModuleSetAssemblyPhase diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/RepositoryAssemblyPhase.java b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/RepositoryAssemblyPhase.java index 8799a1feb..d328a9377 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/RepositoryAssemblyPhase.java +++ b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/RepositoryAssemblyPhase.java @@ -43,7 +43,7 @@ import java.util.List; /** - * @version $Id$ + * */ @Component( role = AssemblyArchiverPhase.class, hint = "repositories" ) public class RepositoryAssemblyPhase diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/GroupVersionAlignmentWrapper.java b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/GroupVersionAlignmentWrapper.java index 3fa28a905..51c2009fd 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/GroupVersionAlignmentWrapper.java +++ b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/GroupVersionAlignmentWrapper.java @@ -24,7 +24,7 @@ import java.util.List; /** - * @version $Id$ + * */ class GroupVersionAlignmentWrapper implements org.apache.maven.plugins.assembly.repository.model.GroupVersionAlignment diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/RepoBuilderConfigSourceWrapper.java b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/RepoBuilderConfigSourceWrapper.java index 9940476f4..d5cd4a197 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/RepoBuilderConfigSourceWrapper.java +++ b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/RepoBuilderConfigSourceWrapper.java @@ -26,7 +26,7 @@ import org.apache.maven.project.ProjectBuildingRequest; /** - * @version $Id$ + * */ public class RepoBuilderConfigSourceWrapper implements RepositoryBuilderConfigSource diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/RepoInfoWrapper.java b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/RepoInfoWrapper.java index f606f7bda..eef9a354c 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/RepoInfoWrapper.java +++ b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/RepoInfoWrapper.java @@ -27,7 +27,7 @@ import java.util.List; /** - * @version $Id$ + * */ public class RepoInfoWrapper implements RepositoryInfo diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddArtifactTask.java b/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddArtifactTask.java index 83723d256..408d24d53 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddArtifactTask.java +++ b/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddArtifactTask.java @@ -41,7 +41,7 @@ import java.util.List; /** - * @version $Id$ + * */ public class AddArtifactTask { diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTask.java b/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTask.java index f0330bce3..7346e9023 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTask.java +++ b/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTask.java @@ -55,7 +55,7 @@ import org.codehaus.plexus.logging.Logger; /** - * @version $Id$ + * */ public class AddDependencySetsTask { diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDirectoryTask.java b/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDirectoryTask.java index 749fd424c..591b50069 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDirectoryTask.java +++ b/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddDirectoryTask.java @@ -31,7 +31,7 @@ import java.util.List; /** - * @version $Id$ + * */ public class AddDirectoryTask { diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java b/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java index 7ea776ead..933f3e5ae 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java +++ b/src/main/java/org/apache/maven/plugins/assembly/archive/task/AddFileSetsTask.java @@ -38,7 +38,7 @@ import java.util.List; /** - * @version $Id$ + * */ public class AddFileSetsTask { diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/task/ArchiverTask.java b/src/main/java/org/apache/maven/plugins/assembly/archive/task/ArchiverTask.java index 6c15d5f44..81663343d 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/archive/task/ArchiverTask.java +++ b/src/main/java/org/apache/maven/plugins/assembly/archive/task/ArchiverTask.java @@ -26,7 +26,7 @@ import org.codehaus.plexus.archiver.Archiver; /** - * @version $Id$ + * */ public interface ArchiverTask { diff --git a/src/main/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolver.java b/src/main/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolver.java index 7d224dc9c..d6a833d03 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolver.java +++ b/src/main/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolver.java @@ -41,7 +41,7 @@ /** * @author jdcasey - * @version $Id$ + * */ @Component( role = DependencyResolver.class ) public class DefaultDependencyResolver diff --git a/src/main/java/org/apache/maven/plugins/assembly/artifact/DependencyResolutionException.java b/src/main/java/org/apache/maven/plugins/assembly/artifact/DependencyResolutionException.java index e02f33970..3de98b7c0 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/artifact/DependencyResolutionException.java +++ b/src/main/java/org/apache/maven/plugins/assembly/artifact/DependencyResolutionException.java @@ -20,7 +20,7 @@ */ /** - * @version $Id$ + * */ public class DependencyResolutionException extends Exception diff --git a/src/main/java/org/apache/maven/plugins/assembly/artifact/DependencyResolver.java b/src/main/java/org/apache/maven/plugins/assembly/artifact/DependencyResolver.java index 576ab0a5b..d4d9beaf2 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/artifact/DependencyResolver.java +++ b/src/main/java/org/apache/maven/plugins/assembly/artifact/DependencyResolver.java @@ -33,7 +33,7 @@ * Convenience component that aids in the resolution of dependency artifacts, according to various configurations such * as transitivity flag and scope. * - * @version $Id$ + * */ public interface DependencyResolver { @@ -48,4 +48,4 @@ Map> resolveDependencySets( final Assembly assembly List dependencySets ) throws DependencyResolutionException; -} \ No newline at end of file +} diff --git a/src/main/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilter.java b/src/main/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilter.java index ba1345b0c..a5b33b0e6 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilter.java +++ b/src/main/java/org/apache/maven/plugins/assembly/filter/ComponentsXmlArchiverFileFilter.java @@ -50,7 +50,7 @@ * Components XML file filter. * * @author Brett Porter - * @version $Id$ + * */ @Component( role = ContainerDescriptorHandler.class, hint = "plexus", instantiationStrategy = "per-lookup" ) public class ComponentsXmlArchiverFileFilter diff --git a/src/main/java/org/apache/maven/plugins/assembly/filter/ContainerDescriptorHandler.java b/src/main/java/org/apache/maven/plugins/assembly/filter/ContainerDescriptorHandler.java index 340378af3..be305da63 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/filter/ContainerDescriptorHandler.java +++ b/src/main/java/org/apache/maven/plugins/assembly/filter/ContainerDescriptorHandler.java @@ -23,7 +23,7 @@ import org.codehaus.plexus.components.io.fileselectors.FileSelector; /** - * @version $Id$ + * */ public interface ContainerDescriptorHandler extends ArchiveFinalizer, FileSelector diff --git a/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java b/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java index a344c1abe..3f7bc38f3 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java +++ b/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java @@ -46,7 +46,7 @@ import java.util.List; /** - * @version $Id$ + * */ @Component( role = ContainerDescriptorHandler.class, hint = "file-aggregator", instantiationStrategy = "per-lookup" ) public class SimpleAggregatingDescriptorHandler diff --git a/src/main/java/org/apache/maven/plugins/assembly/format/AssemblyFormattingException.java b/src/main/java/org/apache/maven/plugins/assembly/format/AssemblyFormattingException.java index f83759afa..6346f6a1b 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/format/AssemblyFormattingException.java +++ b/src/main/java/org/apache/maven/plugins/assembly/format/AssemblyFormattingException.java @@ -20,7 +20,7 @@ */ /** - * @version $Id$ + * */ public class AssemblyFormattingException extends Exception diff --git a/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolationException.java b/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolationException.java index 908e93958..fafb82980 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolationException.java +++ b/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolationException.java @@ -20,7 +20,7 @@ */ /** - * @version $Id$ + * */ public class AssemblyInterpolationException extends Exception diff --git a/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolator.java b/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolator.java index 536cafb3b..c74385679 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolator.java +++ b/src/main/java/org/apache/maven/plugins/assembly/interpolation/AssemblyInterpolator.java @@ -39,7 +39,7 @@ import java.util.Set; /** - * @version $Id$ + * */ public class AssemblyInterpolator { diff --git a/src/main/java/org/apache/maven/plugins/assembly/io/AssemblyReadException.java b/src/main/java/org/apache/maven/plugins/assembly/io/AssemblyReadException.java index 57f8d3eb7..abf9de8af 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/io/AssemblyReadException.java +++ b/src/main/java/org/apache/maven/plugins/assembly/io/AssemblyReadException.java @@ -20,7 +20,7 @@ */ /** - * @version $Id$ + * */ public class AssemblyReadException extends Exception diff --git a/src/main/java/org/apache/maven/plugins/assembly/io/AssemblyReader.java b/src/main/java/org/apache/maven/plugins/assembly/io/AssemblyReader.java index 3c9306a07..fe9919219 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/io/AssemblyReader.java +++ b/src/main/java/org/apache/maven/plugins/assembly/io/AssemblyReader.java @@ -28,7 +28,7 @@ import java.util.List; /** - * @version $Id$ + * */ public interface AssemblyReader { diff --git a/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java b/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java index ab2047756..2b695c79b 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java +++ b/src/main/java/org/apache/maven/plugins/assembly/io/DefaultAssemblyReader.java @@ -70,7 +70,7 @@ import java.util.Set; /** - * @version $Id$ + * */ @org.codehaus.plexus.component.annotations.Component( role = AssemblyReader.class ) public class DefaultAssemblyReader diff --git a/src/main/java/org/apache/maven/plugins/assembly/io/PrefixedClasspathLocatorStrategy.java b/src/main/java/org/apache/maven/plugins/assembly/io/PrefixedClasspathLocatorStrategy.java index 96be53e7d..f6f9cb4b1 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/io/PrefixedClasspathLocatorStrategy.java +++ b/src/main/java/org/apache/maven/plugins/assembly/io/PrefixedClasspathLocatorStrategy.java @@ -24,7 +24,7 @@ import org.apache.maven.shared.io.logging.MessageHolder; /** - * @version $Id$ + * */ class PrefixedClasspathLocatorStrategy extends ClasspathResourceLocatorStrategy diff --git a/src/main/java/org/apache/maven/plugins/assembly/io/RelativeFileLocatorStrategy.java b/src/main/java/org/apache/maven/plugins/assembly/io/RelativeFileLocatorStrategy.java index 42cc39ac1..b0062ba40 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/io/RelativeFileLocatorStrategy.java +++ b/src/main/java/org/apache/maven/plugins/assembly/io/RelativeFileLocatorStrategy.java @@ -27,7 +27,7 @@ import java.io.File; /** - * @version $Id$ + * */ class RelativeFileLocatorStrategy implements LocatorStrategy diff --git a/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java b/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java index 0034e0408..f6a525f4c 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java +++ b/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java @@ -56,7 +56,7 @@ /** * @author Brett Porter * @author Vincent Siveton - * @version $Id$ + * * @threadSafe */ public abstract class AbstractAssemblyMojo diff --git a/src/main/java/org/apache/maven/plugins/assembly/mojos/SingleAssemblyMojo.java b/src/main/java/org/apache/maven/plugins/assembly/mojos/SingleAssemblyMojo.java index 2e33b908c..9628cdc04 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/mojos/SingleAssemblyMojo.java +++ b/src/main/java/org/apache/maven/plugins/assembly/mojos/SingleAssemblyMojo.java @@ -39,7 +39,7 @@ * * @author John Casey * @author Brett Porter - * @version $Id$ + * */ @Mojo( name = "single", inheritByDefault = false, requiresDependencyResolution = ResolutionScope.TEST, threadSafe = true ) diff --git a/src/main/java/org/apache/maven/plugins/assembly/utils/AssemblyFileUtils.java b/src/main/java/org/apache/maven/plugins/assembly/utils/AssemblyFileUtils.java index 7b10446bd..0874d3957 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/utils/AssemblyFileUtils.java +++ b/src/main/java/org/apache/maven/plugins/assembly/utils/AssemblyFileUtils.java @@ -26,7 +26,7 @@ import java.util.Locale; /** - * @version $Id$ + * */ public final class AssemblyFileUtils { diff --git a/src/main/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtils.java b/src/main/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtils.java index 3777d78f5..959312847 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtils.java +++ b/src/main/java/org/apache/maven/plugins/assembly/utils/AssemblyFormatUtils.java @@ -42,7 +42,7 @@ import java.util.Properties; /** - * @version $Id$ + * */ public final class AssemblyFormatUtils { diff --git a/src/main/java/org/apache/maven/plugins/assembly/utils/FilterUtils.java b/src/main/java/org/apache/maven/plugins/assembly/utils/FilterUtils.java index a99c4d267..df4ee99d7 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/utils/FilterUtils.java +++ b/src/main/java/org/apache/maven/plugins/assembly/utils/FilterUtils.java @@ -41,7 +41,7 @@ import org.codehaus.plexus.logging.Logger; /** - * @version $Id$ + * */ public final class FilterUtils { diff --git a/src/main/java/org/apache/maven/plugins/assembly/utils/ProjectUtils.java b/src/main/java/org/apache/maven/plugins/assembly/utils/ProjectUtils.java index c9a682148..e420a825f 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/utils/ProjectUtils.java +++ b/src/main/java/org/apache/maven/plugins/assembly/utils/ProjectUtils.java @@ -34,7 +34,7 @@ import java.util.Set; /** - * @version $Id$ + * */ public final class ProjectUtils { diff --git a/src/main/java/org/apache/maven/plugins/assembly/utils/TypeConversionUtils.java b/src/main/java/org/apache/maven/plugins/assembly/utils/TypeConversionUtils.java index 60803329b..a73a0b251 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/utils/TypeConversionUtils.java +++ b/src/main/java/org/apache/maven/plugins/assembly/utils/TypeConversionUtils.java @@ -25,7 +25,7 @@ import java.util.List; /** - * @version $Id$ + * */ public final class TypeConversionUtils { From eb1cab954ff2a404beca9b5c86301eb426c6ed30 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Fri, 7 Dec 2018 16:00:50 +1000 Subject: [PATCH 08/24] [MASSEMBLY-898] upgrade to plexus-io 3.1.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4ceaf284a..efb0b5677 100644 --- a/pom.xml +++ b/pom.xml @@ -163,7 +163,7 @@ under the License. org.codehaus.plexus plexus-io - 3.0.0 + 3.1.1 org.apache.maven From 23eb9ac83d0e4dff5685a03cbb2108d80c8c06a8 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Fri, 7 Dec 2018 16:05:37 +1000 Subject: [PATCH 09/24] use asfMavenTlpPlgnBuild --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 09ac70f12..e9f05f7d9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,4 +17,4 @@ * under the License. */ -asfMavenTlpStdBuild() +asfMavenTlpPlgnBuild() From e9bee6683a1cd83d0e884c83319b6b25292326e2 Mon Sep 17 00:00:00 2001 From: olivier lamy Date: Fri, 7 Dec 2018 20:45:15 +1000 Subject: [PATCH 10/24] use https.protocol for 1.7 build Signed-off-by: olivier lamy --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index efb0b5677..a3f439774 100644 --- a/pom.xml +++ b/pom.xml @@ -389,6 +389,8 @@ under the License. ${useJvmChmod} ${testVersion} + + ${https.protocols} true From 6b3b67ab112fdf650c5dc4a3183806946ccf7a3e Mon Sep 17 00:00:00 2001 From: olivier lamy Date: Sat, 8 Dec 2018 19:59:11 +1000 Subject: [PATCH 11/24] fix it directory test... and use try-resources Signed-off-by: olivier lamy --- .../verify.bsh | 4 +-- .../SimpleAggregatingDescriptorHandler.java | 25 +++---------------- 2 files changed, 6 insertions(+), 23 deletions(-) diff --git a/src/it/projects/container-descriptors/custom-handler-withMixedEntries/verify.bsh b/src/it/projects/container-descriptors/custom-handler-withMixedEntries/verify.bsh index b531e3300..d38058169 100644 --- a/src/it/projects/container-descriptors/custom-handler-withMixedEntries/verify.bsh +++ b/src/it/projects/container-descriptors/custom-handler-withMixedEntries/verify.bsh @@ -23,8 +23,8 @@ boolean result = true; try { - File a = new File( basedir, "target/its/target/assembly-1-bin/file.txt"); - File b = new File( basedir, "target/its/target/assembly-1-bin/b/file.txt"); + File a = new File( basedir, "assembly/target/assembly-1-bin/file.txt"); + File b = new File( basedir, "assembly/target/assembly-1-bin/b/file.txt"); if(result && !a.exists() ) { System.out.println( "File: " + a + " should have been generated, but was not." ); diff --git a/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java b/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java index 3f7bc38f3..ff39122c4 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java +++ b/src/main/java/org/apache/maven/plugins/assembly/filter/SimpleAggregatingDescriptorHandler.java @@ -190,33 +190,16 @@ private void checkConfig() private void readProperties( final FileInfo fileInfo ) throws IOException { - Reader reader = null; - StringWriter writer = null; - try + try ( StringWriter writer = new StringWriter(); + Reader reader = AssemblyFileUtils.isPropertyFile( fileInfo.getName() ) + ? new InputStreamReader( fileInfo.getContents(), StandardCharsets.ISO_8859_1 ) + : new InputStreamReader( fileInfo.getContents() ) ) // platform encoding { - writer = new StringWriter(); - - reader = AssemblyFileUtils.isPropertyFile( fileInfo.getName() ) - ? new InputStreamReader( fileInfo.getContents(), StandardCharsets.ISO_8859_1 ) - : new InputStreamReader( fileInfo.getContents() ); // platform encoding - IOUtil.copy( reader, writer ); - - writer.close(); final String content = writer.toString(); - writer = null; - - reader.close(); - reader = null; - aggregateWriter.write( "\n" ); aggregateWriter.write( content ); } - finally - { - IOUtil.close( writer ); - IOUtil.close( reader ); - } } protected final Logger getLogger() From 6ad45c8814b7e121156748ab2670afbd67c9f92f Mon Sep 17 00:00:00 2001 From: olivier lamy Date: Sat, 8 Dec 2018 20:37:50 +1000 Subject: [PATCH 12/24] fix directories..... Signed-off-by: olivier lamy --- .../custom-containerDescriptorHandler/verify.bsh | 4 ++-- .../custom-handler-withFileEntries/verify.bsh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/it/projects/container-descriptors/custom-containerDescriptorHandler/verify.bsh b/src/it/projects/container-descriptors/custom-containerDescriptorHandler/verify.bsh index b531e3300..d38058169 100644 --- a/src/it/projects/container-descriptors/custom-containerDescriptorHandler/verify.bsh +++ b/src/it/projects/container-descriptors/custom-containerDescriptorHandler/verify.bsh @@ -23,8 +23,8 @@ boolean result = true; try { - File a = new File( basedir, "target/its/target/assembly-1-bin/file.txt"); - File b = new File( basedir, "target/its/target/assembly-1-bin/b/file.txt"); + File a = new File( basedir, "assembly/target/assembly-1-bin/file.txt"); + File b = new File( basedir, "assembly/target/assembly-1-bin/b/file.txt"); if(result && !a.exists() ) { System.out.println( "File: " + a + " should have been generated, but was not." ); diff --git a/src/it/projects/container-descriptors/custom-handler-withFileEntries/verify.bsh b/src/it/projects/container-descriptors/custom-handler-withFileEntries/verify.bsh index b531e3300..d38058169 100644 --- a/src/it/projects/container-descriptors/custom-handler-withFileEntries/verify.bsh +++ b/src/it/projects/container-descriptors/custom-handler-withFileEntries/verify.bsh @@ -23,8 +23,8 @@ boolean result = true; try { - File a = new File( basedir, "target/its/target/assembly-1-bin/file.txt"); - File b = new File( basedir, "target/its/target/assembly-1-bin/b/file.txt"); + File a = new File( basedir, "assembly/target/assembly-1-bin/file.txt"); + File b = new File( basedir, "assembly/target/assembly-1-bin/b/file.txt"); if(result && !a.exists() ) { System.out.println( "File: " + a + " should have been generated, but was not." ); From c4be15e869fcc09b4e40a358920f73aa37a34f08 Mon Sep 17 00:00:00 2001 From: olivier lamy Date: Sun, 23 Dec 2018 10:06:08 +1000 Subject: [PATCH 13/24] [MASSEMBLY-899] Make deprecated and non used of parameter useJvmChmod parameter (plugin is now 1.7) Signed-off-by: olivier lamy --- .../maven/plugins/assembly/mojos/AbstractAssemblyMojo.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java b/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java index f6a525f4c..bde09fd8b 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java +++ b/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java @@ -346,11 +346,7 @@ public abstract class AbstractAssemblyMojo private boolean updateOnly; /** - *

- * will use the jvm chmod, this is available for user and all level group level will be ignored As of - * assembly-plugin 2.5, this flag is ignored for users of java7+ - *

- * + * @deprecated Not used anymore and will be removed in future version * @since 2.2 */ @Parameter( property = "assembly.useJvmChmod", defaultValue = "false" ) @@ -840,6 +836,7 @@ public boolean isUpdateOnly() } @Override + @Deprecated public boolean isUseJvmChmod() { return useJvmChmod; From 1bfc69e6e8cc0b020b87fa6abfe97f599e99defb Mon Sep 17 00:00:00 2001 From: olivier lamy Date: Sun, 23 Dec 2018 10:42:04 +1000 Subject: [PATCH 14/24] useJvmChmod not used anymore Signed-off-by: olivier lamy --- pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/pom.xml b/pom.xml index a3f439774..50f7e93e9 100644 --- a/pom.xml +++ b/pom.xml @@ -377,7 +377,6 @@ under the License. file://${project.build.testOutputDirectory}/remote-repository false ${project.version} - false @@ -387,7 +386,6 @@ under the License. maven-invoker-plugin - ${useJvmChmod} ${testVersion} ${https.protocols} From 01b305de161f97972008df7b9841f15094bf7cb9 Mon Sep 17 00:00:00 2001 From: rfscholte Date: Wed, 26 Dec 2018 11:08:15 +0100 Subject: [PATCH 15/24] Integration test maintainance: - Update maven-surefire-plugin, older versions have trouble with long paths on Windows - Rewrite verify.bsh to verify.groovy for better feedback to console - Remove invoker.properties that contain only contain the default goal (package) - Use latest maven-invoker-plugin + cleanup configuration - Don't use maven-invoker-plugin in ITs --- Jenkinsfile | 2 +- pom.xml | 5 +- src/it/it-project-parent/pom.xml | 34 +++++--- .../bugs/massembly-190/invoker.properties | 18 ----- .../bugs/massembly-285/invoker.properties | 18 ----- .../bugs/massembly-306/invoker.properties | 18 ----- .../bugs/massembly-375/invoker.properties | 18 ----- .../handler-def/pom.xml | 8 -- .../invoker.properties | 5 +- .../custom-containerDescriptorHandler/pom.xml | 46 +---------- .../handler-def/pom.xml | 8 -- .../invoker.properties | 5 +- .../custom-handler-withFileEntries/pom.xml | 43 ---------- .../handler-def/pom.xml | 8 -- .../invoker.properties | 6 +- .../custom-handler-withMixedEntries/pom.xml | 43 ---------- .../invoker.properties | 18 ----- .../invoker.properties | 18 ----- .../invoker.properties | 18 ----- .../invoker.properties | 18 ----- .../invoker.properties | 18 ----- .../invoker.properties | 18 ----- .../invoker.properties | 18 ----- .../invoker.properties | 18 ----- .../dependencySet-unpacked/invoker.properties | 18 ----- .../invoker.properties | 18 ----- .../invoker.properties | 18 ----- .../invoker.properties | 18 ----- .../invoker.properties | 18 ----- .../invoker.properties | 18 ----- .../include-provided/invoker.properties | 18 ----- .../massembly-201/invoker.properties | 18 ----- .../massembly-232/invoker.properties | 18 ----- .../massembly-235/invoker.properties | 18 ----- .../massembly-345/invoker.properties | 18 ----- .../massembly-619/invoker.properties | 18 ----- .../massembly-99/invoker.properties | 18 ----- .../invoker.properties | 18 ----- .../invoker.properties | 18 ----- .../invoker.properties | 18 ----- .../invoker.properties | 18 ----- .../invoker.properties | 18 ----- .../jars-in-archive-root/invoker.properties | 18 ----- .../invoker.properties | 18 ----- .../component-descriptors-merged/verify.bsh | 79 ------------------- .../verify.groovy | 56 +++++++++++++ .../invoker.properties | 18 ----- .../deps-unpacked-to-root-dir/verify.bsh | 73 ----------------- .../deps-unpacked-to-root-dir/verify.groovy | 46 +++++++++++ .../no-target-dir/invoker.properties | 18 ----- .../invoker.properties | 18 ----- .../invoker.properties | 18 ----- .../project/no-target-dir/invoker.properties | 18 ----- .../project/sources-copied/invoker.properties | 18 ----- .../src/no-target-dir/invoker.properties | 18 ----- .../src/src-dir-copied/invoker.properties | 18 ----- .../excludes-using-regex/invoker.properties | 18 ----- .../invoker.properties | 18 ----- .../filtered-multimodule/invoker.properties | 18 ----- .../include-parent-dir/invoker.properties | 18 ----- .../invoker.properties | 18 ----- .../invoker.properties | 18 ----- .../invoker.properties | 18 ----- .../invoker.properties | 17 ---- .../massembly-736/invoker.properties | 17 ---- .../invoker.properties | 18 ----- .../invoker.properties | 18 ----- .../invoker.properties | 18 ----- .../invoker.properties | 18 ----- .../invoker.properties | 18 ----- .../invoker.properties | 18 ----- .../invoker.properties | 18 ----- .../invoker.properties | 18 ----- .../invoker.properties | 18 ----- .../invoker.properties | 18 ----- .../massembly-298/invoker.properties | 18 ----- .../massembly-474/invoker.properties | 18 ----- .../massembly-619/invoker.properties | 18 ----- .../invoker.properties | 18 ----- .../invoker.properties | 18 ----- .../invoker.properties | 18 ----- .../two-level-multimodule/invoker.properties | 18 ----- .../{verify.bsh => verify.groovy} | 20 +---- .../invoker.properties | 18 ----- .../{verify.bsh => verify.groovy} | 14 +--- .../invoker.properties | 18 ----- .../{verify.bsh => verify.groovy} | 18 ++--- .../basic-repository/invoker.properties | 18 ----- .../massembly-196/invoker.properties | 18 ----- .../massembly-855/invoker.properties | 18 ----- .../invoker.properties | 18 ----- 91 files changed, 151 insertions(+), 1662 deletions(-) delete mode 100644 src/it/projects/bugs/massembly-190/invoker.properties delete mode 100644 src/it/projects/bugs/massembly-285/invoker.properties delete mode 100644 src/it/projects/bugs/massembly-306/invoker.properties delete mode 100644 src/it/projects/bugs/massembly-375/invoker.properties delete mode 100644 src/it/projects/container-descriptors/metaInf-services-aggregation/invoker.properties delete mode 100644 src/it/projects/container-descriptors/metaInf-spring-aggregation/invoker.properties delete mode 100644 src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/invoker.properties delete mode 100644 src/it/projects/dependency-sets/dep-with-transitive-filter/invoker.properties delete mode 100644 src/it/projects/dependency-sets/depSet-transFromProfile/invoker.properties delete mode 100644 src/it/projects/dependency-sets/dependencySet-matchScope/invoker.properties delete mode 100644 src/it/projects/dependency-sets/dependencySet-nonTransitive/invoker.properties delete mode 100644 src/it/projects/dependency-sets/dependencySet-notUnpacked/invoker.properties delete mode 100644 src/it/projects/dependency-sets/dependencySet-unpacked/invoker.properties delete mode 100644 src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/invoker.properties delete mode 100644 src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/invoker.properties delete mode 100644 src/it/projects/dependency-sets/dependencySet-withExecutedProject/invoker.properties delete mode 100644 src/it/projects/dependency-sets/include-project-artifact/invoker.properties delete mode 100644 src/it/projects/dependency-sets/include-project-attachments/invoker.properties delete mode 100644 src/it/projects/dependency-sets/include-provided/invoker.properties delete mode 100644 src/it/projects/dependency-sets/massembly-201/invoker.properties delete mode 100644 src/it/projects/dependency-sets/massembly-232/invoker.properties delete mode 100644 src/it/projects/dependency-sets/massembly-235/invoker.properties delete mode 100644 src/it/projects/dependency-sets/massembly-345/invoker.properties delete mode 100644 src/it/projects/dependency-sets/massembly-619/invoker.properties delete mode 100644 src/it/projects/dependency-sets/massembly-99/invoker.properties delete mode 100644 src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/invoker.properties delete mode 100644 src/it/projects/dependency-sets/multiple-wildcard-includes/invoker.properties delete mode 100644 src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/invoker.properties delete mode 100644 src/it/projects/dependency-sets/unpack-deps-correct-dir/invoker.properties delete mode 100644 src/it/projects/dependency-sets/using-moduleSet-implied-depSet/invoker.properties delete mode 100644 src/it/projects/descriptor-refs/bin/jars-in-archive-root/invoker.properties delete mode 100644 src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/invoker.properties delete mode 100644 src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/verify.bsh create mode 100644 src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/verify.groovy delete mode 100644 src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/invoker.properties delete mode 100644 src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/verify.bsh create mode 100644 src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/verify.groovy delete mode 100644 src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/invoker.properties delete mode 100644 src/it/projects/descriptor-refs/project/multimodule-sources-copied/invoker.properties delete mode 100644 src/it/projects/descriptor-refs/project/no-target-dir-multimodule/invoker.properties delete mode 100644 src/it/projects/descriptor-refs/project/no-target-dir/invoker.properties delete mode 100644 src/it/projects/descriptor-refs/project/sources-copied/invoker.properties delete mode 100644 src/it/projects/descriptor-refs/src/no-target-dir/invoker.properties delete mode 100644 src/it/projects/descriptor-refs/src/src-dir-copied/invoker.properties delete mode 100644 src/it/projects/file-sets/excludes-using-regex/invoker.properties delete mode 100644 src/it/projects/file-sets/filtered-module-sources/invoker.properties delete mode 100644 src/it/projects/file-sets/filtered-multimodule/invoker.properties delete mode 100644 src/it/projects/file-sets/include-parent-dir/invoker.properties delete mode 100644 src/it/projects/file-sets/multimodule-unix-lineEndings/invoker.properties delete mode 100644 src/it/projects/file-sets/multimodule-win-lineEndings/invoker.properties delete mode 100644 src/it/projects/filtering-feature/fileset-to-tar-massembly-722/invoker.properties delete mode 100644 src/it/projects/filtering-feature/filters-defined-in-build/invoker.properties delete mode 100644 src/it/projects/filtering-feature/massembly-736/invoker.properties delete mode 100644 src/it/projects/forking-tests/assembly-assembly-with-module-binaries/invoker.properties delete mode 100644 src/it/projects/forking-tests/assembly-attached-with-module-binaries/invoker.properties delete mode 100644 src/it/projects/mojo-configuration/ignoreDirFormatExtensions/invoker.properties delete mode 100644 src/it/projects/mojo-configuration/manifest-with-customEntry/invoker.properties delete mode 100644 src/it/projects/mojo-configuration/manifest-with-mainClass/invoker.properties delete mode 100644 src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/invoker.properties delete mode 100644 src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/invoker.properties delete mode 100644 src/it/projects/mojo-tests/single-in-one-project-hierarchy/invoker.properties delete mode 100644 src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/invoker.properties delete mode 100644 src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/invoker.properties delete mode 100644 src/it/projects/multimodule/massembly-298/invoker.properties delete mode 100644 src/it/projects/multimodule/massembly-474/invoker.properties delete mode 100644 src/it/projects/multimodule/massembly-619/invoker.properties delete mode 100644 src/it/projects/multimodule/multimodule-binariesNotSource/invoker.properties delete mode 100644 src/it/projects/multimodule/multimodule-sourceNotBinaries/invoker.properties delete mode 100644 src/it/projects/multimodule/multimodule-wholeReactorFromChild/invoker.properties delete mode 100644 src/it/projects/multimodule/two-level-multimodule/invoker.properties rename src/it/projects/multimodule/two-level-multimodule/{verify.bsh => verify.groovy} (63%) delete mode 100644 src/it/projects/multimodule/two-levels-includeBaseDir-withBin/invoker.properties rename src/it/projects/multimodule/two-levels-includeBaseDir-withBin/{verify.bsh => verify.groovy} (72%) delete mode 100644 src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/invoker.properties rename src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/{verify.bsh => verify.groovy} (66%) delete mode 100644 src/it/projects/repositories/basic-repository/invoker.properties delete mode 100644 src/it/projects/repositories/massembly-196/invoker.properties delete mode 100644 src/it/projects/repositories/massembly-855/invoker.properties delete mode 100644 src/it/projects/repositories/repo-with-snapshot-parents/invoker.properties diff --git a/Jenkinsfile b/Jenkinsfile index e9f05f7d9..261d8bb13 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,4 +17,4 @@ * under the License. */ -asfMavenTlpPlgnBuild() +asfMavenTlpPlgnBuild(tmpWs:true) diff --git a/pom.xml b/pom.xml index 50f7e93e9..81a02463b 100644 --- a/pom.xml +++ b/pom.xml @@ -375,7 +375,6 @@ under the License. file://${project.build.testOutputDirectory}/remote-repository - false ${project.version} @@ -384,6 +383,7 @@ under the License. org.apache.maven.plugins maven-invoker-plugin + 3.1.0 ${testVersion} @@ -396,8 +396,6 @@ under the License. integration-test - true - test.properties it-project-parent/pom.xml @@ -406,7 +404,6 @@ under the License. projects/descriptor-refs/*/*/pom.xml projects/multimodule/multimodule-siblingParent/parent/pom.xml - ${it.streamLogs} projects/repositories/repo-with-snapshot-parents/pom.xml projects/dependency-sets/depSet-transFromProfile/pom.xml diff --git a/src/it/it-project-parent/pom.xml b/src/it/it-project-parent/pom.xml index 144de8cc1..45731dbcf 100644 --- a/src/it/it-project-parent/pom.xml +++ b/src/it/it-project-parent/pom.xml @@ -24,6 +24,28 @@ under the License. it-project-parent pom 1 + + + + + + org.apache.maven.plugins + maven-assembly-plugin + @project.version@ + + + org.apache.maven.plugins + maven-jar-plugin + 3.1.1 + + + org.apache.maven.plugins + maven-surefire-plugin + 2.22.1 + + + + @@ -65,18 +87,6 @@ under the License. - - - - maven-assembly-plugin - ${testVersion} - - - maven-jar-plugin - 2.6 - - - live diff --git a/src/it/projects/bugs/massembly-190/invoker.properties b/src/it/projects/bugs/massembly-190/invoker.properties deleted file mode 100644 index 3376b9e49..000000000 --- a/src/it/projects/bugs/massembly-190/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=clean install diff --git a/src/it/projects/bugs/massembly-285/invoker.properties b/src/it/projects/bugs/massembly-285/invoker.properties deleted file mode 100644 index f902e50d8..000000000 --- a/src/it/projects/bugs/massembly-285/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=install diff --git a/src/it/projects/bugs/massembly-306/invoker.properties b/src/it/projects/bugs/massembly-306/invoker.properties deleted file mode 100644 index c743aa4f3..000000000 --- a/src/it/projects/bugs/massembly-306/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=clean package diff --git a/src/it/projects/bugs/massembly-375/invoker.properties b/src/it/projects/bugs/massembly-375/invoker.properties deleted file mode 100644 index c743aa4f3..000000000 --- a/src/it/projects/bugs/massembly-375/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=clean package diff --git a/src/it/projects/container-descriptors/custom-containerDescriptorHandler/handler-def/pom.xml b/src/it/projects/container-descriptors/custom-containerDescriptorHandler/handler-def/pom.xml index 5c645351c..7cd959a29 100644 --- a/src/it/projects/container-descriptors/custom-containerDescriptorHandler/handler-def/pom.xml +++ b/src/it/projects/container-descriptors/custom-containerDescriptorHandler/handler-def/pom.xml @@ -26,12 +26,4 @@ under the License. 1 handler-def - - - org.apache.maven.plugins - maven-assembly-plugin - ${testVersion} - provided - - diff --git a/src/it/projects/container-descriptors/custom-containerDescriptorHandler/invoker.properties b/src/it/projects/container-descriptors/custom-containerDescriptorHandler/invoker.properties index f902e50d8..649f9c8b6 100644 --- a/src/it/projects/container-descriptors/custom-containerDescriptorHandler/invoker.properties +++ b/src/it/projects/container-descriptors/custom-containerDescriptorHandler/invoker.properties @@ -14,5 +14,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +invoker.project.1=handler-def +invoker.goals.1=install -invoker.goals=install +invoker.project.2=assembly +invoker.goals.2=package diff --git a/src/it/projects/container-descriptors/custom-containerDescriptorHandler/pom.xml b/src/it/projects/container-descriptors/custom-containerDescriptorHandler/pom.xml index 692f872b0..03b85e40b 100644 --- a/src/it/projects/container-descriptors/custom-containerDescriptorHandler/pom.xml +++ b/src/it/projects/container-descriptors/custom-containerDescriptorHandler/pom.xml @@ -31,49 +31,5 @@ under the License. custom-containerDescriptorHandler pom 1 - custom-containerDescriptorHandler - - - - - maven-invoker-plugin - - - true - ${localRepositoryPath} - - ${testVersion} - - true - - install - - - - - - handler-build - package - - run - - - handler-def/pom.xml - - - - assembly-build - package - - run - - - true - assembly/pom.xml - - - - - - + diff --git a/src/it/projects/container-descriptors/custom-handler-withFileEntries/handler-def/pom.xml b/src/it/projects/container-descriptors/custom-handler-withFileEntries/handler-def/pom.xml index 5c645351c..7cd959a29 100644 --- a/src/it/projects/container-descriptors/custom-handler-withFileEntries/handler-def/pom.xml +++ b/src/it/projects/container-descriptors/custom-handler-withFileEntries/handler-def/pom.xml @@ -26,12 +26,4 @@ under the License. 1 handler-def - - - org.apache.maven.plugins - maven-assembly-plugin - ${testVersion} - provided - - diff --git a/src/it/projects/container-descriptors/custom-handler-withFileEntries/invoker.properties b/src/it/projects/container-descriptors/custom-handler-withFileEntries/invoker.properties index f902e50d8..649f9c8b6 100644 --- a/src/it/projects/container-descriptors/custom-handler-withFileEntries/invoker.properties +++ b/src/it/projects/container-descriptors/custom-handler-withFileEntries/invoker.properties @@ -14,5 +14,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +invoker.project.1=handler-def +invoker.goals.1=install -invoker.goals=install +invoker.project.2=assembly +invoker.goals.2=package diff --git a/src/it/projects/container-descriptors/custom-handler-withFileEntries/pom.xml b/src/it/projects/container-descriptors/custom-handler-withFileEntries/pom.xml index 91fea383e..6b03541b4 100644 --- a/src/it/projects/container-descriptors/custom-handler-withFileEntries/pom.xml +++ b/src/it/projects/container-descriptors/custom-handler-withFileEntries/pom.xml @@ -33,47 +33,4 @@ under the License. 1 custom-handler-withFileEntries - - - - maven-invoker-plugin - - - true - ${localRepositoryPath} - true - - ${testVersion} - - - install - - - - - - handler-build - package - - run - - - handler-def/pom.xml - - - - assembly-build - package - - run - - - true - assembly/pom.xml - - - - - - diff --git a/src/it/projects/container-descriptors/custom-handler-withMixedEntries/handler-def/pom.xml b/src/it/projects/container-descriptors/custom-handler-withMixedEntries/handler-def/pom.xml index 5c645351c..7cd959a29 100644 --- a/src/it/projects/container-descriptors/custom-handler-withMixedEntries/handler-def/pom.xml +++ b/src/it/projects/container-descriptors/custom-handler-withMixedEntries/handler-def/pom.xml @@ -26,12 +26,4 @@ under the License. 1 handler-def - - - org.apache.maven.plugins - maven-assembly-plugin - ${testVersion} - provided - - diff --git a/src/it/projects/container-descriptors/custom-handler-withMixedEntries/invoker.properties b/src/it/projects/container-descriptors/custom-handler-withMixedEntries/invoker.properties index f902e50d8..91a7b514d 100644 --- a/src/it/projects/container-descriptors/custom-handler-withMixedEntries/invoker.properties +++ b/src/it/projects/container-descriptors/custom-handler-withMixedEntries/invoker.properties @@ -14,5 +14,9 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +invoker.project.1=handler-def +invoker.goals.1=install + +invoker.project.2=assembly +invoker.goals.2=package -invoker.goals=install diff --git a/src/it/projects/container-descriptors/custom-handler-withMixedEntries/pom.xml b/src/it/projects/container-descriptors/custom-handler-withMixedEntries/pom.xml index a8dd79fd9..4269f7016 100644 --- a/src/it/projects/container-descriptors/custom-handler-withMixedEntries/pom.xml +++ b/src/it/projects/container-descriptors/custom-handler-withMixedEntries/pom.xml @@ -33,47 +33,4 @@ under the License. 1 custom-handler-withMixedEntries - - - - maven-invoker-plugin - - - true - ${localRepositoryPath} - - ${testVersion} - - true - - install - - - - - - handler-build - package - - run - - - handler-def/pom.xml - - - - assembly-build - package - - run - - - true - assembly/pom.xml - - - - - - diff --git a/src/it/projects/container-descriptors/metaInf-services-aggregation/invoker.properties b/src/it/projects/container-descriptors/metaInf-services-aggregation/invoker.properties deleted file mode 100644 index 4b2a3ba6c..000000000 --- a/src/it/projects/container-descriptors/metaInf-services-aggregation/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=package diff --git a/src/it/projects/container-descriptors/metaInf-spring-aggregation/invoker.properties b/src/it/projects/container-descriptors/metaInf-spring-aggregation/invoker.properties deleted file mode 100644 index 4b2a3ba6c..000000000 --- a/src/it/projects/container-descriptors/metaInf-spring-aggregation/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=package diff --git a/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/invoker.properties b/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/invoker.properties deleted file mode 100644 index c743aa4f3..000000000 --- a/src/it/projects/dependency-sets/dep-transfilter-wildcard-massembly544/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=clean package diff --git a/src/it/projects/dependency-sets/dep-with-transitive-filter/invoker.properties b/src/it/projects/dependency-sets/dep-with-transitive-filter/invoker.properties deleted file mode 100644 index c743aa4f3..000000000 --- a/src/it/projects/dependency-sets/dep-with-transitive-filter/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=clean package diff --git a/src/it/projects/dependency-sets/depSet-transFromProfile/invoker.properties b/src/it/projects/dependency-sets/depSet-transFromProfile/invoker.properties deleted file mode 100644 index 4b2a3ba6c..000000000 --- a/src/it/projects/dependency-sets/depSet-transFromProfile/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=package diff --git a/src/it/projects/dependency-sets/dependencySet-matchScope/invoker.properties b/src/it/projects/dependency-sets/dependencySet-matchScope/invoker.properties deleted file mode 100644 index 4b2a3ba6c..000000000 --- a/src/it/projects/dependency-sets/dependencySet-matchScope/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=package diff --git a/src/it/projects/dependency-sets/dependencySet-nonTransitive/invoker.properties b/src/it/projects/dependency-sets/dependencySet-nonTransitive/invoker.properties deleted file mode 100644 index 4b2a3ba6c..000000000 --- a/src/it/projects/dependency-sets/dependencySet-nonTransitive/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=package diff --git a/src/it/projects/dependency-sets/dependencySet-notUnpacked/invoker.properties b/src/it/projects/dependency-sets/dependencySet-notUnpacked/invoker.properties deleted file mode 100644 index 4b2a3ba6c..000000000 --- a/src/it/projects/dependency-sets/dependencySet-notUnpacked/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=package diff --git a/src/it/projects/dependency-sets/dependencySet-unpacked/invoker.properties b/src/it/projects/dependency-sets/dependencySet-unpacked/invoker.properties deleted file mode 100644 index 4b2a3ba6c..000000000 --- a/src/it/projects/dependency-sets/dependencySet-unpacked/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=package diff --git a/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/invoker.properties b/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/invoker.properties deleted file mode 100644 index 4b2a3ba6c..000000000 --- a/src/it/projects/dependency-sets/dependencySet-unpackedExcludingMetaInf/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=package diff --git a/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/invoker.properties b/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/invoker.properties deleted file mode 100644 index 4b2a3ba6c..000000000 --- a/src/it/projects/dependency-sets/dependencySet-unpackedSubsetsTwice/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=package diff --git a/src/it/projects/dependency-sets/dependencySet-withExecutedProject/invoker.properties b/src/it/projects/dependency-sets/dependencySet-withExecutedProject/invoker.properties deleted file mode 100644 index f902e50d8..000000000 --- a/src/it/projects/dependency-sets/dependencySet-withExecutedProject/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=install diff --git a/src/it/projects/dependency-sets/include-project-artifact/invoker.properties b/src/it/projects/dependency-sets/include-project-artifact/invoker.properties deleted file mode 100644 index 4b2a3ba6c..000000000 --- a/src/it/projects/dependency-sets/include-project-artifact/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=package diff --git a/src/it/projects/dependency-sets/include-project-attachments/invoker.properties b/src/it/projects/dependency-sets/include-project-attachments/invoker.properties deleted file mode 100644 index 4b2a3ba6c..000000000 --- a/src/it/projects/dependency-sets/include-project-attachments/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=package diff --git a/src/it/projects/dependency-sets/include-provided/invoker.properties b/src/it/projects/dependency-sets/include-provided/invoker.properties deleted file mode 100644 index 4b2a3ba6c..000000000 --- a/src/it/projects/dependency-sets/include-provided/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=package diff --git a/src/it/projects/dependency-sets/massembly-201/invoker.properties b/src/it/projects/dependency-sets/massembly-201/invoker.properties deleted file mode 100644 index c743aa4f3..000000000 --- a/src/it/projects/dependency-sets/massembly-201/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=clean package diff --git a/src/it/projects/dependency-sets/massembly-232/invoker.properties b/src/it/projects/dependency-sets/massembly-232/invoker.properties deleted file mode 100644 index 4b2a3ba6c..000000000 --- a/src/it/projects/dependency-sets/massembly-232/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=package diff --git a/src/it/projects/dependency-sets/massembly-235/invoker.properties b/src/it/projects/dependency-sets/massembly-235/invoker.properties deleted file mode 100644 index 4b2a3ba6c..000000000 --- a/src/it/projects/dependency-sets/massembly-235/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=package diff --git a/src/it/projects/dependency-sets/massembly-345/invoker.properties b/src/it/projects/dependency-sets/massembly-345/invoker.properties deleted file mode 100644 index c743aa4f3..000000000 --- a/src/it/projects/dependency-sets/massembly-345/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=clean package diff --git a/src/it/projects/dependency-sets/massembly-619/invoker.properties b/src/it/projects/dependency-sets/massembly-619/invoker.properties deleted file mode 100644 index f902e50d8..000000000 --- a/src/it/projects/dependency-sets/massembly-619/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=install diff --git a/src/it/projects/dependency-sets/massembly-99/invoker.properties b/src/it/projects/dependency-sets/massembly-99/invoker.properties deleted file mode 100644 index c743aa4f3..000000000 --- a/src/it/projects/dependency-sets/massembly-99/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=clean package diff --git a/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/invoker.properties b/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/invoker.properties deleted file mode 100644 index c743aa4f3..000000000 --- a/src/it/projects/dependency-sets/mid-artifactId-wildcard-massembly570/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=clean package diff --git a/src/it/projects/dependency-sets/multiple-wildcard-includes/invoker.properties b/src/it/projects/dependency-sets/multiple-wildcard-includes/invoker.properties deleted file mode 100644 index c743aa4f3..000000000 --- a/src/it/projects/dependency-sets/multiple-wildcard-includes/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=clean package diff --git a/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/invoker.properties b/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/invoker.properties deleted file mode 100644 index c743aa4f3..000000000 --- a/src/it/projects/dependency-sets/outputFileNameMappingWithUnpack/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=clean package diff --git a/src/it/projects/dependency-sets/unpack-deps-correct-dir/invoker.properties b/src/it/projects/dependency-sets/unpack-deps-correct-dir/invoker.properties deleted file mode 100644 index c743aa4f3..000000000 --- a/src/it/projects/dependency-sets/unpack-deps-correct-dir/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=clean package diff --git a/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/invoker.properties b/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/invoker.properties deleted file mode 100644 index c743aa4f3..000000000 --- a/src/it/projects/dependency-sets/using-moduleSet-implied-depSet/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=clean package diff --git a/src/it/projects/descriptor-refs/bin/jars-in-archive-root/invoker.properties b/src/it/projects/descriptor-refs/bin/jars-in-archive-root/invoker.properties deleted file mode 100644 index 4b2a3ba6c..000000000 --- a/src/it/projects/descriptor-refs/bin/jars-in-archive-root/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=package diff --git a/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/invoker.properties b/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/invoker.properties deleted file mode 100644 index c743aa4f3..000000000 --- a/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=clean package diff --git a/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/verify.bsh b/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/verify.bsh deleted file mode 100644 index b6a03dd35..000000000 --- a/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/verify.bsh +++ /dev/null @@ -1,79 +0,0 @@ -/* - * 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.net.*; -import java.util.jar.*; - -boolean result = true; - -try -{ - System.out.println( "Creating JarFile java.io.File." ); - - File jarFile = new File( basedir, "child2/target/child2-1.0-SNAPSHOT-jar-with-dependencies.jar" ); - - System.out.println( "Checking for existence and file-ishness of: " + jarFile ); - - if ( !jarFile.exists() || jarFile.isDirectory() ) - { - System.err.println( "jar file is missing or a directory." ); - return false; - } - - System.out.println( "Creating JarFile instance." ); - - JarFile jf = new JarFile( jarFile ); - - System.out.println( "Looking for component descriptor jar entry." ); - - JarEntry je = jf.getEntry( "META-INF/plexus/components.xml" ); - - if ( je == null ) - { - System.err.println( "component descriptor is missing." ); - result = false; - } - else - { - InputStream instream = jf.getInputStream( je ); - - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - byte[] buf = new byte[16]; - int read = -1; - - while( ( read = instream.read( buf ) ) > -1 ) - { - baos.write( buf, 0, read ); - } - - String test = new String( baos.toByteArray() ); - System.out.println( test ); - - result = test.indexOf( "one" ) > -1 && test.indexOf( "two" ) > -1; - } - -} -catch( IOException e ) -{ - e.printStackTrace(); - result = false; -} - -return result; diff --git a/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/verify.groovy b/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/verify.groovy new file mode 100644 index 000000000..007eee51e --- /dev/null +++ b/src/it/projects/descriptor-refs/jar-with-dependencies/component-descriptors-merged/verify.groovy @@ -0,0 +1,56 @@ +/* + * 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.net.*; +import java.util.jar.*; + +System.out.println( "Creating JarFile java.io.File." ) + +File jarFile = new File( basedir, "child2/target/child2-1.0-SNAPSHOT-jar-with-dependencies.jar" ) + +System.out.println( "Checking for existence and file-ishness of: " + jarFile ) + +assert ( jarFile.isFile() ) : "jar file is missing or a directory." + +System.out.println( "Creating JarFile instance." ) + +JarFile jf = new JarFile( jarFile ) + +System.out.println( "Looking for component descriptor jar entry." ) + +JarEntry je = jf.getEntry( "META-INF/plexus/components.xml" ) + +assert ( je != null ) : "component descriptor is missing." + +InputStream instream = jf.getInputStream( je ) + +ByteArrayOutputStream baos = new ByteArrayOutputStream() +byte[] buf = new byte[16] +int read = -1 + +while( ( read = instream.read( buf ) ) > -1 ) +{ + baos.write( buf, 0, read ) +} + +String test = new String( baos.toByteArray() ) +System.out.println( test ) + +assert ( test.indexOf( "one" ) > -1 && test.indexOf( "two" ) > -1 ) diff --git a/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/invoker.properties b/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/invoker.properties deleted file mode 100644 index 4b2a3ba6c..000000000 --- a/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=package diff --git a/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/verify.bsh b/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/verify.bsh deleted file mode 100644 index 2369dc979..000000000 --- a/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/verify.bsh +++ /dev/null @@ -1,73 +0,0 @@ -/* - * 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.net.*; -import java.util.jar.*; - -boolean result = true; - -try -{ - System.out.println( "Creating JarFile java.io.File." ); - - File jarFile = new File( basedir, "child2/target/child2-1.0-SNAPSHOT-jar-with-dependencies.jar" ); - - System.out.println( "Checking for existence and file-ishness of: " + jarFile ); - - if ( !jarFile.exists() || jarFile.isDirectory() ) - { - System.err.println( "jar file is missing or a directory." ); - return false; - } - - System.out.println( "Creating JarFile instance." ); - - JarFile jf = new JarFile( jarFile ); - - System.out.println( "Looking for 'test/AppChild1.class' jar entry." ); - - if ( jf.getEntry( "test/AppChild1.class" ) == null ) - { - System.err.println( "child1 class is missing." ); - result = false; - } - - if ( jf.getEntry( "test/App.class" ) == null ) - { - System.err.println( "child2 class is missing." ); - result = false; - } - - System.out.println( "Looking for absence of 'junit/' jar entry." ); - - if ( jf.getEntry( "junit/framework/TestCase.class" ) != null ) - { - System.err.println( "junit jar should not be present." ); - result = false; - } - -} -catch( IOException e ) -{ - e.printStackTrace(); - result = false; -} - -return result; diff --git a/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/verify.groovy b/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/verify.groovy new file mode 100644 index 000000000..6a46552d2 --- /dev/null +++ b/src/it/projects/descriptor-refs/jar-with-dependencies/deps-unpacked-to-root-dir/verify.groovy @@ -0,0 +1,46 @@ +/* + * 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.net.*; +import java.util.jar.*; + +boolean result = true; + +System.out.println( "Creating JarFile java.io.File." ) + +File jarFile = new File( basedir, "child2/target/child2-1.0-SNAPSHOT-jar-with-dependencies.jar" ) + +System.out.println( "Checking for existence and file-ishness of: " + jarFile ) + +assert ( jarFile.isFile() ) : "jar file is missing or a directory." + +System.out.println( "Creating JarFile instance." ) + +JarFile jf = new JarFile( jarFile ) + +System.out.println( "Looking for 'test/AppChild1.class' jar entry." ) + +assert ( jf.getEntry( "test/AppChild1.class" ) != null ) : "child1 class is missing." + +assert ( jf.getEntry( "test/App.class" ) != null ) : "child2 class is missing." + +System.out.println( "Looking for absence of 'junit/' jar entry." ); + +assert ( jf.getEntry( "junit/framework/TestCase.class" ) == null ) : "junit jar should not be present." diff --git a/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/invoker.properties b/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/invoker.properties deleted file mode 100644 index 4b2a3ba6c..000000000 --- a/src/it/projects/descriptor-refs/jar-with-dependencies/no-target-dir/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=package diff --git a/src/it/projects/descriptor-refs/project/multimodule-sources-copied/invoker.properties b/src/it/projects/descriptor-refs/project/multimodule-sources-copied/invoker.properties deleted file mode 100644 index 4b2a3ba6c..000000000 --- a/src/it/projects/descriptor-refs/project/multimodule-sources-copied/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=package diff --git a/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/invoker.properties b/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/invoker.properties deleted file mode 100644 index 4b2a3ba6c..000000000 --- a/src/it/projects/descriptor-refs/project/no-target-dir-multimodule/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=package diff --git a/src/it/projects/descriptor-refs/project/no-target-dir/invoker.properties b/src/it/projects/descriptor-refs/project/no-target-dir/invoker.properties deleted file mode 100644 index 4b2a3ba6c..000000000 --- a/src/it/projects/descriptor-refs/project/no-target-dir/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=package diff --git a/src/it/projects/descriptor-refs/project/sources-copied/invoker.properties b/src/it/projects/descriptor-refs/project/sources-copied/invoker.properties deleted file mode 100644 index 4b2a3ba6c..000000000 --- a/src/it/projects/descriptor-refs/project/sources-copied/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=package diff --git a/src/it/projects/descriptor-refs/src/no-target-dir/invoker.properties b/src/it/projects/descriptor-refs/src/no-target-dir/invoker.properties deleted file mode 100644 index 4b2a3ba6c..000000000 --- a/src/it/projects/descriptor-refs/src/no-target-dir/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=package diff --git a/src/it/projects/descriptor-refs/src/src-dir-copied/invoker.properties b/src/it/projects/descriptor-refs/src/src-dir-copied/invoker.properties deleted file mode 100644 index 4b2a3ba6c..000000000 --- a/src/it/projects/descriptor-refs/src/src-dir-copied/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=package diff --git a/src/it/projects/file-sets/excludes-using-regex/invoker.properties b/src/it/projects/file-sets/excludes-using-regex/invoker.properties deleted file mode 100644 index c743aa4f3..000000000 --- a/src/it/projects/file-sets/excludes-using-regex/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=clean package diff --git a/src/it/projects/file-sets/filtered-module-sources/invoker.properties b/src/it/projects/file-sets/filtered-module-sources/invoker.properties deleted file mode 100644 index c743aa4f3..000000000 --- a/src/it/projects/file-sets/filtered-module-sources/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=clean package diff --git a/src/it/projects/file-sets/filtered-multimodule/invoker.properties b/src/it/projects/file-sets/filtered-multimodule/invoker.properties deleted file mode 100644 index c743aa4f3..000000000 --- a/src/it/projects/file-sets/filtered-multimodule/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=clean package diff --git a/src/it/projects/file-sets/include-parent-dir/invoker.properties b/src/it/projects/file-sets/include-parent-dir/invoker.properties deleted file mode 100644 index 4b2a3ba6c..000000000 --- a/src/it/projects/file-sets/include-parent-dir/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=package diff --git a/src/it/projects/file-sets/multimodule-unix-lineEndings/invoker.properties b/src/it/projects/file-sets/multimodule-unix-lineEndings/invoker.properties deleted file mode 100644 index c743aa4f3..000000000 --- a/src/it/projects/file-sets/multimodule-unix-lineEndings/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=clean package diff --git a/src/it/projects/file-sets/multimodule-win-lineEndings/invoker.properties b/src/it/projects/file-sets/multimodule-win-lineEndings/invoker.properties deleted file mode 100644 index c743aa4f3..000000000 --- a/src/it/projects/file-sets/multimodule-win-lineEndings/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=clean package diff --git a/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/invoker.properties b/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/invoker.properties deleted file mode 100644 index 4b2a3ba6c..000000000 --- a/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=package diff --git a/src/it/projects/filtering-feature/filters-defined-in-build/invoker.properties b/src/it/projects/filtering-feature/filters-defined-in-build/invoker.properties deleted file mode 100644 index 9ef49673f..000000000 --- a/src/it/projects/filtering-feature/filters-defined-in-build/invoker.properties +++ /dev/null @@ -1,17 +0,0 @@ -# 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.goals=clean package diff --git a/src/it/projects/filtering-feature/massembly-736/invoker.properties b/src/it/projects/filtering-feature/massembly-736/invoker.properties deleted file mode 100644 index 9ef49673f..000000000 --- a/src/it/projects/filtering-feature/massembly-736/invoker.properties +++ /dev/null @@ -1,17 +0,0 @@ -# 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.goals=clean package diff --git a/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/invoker.properties b/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/invoker.properties deleted file mode 100644 index f902e50d8..000000000 --- a/src/it/projects/forking-tests/assembly-assembly-with-module-binaries/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=install diff --git a/src/it/projects/forking-tests/assembly-attached-with-module-binaries/invoker.properties b/src/it/projects/forking-tests/assembly-attached-with-module-binaries/invoker.properties deleted file mode 100644 index f902e50d8..000000000 --- a/src/it/projects/forking-tests/assembly-attached-with-module-binaries/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=install diff --git a/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/invoker.properties b/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/invoker.properties deleted file mode 100644 index c743aa4f3..000000000 --- a/src/it/projects/mojo-configuration/ignoreDirFormatExtensions/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=clean package diff --git a/src/it/projects/mojo-configuration/manifest-with-customEntry/invoker.properties b/src/it/projects/mojo-configuration/manifest-with-customEntry/invoker.properties deleted file mode 100644 index 4b2a3ba6c..000000000 --- a/src/it/projects/mojo-configuration/manifest-with-customEntry/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=package diff --git a/src/it/projects/mojo-configuration/manifest-with-mainClass/invoker.properties b/src/it/projects/mojo-configuration/manifest-with-mainClass/invoker.properties deleted file mode 100644 index 4b2a3ba6c..000000000 --- a/src/it/projects/mojo-configuration/manifest-with-mainClass/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=package diff --git a/src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/invoker.properties b/src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/invoker.properties deleted file mode 100644 index 4b2a3ba6c..000000000 --- a/src/it/projects/mojo-configuration/no-appendAssemblyId-no-classifier/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=package diff --git a/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/invoker.properties b/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/invoker.properties deleted file mode 100644 index 4b2a3ba6c..000000000 --- a/src/it/projects/mojo-configuration/skipAssemblyCLIPropertySet/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=package diff --git a/src/it/projects/mojo-tests/single-in-one-project-hierarchy/invoker.properties b/src/it/projects/mojo-tests/single-in-one-project-hierarchy/invoker.properties deleted file mode 100644 index c743aa4f3..000000000 --- a/src/it/projects/mojo-tests/single-in-one-project-hierarchy/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=clean package diff --git a/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/invoker.properties b/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/invoker.properties deleted file mode 100644 index c743aa4f3..000000000 --- a/src/it/projects/mojo-tests/single-twice-in-multimodule-hierarchy/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=clean package diff --git a/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/invoker.properties b/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/invoker.properties deleted file mode 100644 index c743aa4f3..000000000 --- a/src/it/projects/mojo-tests/single-twice-in-one-project-hierarchy/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=clean package diff --git a/src/it/projects/multimodule/massembly-298/invoker.properties b/src/it/projects/multimodule/massembly-298/invoker.properties deleted file mode 100644 index f902e50d8..000000000 --- a/src/it/projects/multimodule/massembly-298/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=install diff --git a/src/it/projects/multimodule/massembly-474/invoker.properties b/src/it/projects/multimodule/massembly-474/invoker.properties deleted file mode 100644 index f902e50d8..000000000 --- a/src/it/projects/multimodule/massembly-474/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=install diff --git a/src/it/projects/multimodule/massembly-619/invoker.properties b/src/it/projects/multimodule/massembly-619/invoker.properties deleted file mode 100644 index f902e50d8..000000000 --- a/src/it/projects/multimodule/massembly-619/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=install diff --git a/src/it/projects/multimodule/multimodule-binariesNotSource/invoker.properties b/src/it/projects/multimodule/multimodule-binariesNotSource/invoker.properties deleted file mode 100644 index c743aa4f3..000000000 --- a/src/it/projects/multimodule/multimodule-binariesNotSource/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=clean package diff --git a/src/it/projects/multimodule/multimodule-sourceNotBinaries/invoker.properties b/src/it/projects/multimodule/multimodule-sourceNotBinaries/invoker.properties deleted file mode 100644 index 4b2a3ba6c..000000000 --- a/src/it/projects/multimodule/multimodule-sourceNotBinaries/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=package diff --git a/src/it/projects/multimodule/multimodule-wholeReactorFromChild/invoker.properties b/src/it/projects/multimodule/multimodule-wholeReactorFromChild/invoker.properties deleted file mode 100644 index c743aa4f3..000000000 --- a/src/it/projects/multimodule/multimodule-wholeReactorFromChild/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=clean package diff --git a/src/it/projects/multimodule/two-level-multimodule/invoker.properties b/src/it/projects/multimodule/two-level-multimodule/invoker.properties deleted file mode 100644 index 4b2a3ba6c..000000000 --- a/src/it/projects/multimodule/two-level-multimodule/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=package diff --git a/src/it/projects/multimodule/two-level-multimodule/verify.bsh b/src/it/projects/multimodule/two-level-multimodule/verify.groovy similarity index 63% rename from src/it/projects/multimodule/two-level-multimodule/verify.bsh rename to src/it/projects/multimodule/two-level-multimodule/verify.groovy index d03608872..91f657bb5 100644 --- a/src/it/projects/multimodule/two-level-multimodule/verify.bsh +++ b/src/it/projects/multimodule/two-level-multimodule/verify.groovy @@ -17,21 +17,5 @@ * under the License. */ -import java.io.*; -import java.net.*; -import java.util.jar.*; - -boolean result = true; - -try -{ - result = new File( basedir, "assembly/target/assembly-1.0-SNAPSHOT-bin/modules/child-level1-project1-1.0-SNAPSHOT.jar" ).exists(); - result = result && new File( basedir, "assembly/target/assembly-1.0-SNAPSHOT-bin/modules/child-level2-project1-1.0-SNAPSHOT.jar" ).exists(); -} -catch( IOException e ) -{ - e.printStackTrace(); - result = false; -} - -return result; +assert new File( basedir, "assembly/target/assembly-1.0-SNAPSHOT-bin/modules/child-level1-project1-1.0-SNAPSHOT.jar" ).exists() +assert new File( basedir, "assembly/target/assembly-1.0-SNAPSHOT-bin/modules/child-level2-project1-1.0-SNAPSHOT.jar" ).exists() diff --git a/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/invoker.properties b/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/invoker.properties deleted file mode 100644 index c743aa4f3..000000000 --- a/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=clean package diff --git a/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/verify.bsh b/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/verify.groovy similarity index 72% rename from src/it/projects/multimodule/two-levels-includeBaseDir-withBin/verify.bsh rename to src/it/projects/multimodule/two-levels-includeBaseDir-withBin/verify.groovy index baf4a8200..e9d89d007 100644 --- a/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/verify.bsh +++ b/src/it/projects/multimodule/two-levels-includeBaseDir-withBin/verify.groovy @@ -17,15 +17,9 @@ * under the License. */ -import java.io.*; +String finalName = "assembly/target/assembly-1.0-SNAPSHOT-bin/assembly-1.0-SNAPSHOT" +String rootDir = finalName + "/modules/" -boolean result = true; +assert new File( basedir, rootDir + "child-level1-project1-1.0-SNAPSHOT.jar" ).exists() -String finalName = "assembly/target/assembly-1.0-SNAPSHOT-bin/assembly-1.0-SNAPSHOT"; -String rootDir = finalName + "/modules/"; - -result = result && new File( basedir, rootDir + "child-level1-project1-1.0-SNAPSHOT.jar" ).exists(); - -result = result && new File( basedir, rootDir + "child-level2-project1-1.0-SNAPSHOT.jar" ).exists(); - -return result; +assert new File( basedir, rootDir + "child-level2-project1-1.0-SNAPSHOT.jar" ).exists() \ No newline at end of file diff --git a/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/invoker.properties b/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/invoker.properties deleted file mode 100644 index c743aa4f3..000000000 --- a/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=clean package diff --git a/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/verify.bsh b/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/verify.groovy similarity index 66% rename from src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/verify.bsh rename to src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/verify.groovy index 013812f5c..aac21f25c 100644 --- a/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/verify.bsh +++ b/src/it/projects/multimodule/two-levels-includeBaseDir-withSrc/verify.groovy @@ -17,19 +17,11 @@ * under the License. */ -import java.io.*; -import java.net.*; -import java.util.jar.*; +String finalName = "assembly/target/assembly-1.0-SNAPSHOT-src/assembly-1.0-SNAPSHOT" +String rootDir = finalName + "/modules/" -boolean result = true; +assert new File( basedir, rootDir + "child-level1-project1/pom.xml" ).exists() -String finalName = "assembly/target/assembly-1.0-SNAPSHOT-src/assembly-1.0-SNAPSHOT"; -String rootDir = finalName + "/modules/"; +assert new File( basedir, rootDir + "child-level1-project2/pom.xml" ).exists() -result = result && new File( basedir, rootDir + "child-level1-project1/pom.xml" ).exists(); - -result = result && new File( basedir, rootDir + "child-level1-project2/pom.xml" ).exists(); - -result = result && new File( basedir, rootDir + "child-level2-project1/pom.xml" ).exists(); - -return result; +assert new File( basedir, rootDir + "child-level2-project1/pom.xml" ).exists() diff --git a/src/it/projects/repositories/basic-repository/invoker.properties b/src/it/projects/repositories/basic-repository/invoker.properties deleted file mode 100644 index c743aa4f3..000000000 --- a/src/it/projects/repositories/basic-repository/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=clean package diff --git a/src/it/projects/repositories/massembly-196/invoker.properties b/src/it/projects/repositories/massembly-196/invoker.properties deleted file mode 100644 index c743aa4f3..000000000 --- a/src/it/projects/repositories/massembly-196/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=clean package diff --git a/src/it/projects/repositories/massembly-855/invoker.properties b/src/it/projects/repositories/massembly-855/invoker.properties deleted file mode 100644 index 4b2a3ba6c..000000000 --- a/src/it/projects/repositories/massembly-855/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=package diff --git a/src/it/projects/repositories/repo-with-snapshot-parents/invoker.properties b/src/it/projects/repositories/repo-with-snapshot-parents/invoker.properties deleted file mode 100644 index 4b2a3ba6c..000000000 --- a/src/it/projects/repositories/repo-with-snapshot-parents/invoker.properties +++ /dev/null @@ -1,18 +0,0 @@ -# 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.goals=package From d33a9061185caa57bdf43df41c43ae47a13487dc Mon Sep 17 00:00:00 2001 From: Enrico Olivelli Date: Mon, 24 Dec 2018 11:24:20 +0100 Subject: [PATCH 16/24] MASSEMBLY-900 Upgrade plexus-archiver to 4.0.0 --- pom.xml | 2 +- .../archive/archiver/PrefixedArchivedFileSet.java | 7 +++++++ .../assembly/archive/archiver/PrefixedFileSet.java | 10 +++++++++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 81a02463b..7f5ed0bc0 100644 --- a/pom.xml +++ b/pom.xml @@ -138,7 +138,7 @@ under the License. org.codehaus.plexus plexus-archiver - 3.6.0 + 4.0.0 org.apache.maven.shared diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedArchivedFileSet.java b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedArchivedFileSet.java index bfe122da5..2f1d12e79 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedArchivedFileSet.java +++ b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedArchivedFileSet.java @@ -24,6 +24,7 @@ import org.codehaus.plexus.components.io.functions.InputStreamTransformer; import java.io.File; +import org.codehaus.plexus.components.io.filemappers.FileMapper; /** * @@ -31,6 +32,7 @@ class PrefixedArchivedFileSet implements ArchivedFileSet { + private final static FileMapper[] EMPTY_FILE_MAPPERS_ARRAY = new FileMapper[0]; private final String rootPrefix; @@ -149,4 +151,9 @@ public InputStreamTransformer getStreamTransformer() return fileSet.getStreamTransformer(); } + @Override + public FileMapper[] getFileMappers() + { + return EMPTY_FILE_MAPPERS_ARRAY; + } } diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedFileSet.java b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedFileSet.java index 922b29e3a..86d8071dd 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedFileSet.java +++ b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedFileSet.java @@ -24,6 +24,7 @@ import org.codehaus.plexus.components.io.functions.InputStreamTransformer; import java.io.File; +import org.codehaus.plexus.components.io.filemappers.FileMapper; /** * @@ -31,6 +32,7 @@ class PrefixedFileSet implements FileSet { + private final static FileMapper[] EMPTY_FILE_MAPPERS_ARRAY = new FileMapper[0]; private final String rootPrefix; @@ -177,4 +179,10 @@ public InputStreamTransformer getStreamTransformer() { return fileSet.getStreamTransformer(); } -} + + @Override + public FileMapper[] getFileMappers() + { + return EMPTY_FILE_MAPPERS_ARRAY; + } +} \ No newline at end of file From ce704227927f5c0ed8d3c1d493b1fc12976789b9 Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Sun, 3 Jun 2018 15:30:24 +0200 Subject: [PATCH 17/24] [MASSEMBLY-890] - Upgrade plexus-interpolation to 1.25 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7f5ed0bc0..c9c0f034d 100644 --- a/pom.xml +++ b/pom.xml @@ -133,7 +133,7 @@ under the License. org.codehaus.plexus plexus-interpolation - 1.24 + 1.25 org.codehaus.plexus From 48252db477a35368be0c35bb2299494cf908986b Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Thu, 27 Dec 2018 18:44:18 +0100 Subject: [PATCH 18/24] [MASSEMBLY-892] - Upgrade maven-plugins parent to version 33 --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c9c0f034d..074670a1e 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ under the License. maven-plugins org.apache.maven.plugins - 31 + 33 ../../pom/maven/maven-plugins/pom.xml @@ -62,7 +62,6 @@ under the License. - 2.21.0 7 2.0.0 3.2.0 From c7d1b44a6f62f90dc48e6928793c66dd1357ac57 Mon Sep 17 00:00:00 2001 From: Enrico Olivelli Date: Fri, 28 Dec 2018 11:17:33 +0100 Subject: [PATCH 19/24] [MASSEMBLY-902] Some Integration tests fails if launched with an very large UID --- src/it/projects/file-modes/file-set-fileMode/pom.xml | 1 + src/it/projects/file-modes/fileItem-fileMode/pom.xml | 1 + .../filtering-feature/fileset-to-tar-massembly-722/pom.xml | 1 + 3 files changed, 3 insertions(+) diff --git a/src/it/projects/file-modes/file-set-fileMode/pom.xml b/src/it/projects/file-modes/file-set-fileMode/pom.xml index 3c10c6071..840340921 100644 --- a/src/it/projects/file-modes/file-set-fileMode/pom.xml +++ b/src/it/projects/file-modes/file-set-fileMode/pom.xml @@ -47,6 +47,7 @@ under the License. maven-assembly-plugin + posix src/assemble/src.xml diff --git a/src/it/projects/file-modes/fileItem-fileMode/pom.xml b/src/it/projects/file-modes/fileItem-fileMode/pom.xml index cb76370a6..0e8712c4a 100644 --- a/src/it/projects/file-modes/fileItem-fileMode/pom.xml +++ b/src/it/projects/file-modes/fileItem-fileMode/pom.xml @@ -47,6 +47,7 @@ under the License. maven-assembly-plugin + posix src/assemble/src.xml diff --git a/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/pom.xml b/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/pom.xml index 7bec610e7..04b2c8ba2 100755 --- a/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/pom.xml +++ b/src/it/projects/filtering-feature/fileset-to-tar-massembly-722/pom.xml @@ -45,6 +45,7 @@ under the License. package single + posix src/main/assemblies/prod-assemble.xml From f0eb9e9f2818a52abd5a0c2cdbdb7a4137999a42 Mon Sep 17 00:00:00 2001 From: Enrico Olivelli Date: Fri, 28 Dec 2018 09:45:10 +0100 Subject: [PATCH 20/24] MASSEMBLY-901 Fix trivial javadocs HTML errors --- .../maven/plugins/assembly/AssemblerConfigurationSource.java | 2 +- .../maven/plugins/assembly/mojos/AbstractAssemblyMojo.java | 1 - .../maven/plugins/assembly/mojos/SingleAssemblyMojo.java | 2 +- src/main/mdo/assembly-component.mdo | 4 ++-- src/main/mdo/assembly.mdo | 4 ++-- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/assembly/AssemblerConfigurationSource.java b/src/main/java/org/apache/maven/plugins/assembly/AssemblerConfigurationSource.java index 98fc13792..ebadd225d 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/AssemblerConfigurationSource.java +++ b/src/main/java/org/apache/maven/plugins/assembly/AssemblerConfigurationSource.java @@ -158,7 +158,7 @@ public interface AssemblerConfigurationSource /** * Maven shared filtering utility. * - * @ return the maven reader filter + * @return the maven reader filter */ MavenReaderFilter getMavenReaderFilter(); diff --git a/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java b/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java index bde09fd8b..2989a4128 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java +++ b/src/main/java/org/apache/maven/plugins/assembly/mojos/AbstractAssemblyMojo.java @@ -57,7 +57,6 @@ * @author Brett Porter * @author Vincent Siveton * - * @threadSafe */ public abstract class AbstractAssemblyMojo extends AbstractMojo diff --git a/src/main/java/org/apache/maven/plugins/assembly/mojos/SingleAssemblyMojo.java b/src/main/java/org/apache/maven/plugins/assembly/mojos/SingleAssemblyMojo.java index 9628cdc04..2737c38e9 100644 --- a/src/main/java/org/apache/maven/plugins/assembly/mojos/SingleAssemblyMojo.java +++ b/src/main/java/org/apache/maven/plugins/assembly/mojos/SingleAssemblyMojo.java @@ -33,7 +33,7 @@ * Assemble an application bundle or distribution from an assembly descriptor. This goal is suitable either for binding * to the lifecycle or calling directly from the command line (provided all required files are available before the * build starts, or are produced by another goal specified before this one on the command line). - *
+ *
* Note that the parameters {@code descriptors}, {@code descriptorRefs}, and {@code descriptorSourceDirectory} * are disjoint, i.e., they are not combined during descriptor location calculation. * diff --git a/src/main/mdo/assembly-component.mdo b/src/main/mdo/assembly-component.mdo index e40933d3c..b892470c9 100644 --- a/src/main/mdo/assembly-component.mdo +++ b/src/main/mdo/assembly-component.mdo @@ -585,7 +585,7 @@ a project's pom.xml. This allows you to include sources or binaries belonging to a project's <modules>. -
NOTE: When using <moduleSets> from the command-line, it +
NOTE: When using <moduleSets> from the command-line, it is required to pass first the package phase by doing: "mvn package assembly:assembly". This bug/issue is scheduled to be addressed by Maven 2.1. ]]> @@ -1010,7 +1010,7 @@ and also contains both sha1 and md5 checksums. This is useful for creating archives which will be deployed to internal repositories. -
NOTE: Currently, only artifacts from the central repository +
NOTE: Currently, only artifacts from the central repository are allowed. ]]> diff --git a/src/main/mdo/assembly.mdo b/src/main/mdo/assembly.mdo index 52c9c7e6d..f1eaa7392 100644 --- a/src/main/mdo/assembly.mdo +++ b/src/main/mdo/assembly.mdo @@ -702,7 +702,7 @@ a project's pom.xml. This allows you to include sources or binaries belonging to a project's <modules>. -
NOTE: When using <moduleSets> from the command-line, it +
NOTE: When using <moduleSets> from the command-line, it is required to pass first the package phase by doing: "mvn package assembly:assembly". This bug/issue is scheduled to be addressed by Maven 2.1. ]]> @@ -1123,7 +1123,7 @@ and also contains both sha1 and md5 checksums. This is useful for creating archives which will be deployed to internal repositories. -
NOTE: Currently, only artifacts from the central repository +
NOTE: Currently, only artifacts from the central repository are allowed. ]]> From 0d60ef451a5ea477592631ce3f2ec0204a4431e5 Mon Sep 17 00:00:00 2001 From: rfscholte Date: Sat, 29 Dec 2018 00:07:10 +0100 Subject: [PATCH 21/24] [INFRA-17514] avoid tmpWs, shouldn't be needed anymore --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 261d8bb13..e9f05f7d9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,4 +17,4 @@ * under the License. */ -asfMavenTlpPlgnBuild(tmpWs:true) +asfMavenTlpPlgnBuild() From a97fbb304d1924426f3e3137ba42de0f3d9ec6a0 Mon Sep 17 00:00:00 2001 From: Enrico Olivelli Date: Sat, 29 Dec 2018 09:42:25 +0100 Subject: [PATCH 22/24] [MASSEMBLY-901] Fix trivial javadocs HTML errors --- src/main/mdo/assembly-component.mdo | 8 ++++---- src/main/mdo/assembly.mdo | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/mdo/assembly-component.mdo b/src/main/mdo/assembly-component.mdo index b892470c9..18ae461c9 100644 --- a/src/main/mdo/assembly-component.mdo +++ b/src/main/mdo/assembly-component.mdo @@ -585,9 +585,9 @@ a project's pom.xml. This allows you to include sources or binaries belonging to a project's <modules>. -
NOTE: When using <moduleSets> from the command-line, it +

NOTE: When using <moduleSets> from the command-line, it is required to pass first the package phase by doing: "mvn package - assembly:assembly". This bug/issue is scheduled to be addressed by Maven 2.1. + assembly:assembly". This bug/issue is scheduled to be addressed by Maven 2.1.

]]> 1.1.2+ @@ -1010,8 +1010,8 @@ and also contains both sha1 and md5 checksums. This is useful for creating archives which will be deployed to internal repositories. -
NOTE: Currently, only artifacts from the central repository - are allowed. +

NOTE: Currently, only artifacts from the central repository + are allowed.

]]> diff --git a/src/main/mdo/assembly.mdo b/src/main/mdo/assembly.mdo index f1eaa7392..b8d584d49 100644 --- a/src/main/mdo/assembly.mdo +++ b/src/main/mdo/assembly.mdo @@ -702,9 +702,9 @@ a project's pom.xml. This allows you to include sources or binaries belonging to a project's <modules>. -
NOTE: When using <moduleSets> from the command-line, it +

NOTE: When using <moduleSets> from the command-line, it is required to pass first the package phase by doing: "mvn package - assembly:assembly". This bug/issue is scheduled to be addressed by Maven 2.1. + assembly:assembly". This bug/issue is scheduled to be addressed by Maven 2.1.

]]> 1.0.0+ @@ -1123,8 +1123,8 @@ and also contains both sha1 and md5 checksums. This is useful for creating archives which will be deployed to internal repositories. -
NOTE: Currently, only artifacts from the central repository - are allowed. +

NOTE: Currently, only artifacts from the central repository + are allowed.

]]> From 1473eb876d0cb9ecce16b94c5b6ffbb085fbfc59 Mon Sep 17 00:00:00 2001 From: Enrico Olivelli Date: Sat, 29 Dec 2018 10:16:46 +0100 Subject: [PATCH 23/24] [maven-release-plugin] prepare release maven-assembly-plugin-3.1.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 074670a1e..5cf39ecbc 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ under the License. maven-assembly-plugin - 3.1.1-SNAPSHOT + 3.1.1 maven-plugin Apache Maven Assembly Plugin @@ -44,7 +44,7 @@ under the License. scm:git:https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git scm:git:https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git https://github.com/apache/maven-assembly-plugin/tree/${project.scm.tag} - HEAD + maven-assembly-plugin-3.1.1 jira From cffdb0c7a9f95dfdc44f1c20faa827d58968e99f Mon Sep 17 00:00:00 2001 From: Enrico Olivelli Date: Sat, 29 Dec 2018 10:17:09 +0100 Subject: [PATCH 24/24] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 5cf39ecbc..8930fe8c3 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ under the License. maven-assembly-plugin - 3.1.1 + 3.1.2-SNAPSHOT maven-plugin Apache Maven Assembly Plugin @@ -44,7 +44,7 @@ under the License. scm:git:https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git scm:git:https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git https://github.com/apache/maven-assembly-plugin/tree/${project.scm.tag} - maven-assembly-plugin-3.1.1 + HEAD jira