diff options
author | Benda Xu <heroxbd@gentoo.org> | 2016-10-06 20:17:08 +0900 |
---|---|---|
committer | Benda Xu <heroxbd@gentoo.org> | 2016-10-06 20:17:08 +0900 |
commit | 10127d8936bec4f6e162d9d8a59ebc7bf10c9662 (patch) | |
tree | 714859cc7abaac470bf4504a11e5e0e737ee7b63 | |
parent | change script shebangs to /bin/bash. (diff) | |
download | java-ebuilder-10127d8936bec4f6e162d9d8a59ebc7bf10c9662.tar.gz java-ebuilder-10127d8936bec4f6e162d9d8a59ebc7bf10c9662.tar.bz2 java-ebuilder-10127d8936bec4f6e162d9d8a59ebc7bf10c9662.zip |
Move the jsch-agentproxy into java.
Ugly hack, but better than removing lines from ebuilds.
Should put this into some configuration file.
-rwxr-xr-x | scripts/tree.sh | 12 | ||||
-rw-r--r-- | src/main/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(); |