[gentoo-commits] proj/java-ebuilder:master commit in: src/main/java/org/gentoo/java/ebuilder/maven/, scripts/

[Michał Górny]

commit:     10127d8936bec4f6e162d9d8a59ebc7bf10c9662
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  6 11:17:08 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Oct  6 11:17:08 2016 +0000
URL:        https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=10127d89

Move the jsch-agentproxy into java.

  Ugly hack, but better than removing lines from ebuilds.

  Should put this into some configuration file.

 scripts/tree.sh                                              | 12 ------------
 .../java/org/gentoo/java/ebuilder/maven/MavenParser.java     |  2 ++
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/scripts/tree.sh b/scripts/tree.sh
index 7df27dc..8fef39d 100755
--- a/scripts/tree.sh
+++ b/scripts/tree.sh
@@ -83,24 +83,12 @@ gebd() {
         java-ebuilder -p "${POMDIR}"/${M}.pom -e "${ebd}" -g --workdir . \
                       -u ${SRC_URI} --slot ${SLOT:-0} --keywords ~amd64 \
                       --cache-file "${CACHEDIR}"/cache
-
-        # empty parent artifacts
-        # FIXME, this should be removed in poms
-        sed -e '/app-maven\/jsch-agentproxy-bin/d' \
-            -e '/JAVA_GENTOO_CLASSPATH/s|jsch-agentproxy-bin,||' \
-            -i "${ebd}"
     fi
 
     if [[ -z "${MAVEN_NODEP}" ]] && mfill "${ebd}"; then
         java-ebuilder -p "${POMDIR}"/${M}.pom -e "${ebd}" -g --workdir . \
                       -u ${SRC_URI} --slot ${SLOT:-0} --keywords ~amd64 \
                       --cache-file "${CACHEDIR}"/cache
-
-        # empty parent artifacts
-        # FIXME, this should be removed in poms
-        sed -e '/app-maven\/jsch-agentproxy-bin-[0-9]/d' \
-            -e '/JAVA_GENTOO_CLASSPATH/s|jsch-agentproxy-bin,||' \
-            -i "${ebd}"
     fi
 
     [[ ${SRC_URI} = *-sources.jar ]] || sed -i 
"/inherit/s/java-pkg-simple/java-pkg-binjar/" "${ebd}"

diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java 
b/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java
index ba876f2..6e6435e 100644
--- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java
+++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java
@@ -515,6 +515,8 @@ public class MavenParser {
                 switch (reader.getLocalName()) {
                     case "artifactId":
                         artifactId = reader.getElementText();
+                       /* jsch.agentproxy is an empty artifact. */
+                       if (artifactId.equals("jsch.agentproxy")) return;
                         break;
                     case "groupId":
                         groupId = reader.getElementText();