slawekjaranowski commented on PR #26: URL: https://github.com/apache/maven-remote-resources-plugin/pull/26#issuecomment-1513775570
Conflict resolved. Tested with m-dependency-p, looks better ``` diff -wB target/classes/META-INF/DEPENDENCIES target-2/classes/META-INF/DEPENDENCIES 37,43d29 < < - Plexus Classworlds (http://plexus.codehaus.org/plexus-classworlds/) org.codehaus.plexus:plexus-classworlds:bundle:2.5.2 < License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) < < - Plexus :: Component Annotations (http://plexus.codehaus.org/plexus-containers/plexus-component-annotations/) org.codehaus.plexus:plexus-component-annotations:jar:1.5.5 < License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) < 51c36,39 < --- > - Plexus Classworlds (http://codehaus-plexus.github.io/plexus-classworlds/) org.codehaus.plexus:plexus-classworlds:bundle:2.6.0 > License: Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) > - Plexus :: Component Annotations (http://codehaus-plexus.github.io/plexus-containers/plexus-component-annotations/) org.codehaus.plexus:plexus-component-annotations:jar:2.0.0 > License: Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) 103,106d74 < - Logging (http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/) commons-logging:commons-logging:jar:1.1 < License: The Apache Software License, Version 2.0 (/LICENSE.txt) < < 114,117d79 < < - Commons Codec (http://commons.apache.org/codec/) commons-codec:commons-codec:jar:1.6 < License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) < 123c84,85 < --- > - Apache Commons Logging (http://commons.apache.org/proper/commons-logging/) commons-logging:commons-logging:jar:1.2 > License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) 135c94,95 < --- > - Apache Commons Codec (http://commons.apache.org/proper/commons-codec/) commons-codec:commons-codec:jar:1.11 > License: Apache License, Version 2.0 (https://www.apache.org/licenses/LICENSE-2.0.txt) ``` Artifacts used by project are listed -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
