New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[MASSEMBLY-961] Update maven-archiver to 3.6.0 #70
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
ff145da
[MASSEMBLY-961] Update plexus-archiver to 3.6.0
cstamas 59063bb
To trigger CI
cstamas ccf9c43
Merge remote-tracking branch 'origin/master' into MASSEMBLY-961
cstamas 600451f
Leave comment who uses it
cstamas a210879
Update to latest bits, remove unused deps.
cstamas d686e05
Push latest release changes
cstamas 5c27e66
Use released version
cstamas File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
90 changes: 90 additions & 0 deletions
90
src/main/java/org/apache/maven/plugins/assembly/internal/DebugConfigurationListener.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| package org.apache.maven.plugins.assembly.internal; | ||
|
|
||
| /* | ||
| * 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.lang.reflect.Array; | ||
|
|
||
| import org.codehaus.plexus.component.configurator.ConfigurationListener; | ||
| import org.slf4j.Logger; | ||
|
|
||
| /** | ||
| * Copy of deprecated {@link org.apache.maven.plugin.DebugConfigurationListener} updated to Slf4j. | ||
| */ | ||
| public class DebugConfigurationListener | ||
| implements ConfigurationListener | ||
| { | ||
| private final Logger logger; | ||
|
|
||
| public DebugConfigurationListener( Logger logger ) | ||
| { | ||
| this.logger = logger; | ||
| } | ||
|
|
||
| @Override | ||
| public void notifyFieldChangeUsingSetter( String fieldName, Object value, Object target ) | ||
| { | ||
| if ( logger.isDebugEnabled() ) | ||
| { | ||
| logger.debug( " (s) " + fieldName + " = " + toString( value ) ); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void notifyFieldChangeUsingReflection( String fieldName, Object value, Object target ) | ||
| { | ||
| if ( logger.isDebugEnabled() ) | ||
| { | ||
| logger.debug( " (f) " + fieldName + " = " + toString( value ) ); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Creates a human-friendly string representation of the specified object. | ||
| * | ||
| * @param obj The object to create a string representation for, may be <code>null</code>. | ||
| * @return The string representation, never <code>null</code>. | ||
| */ | ||
| private String toString( Object obj ) | ||
| { | ||
| String str; | ||
| if ( obj != null && obj.getClass().isArray() ) | ||
| { | ||
| int n = Array.getLength( obj ); | ||
| StringBuilder buf = new StringBuilder( 256 ); | ||
| buf.append( '[' ); | ||
| for ( int i = 0; i < n; i++ ) | ||
| { | ||
| if ( i > 0 ) | ||
| { | ||
| buf.append( ", " ); | ||
| } | ||
| buf.append( Array.get( obj, i ) ); | ||
| } | ||
| buf.append( ']' ); | ||
| str = buf.toString(); | ||
| } | ||
| else | ||
| { | ||
| str = String.valueOf( obj ); | ||
| } | ||
| return str; | ||
| } | ||
|
|
||
| } | ||
39 changes: 0 additions & 39 deletions
39
src/main/java/org/apache/maven/plugins/assembly/internal/PlexusLoggingHelper.java
This file was deleted.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe logger can be initialized here instead of pass as argument.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, but I would rather throw this class out in next major. The benefit is very little.