[maven-shade-plugin] branch master updated (22b230d -> 1d19348)

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[maven-shade-plugin] branch master updated (22b230d -> 1d19348)

slachiewicz
This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git.


    from 22b230d  [MSHADE-371] Added test cases
     add 99c57c8  Upgrade to XMLUnit 2 (legacy)
     add 8d9514f  Code cleanup - migrate to Junit4
     new ad7cd5c  upgrade org.jdom:jdom from 1.1 to 2.0.2
     new 1d19348  upgrade org.codehaus.plexus:plexus-utils from 1.4.1 to 3.3.0

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pom.xml                                            |  6 ++--
 src/it/projects/mini-jar-respect-includes/pom.xml  |  2 +-
 .../projects/mini-jar-respect-includes/verify.bsh  |  2 +-
 .../maven/plugins/shade/DefaultShaderTest.java     | 35 +++++++++++++---------
 .../plugins/shade/filter/SimpleFilterTest.java     |  6 ++--
 .../maven/plugins/shade/mojo/ArtifactIdTest.java   |  9 ++++--
 .../plugins/shade/mojo/ArtifactSelectorTest.java   |  7 +++--
 .../maven/plugins/shade/mojo/ShadeMojoTest.java    |  2 --
 .../relocation/SimpleRelocatorParameterTest.java   | 14 ++++-----
 .../shade/relocation/SimpleRelocatorTest.java      | 19 ++++++++++--
 .../ApacheLicenseResourceTransformerTest.java      | 21 ++++++++-----
 ...cheNoticeResourceTransformerParameterTests.java | 18 +++++++----
 .../ApacheNoticeResourceTransformerTest.java       | 21 ++++++++-----
 .../shade/resource/AppendingTransformerTest.java   | 19 +++++++-----
 .../ComponentsXmlResourceTransformerTest.java      |  7 +++--
 .../resource/GroovyResourceTransformerTest.java    | 13 ++++++--
 .../resource/XmlAppendingTransformerTest.java      | 19 +++++++-----
 src/test/projects/test-project/pom.xml             |  2 +-
 18 files changed, 141 insertions(+), 81 deletions(-)

Reply | Threaded
Open this post in threaded view
|

[maven-shade-plugin] 01/02: upgrade org.jdom:jdom from 1.1 to 2.0.2

slachiewicz
This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git

commit ad7cd5c45d159d60e399b931dfb8b8013fa6664a
Author: Sylwester Lachiewicz <[hidden email]>
AuthorDate: Sat Jun 27 14:42:07 2020 +0200

    upgrade org.jdom:jdom from 1.1 to 2.0.2
   
   
    2
---
 src/it/projects/mini-jar-respect-includes/pom.xml    | 2 +-
 src/it/projects/mini-jar-respect-includes/verify.bsh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/it/projects/mini-jar-respect-includes/pom.xml b/src/it/projects/mini-jar-respect-includes/pom.xml
index 110242a..221e6de 100644
--- a/src/it/projects/mini-jar-respect-includes/pom.xml
+++ b/src/it/projects/mini-jar-respect-includes/pom.xml
@@ -42,7 +42,7 @@ under the License.
     <dependency>
       <groupId>org.jdom</groupId>
       <artifactId>jdom</artifactId>
-      <version>1.1</version>
+      <version>2.0.2</version>
     </dependency>
     
     <dependency>
diff --git a/src/it/projects/mini-jar-respect-includes/verify.bsh b/src/it/projects/mini-jar-respect-includes/verify.bsh
index 43b15a5..1da8d7c 100644
--- a/src/it/projects/mini-jar-respect-includes/verify.bsh
+++ b/src/it/projects/mini-jar-respect-includes/verify.bsh
@@ -25,7 +25,7 @@ String[] wanted =
     "junit/framework/TestCase.class",
     "junit/swingui/icons/error.gif",
     "junit/awtui/TestRunner.class",
-    "org/jdom/Document.class"
+    "org/jdom2/Document.class"
 };
 
 String[] unwanted =

Reply | Threaded
Open this post in threaded view
|

[maven-shade-plugin] 02/02: upgrade org.codehaus.plexus:plexus-utils from 1.4.1 to 3.3.0

slachiewicz
In reply to this post by slachiewicz
This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git

commit 1d19348036769996906459e37b2006e36623a057
Author: snyk-bot <[hidden email]>
AuthorDate: Thu Feb 13 02:45:58 2020 +0000

    upgrade org.codehaus.plexus:plexus-utils from 1.4.1 to 3.3.0
---
 src/test/projects/test-project/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/projects/test-project/pom.xml b/src/test/projects/test-project/pom.xml
index 4336009..7f1cecf 100644
--- a/src/test/projects/test-project/pom.xml
+++ b/src/test/projects/test-project/pom.xml
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>1.4.1</version>
+      <version>3.3.0</version>
     </dependency>  
     <dependency>
       <groupId>junit</groupId>