You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2018/04/01 21:52:10 UTC
[maven-shade-plugin] branch MSHADE-275 updated (71a7e85 -> 6cdfa5b)
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a change to branch MSHADE-275
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git.
discard 71a7e85 [MSHADE-275] - Maven Shade Plugin does not work under Java 10
add 602cab7 [MSHADE-279] - Upgrade mave-surefire/failsafe-plugin 2.21.0
new dce35f1 [MSHADE-275] - Maven Shade Plugin does not work under Java 10
new 6cdfa5b Trying to fix JDK 10. Will not work based on jdependency which shades the dependencies.
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (71a7e85)
\
N -- N -- N refs/heads/MSHADE-275 (6cdfa5b)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
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:
.checkstyle | 13 ++++++++++
pom.xml | 29 +++++++++++++++++++++-
.../maven/plugins/shade/filter/MinijarFilter.java | 1 +
3 files changed, 42 insertions(+), 1 deletion(-)
create mode 100644 .checkstyle
--
To stop receiving notification emails like this one, please contact
khmarbaise@apache.org.
[maven-shade-plugin] 01/02: [MSHADE-275] - Maven Shade Plugin does
not work under Java 10
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MSHADE-275
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git
commit dce35f10ed800dc148b713294a182daab4a6d903
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Fri Mar 23 17:59:20 2018 +0100
[MSHADE-275] - Maven Shade Plugin does not work under Java 10
---
.checkstyle | 13 +++++++++++++
pom.xml | 2 +-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/.checkstyle b/.checkstyle
new file mode 100644
index 0000000..05e332a
--- /dev/null
+++ b/.checkstyle
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
+ <local-check-config name="maven-checkstyle-plugin checkstyle-check" location="jar:file:/Users/kama/.m2/repository/org/apache/maven/shared/maven-shared-resources/2/maven-shared-resources-2.jar!/config/maven_checks.xml" type="remote" description="maven-checkstyle-plugin configuration checkstyle-check">
+ <property name="checkstyle.cache.file" value="${project_loc}/target/checkstyle-cachefile"/>
+ <property name="checkstyle.header.file" value="/Users/kama/eclipse-workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/maven-shade-plugin/com.basistech.m2e.code.quality.checkstyleConfigurator/checkstyle-header-checkstyle-check.txt"/>
+ </local-check-config>
+ <fileset name="java-sources-checkstyle-check" enabled="true" check-config-name="maven-checkstyle-plugin checkstyle-check" local="true">
+ <file-match-pattern match-pattern="^src/main/java.*\.java" include-pattern="true"/>
+ <file-match-pattern match-pattern="^src/main/resources.*\.properties" include-pattern="true"/>
+ <file-match-pattern match-pattern="^src/test/resources/.*\.properties" include-pattern="true"/>
+ </fileset>
+</fileset-config>
diff --git a/pom.xml b/pom.xml
index ccf236c..7939dc0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,8 +67,8 @@
<properties>
<mavenVersion>3.0</mavenVersion>
<currentVersion>${project.version}</currentVersion>
- <asmVersion>6.0_BETA</asmVersion>
<surefire.version>2.21.0</surefire.version>
+ <asmVersion>6.1</asmVersion>
</properties>
<contributors>
--
To stop receiving notification emails like this one, please contact
khmarbaise@apache.org.
[maven-shade-plugin] 02/02: Trying to fix JDK 10. Will not work
based on jdependency which shades the dependencies.
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MSHADE-275
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git
commit 6cdfa5be362e8888b1c7982068036b4f3178de22
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sun Mar 25 16:15:52 2018 +0200
Trying to fix JDK 10.
Will not work based on jdependency which shades the dependencies.
---
pom.xml | 28 +++++++++++++++++++++-
.../maven/plugins/shade/filter/MinijarFilter.java | 1 +
2 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 7939dc0..d1e2cae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,6 +65,7 @@
</distributionManagement>
<properties>
+ <javaVersion>7</javaVersion>
<mavenVersion>3.0</mavenVersion>
<currentVersion>${project.version}</currentVersion>
<surefire.version>2.21.0</surefire.version>
@@ -131,6 +132,7 @@
<artifactId>asm-commons</artifactId>
<version>${asmVersion}</version>
</dependency>
+
<dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom</artifactId>
@@ -149,7 +151,31 @@
<dependency>
<groupId>org.vafer</groupId>
<artifactId>jdependency</artifactId>
- <version>1.2</version>
+ <version>1.3</version>
+ <!--
+ <exclusions>
+ <exclusion>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-analysis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-util</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-tree</artifactId>
+ </exclusion>
+ </exclusions>
+ -->
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
diff --git a/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java b/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java
index c3ec35b..d145637 100644
--- a/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java
+++ b/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java
@@ -122,6 +122,7 @@ public class MinijarFilter
try
{
is = new FileInputStream( dependency.getFile() );
+ log.info( "dependency:" + dependency.getFile() );
clazzpathUnit = cp.addClazzpathUnit( is, dependency.toString() );
is.close();
is = null;
--
To stop receiving notification emails like this one, please contact
khmarbaise@apache.org.