[meta-java][master][pyro][PATCH 0/4] xml-commons: unblacklist

[meta-java][master][pyro][PATCH 0/4] xml-commons: unblacklist

[Tim Orling]

In preparation for maven, we need xml-commons in better shape. The
following patches correct the behavior that led to blacklisting, update
versions --where possible-- and fix Recipe Specific Sysroots (RSS)
regressions.

If you have issues with "javac" core-dumping, it appears to be
due to a bug in sstate which I have yet to track down. When you
-c devshell, the symptom is that .../usr/share/java/ecj-bootstrap.jar
symlink and the real file are not present. The workaround is to wipe
tmp and sstate-cache and rebuild :(

I am also seeing some odd behavior while fetching source jars,
occasionally throwing an error that "unzip" does not exist,
even though bitbake/lib/bb/fetch2 properly associates a .jar
extension with "unzip". I have yet to see a strong enough pattern
to figure out why this is happening. I am fighting the temptation
to add unzip to HOSTTOOLS, as unzip-native should be working.

The remaining blacklisted recipes are proving harder to fix than
I would hope. Much of this infrastructure is aging badly upstream.

Tim Orling (4):
  xom: unblacklist and update to v1.2.10
  jaxen: unblacklist and update to v1.1.6
  dom4j: unblacklist and fix build
  jdom: unblacklist and update to v1.1.3

 recipes-core/xml-commons/dom4j_1.6.1.bb            | 29 ++++++------
 recipes-core/xml-commons/jaxen_1.1.1.bb            | 35 --------------
 recipes-core/xml-commons/jaxen_1.1.6.bb            | 40 ++++++++++++++++
 recipes-core/xml-commons/jdom_1.1.3.bb             | 25 ++++++++++
 recipes-core/xml-commons/jdom_1.1.bb               | 28 -----------
 .../04_remove_sun_import.patch                     |  0
 recipes-core/xml-commons/xom_1.1.bb                | 54 ----------------------
 recipes-core/xml-commons/xom_1.2.10.bb             | 50 ++++++++++++++++++++
 8 files changed, 129 insertions(+), 132 deletions(-)
 delete mode 100644 recipes-core/xml-commons/jaxen_1.1.1.bb
 create mode 100644 recipes-core/xml-commons/jaxen_1.1.6.bb
 create mode 100644 recipes-core/xml-commons/jdom_1.1.3.bb
 delete mode 100644 recipes-core/xml-commons/jdom_1.1.bb
 rename recipes-core/xml-commons/{xom-1.1 => xom-1.2.10}/04_remove_sun_import.patch (100%)
 delete mode 100644 recipes-core/xml-commons/xom_1.1.bb
 create mode 100644 recipes-core/xml-commons/xom_1.2.10.bb

-- 
2.9.4

[meta-java][master][pyro][PATCH 1/4] xom: unblacklist and update to v1.2.10

[Tim Orling]

- License checksum changed (updated year)
- Add SUMMARY and expand DESCRIPTION
- Clone jaxen dependency from github, update to v1.1.6
- Move SRC_URI checksums to recommended location in recipe
- Add virtual/javac-native to DEPENDS for RSS

Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com>
---
 .../04_remove_sun_import.patch                     |  0
 recipes-core/xml-commons/xom_1.1.bb                | 54 ----------------------
 recipes-core/xml-commons/xom_1.2.10.bb             | 50 ++++++++++++++++++++
 3 files changed, 50 insertions(+), 54 deletions(-)
 rename recipes-core/xml-commons/{xom-1.1 => xom-1.2.10}/04_remove_sun_import.patch (100%)
 delete mode 100644 recipes-core/xml-commons/xom_1.1.bb
 create mode 100644 recipes-core/xml-commons/xom_1.2.10.bb

diff --git a/recipes-core/xml-commons/xom-1.1/04_remove_sun_import.patch b/recipes-core/xml-commons/xom-1.2.10/04_remove_sun_import.patch
similarity index 100%
rename from recipes-core/xml-commons/xom-1.1/04_remove_sun_import.patch
rename to recipes-core/xml-commons/xom-1.2.10/04_remove_sun_import.patch
diff --git a/recipes-core/xml-commons/xom_1.1.bb b/recipes-core/xml-commons/xom_1.1.bb
deleted file mode 100644
index c37965b..0000000
--- a/recipes-core/xml-commons/xom_1.1.bb
+++ /dev/null
@@ -1,54 +0,0 @@
-DESCRIPTION = "Tree-based API for processing XML with Java"
-LICENSE = "LGPL-2.1"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=456080cf80cd56d4d58118c1d10d824f"
-
-HOMEPAGE = "http://xom.nu"
-
-SRC_URI = "\
-	http://www.cafeconleche.org/XOM/${P}-src.tar.gz;name=archive \
-	http://dist.codehaus.org/jaxen/distributions/jaxen-1.1.1-src.tar.gz;name=jaxen \
-	file://04_remove_sun_import.patch \
-	"
-
-# DEBUG: Executing shell function do_compile
-# ----------
-# 1. ERROR in src/nu/xom/UnicodeUtil.java (at line 0)
-# 	/* Copyright 2005 Elliotte Rusty Harold
-# 	^
-# Internal compiler error: java.lang.StackOverflowError at org.eclipse.jdt.internal.compiler.ast.Expression.checkNPE(Expression.java:511)
-# ----------
-# Exception in thread "main" java.lang.StackOverflowError
-#    at org.eclipse.jdt.internal.compiler.ast.Expression.checkNPE(Expression.java:511)
-PNBLACKLIST[xom] ?= "BROKEN: do_compile fails with internal javac error"
-
-S = "${WORKDIR}/XOM"
-
-inherit java-library
-
-DEPENDS = "fastjar-native xerces-j xalan-j"
-
-do_compile() {
-    mkdir -p build
-
-    oe_makeclasspath cp -s xercesImpl xalan2
-    cp=build:$cp
-
-    scp="${WORKDIR}/jaxen-1.1.1/src/java/main"
-
-    javac -sourcepath src:$scp -cp $cp -d build `find src -name "*.java" -and -not \( -wholename "*tests*" -or -wholename "*samples*" -or -wholename "*tools*" \)`
-    javac -sourcepath fatsrc:$scp -cp $cp -d build `find fatsrc -name "*.java" -and -not \( -wholename "*tests*" -or -wholename "*samples*" -or -wholename "*tools*" \)`
-    javac -sourcepath src15:$scp -cp $cp -d build `find src15 -name "*.java" -and -not \( -wholename "*tests*" -or -wholename "*samples*" -or -wholename "*tools*" \)`
-
-    (cd src && find . -name "*.properties" -exec cp {} ../build/{} \;)
-
-    # Remove Jaxen classes from build
-    rm -rf build/org/jaxen
-    rm -rf build/org/w3c
-
-    fastjar -C build -c -f ${JARFILENAME} .
-}
-
-SRC_URI[archive.md5sum] = "e5ae82568d7b1faeb950140c34fbbcb1"
-SRC_URI[archive.sha256sum] = "d648fd1f7b7437123afa63df06f6a6409a0487c99ca8f8beba75aaa474d65818"
-SRC_URI[jaxen.md5sum] = "b598ae6b7e765a92e13667b0a80392f4"
-SRC_URI[jaxen.sha256sum] = "f24ae604a20da87e3716bb1d441c483e56479eaef4e99888f41be06059790bca"
diff --git a/recipes-core/xml-commons/xom_1.2.10.bb b/recipes-core/xml-commons/xom_1.2.10.bb
new file mode 100644
index 0000000..0e923d4
--- /dev/null
+++ b/recipes-core/xml-commons/xom_1.2.10.bb
@@ -0,0 +1,50 @@
+SUMMARY = "Tree-based API for processing XML with Java"
+DESCRIPTION = "XML object model which is a tree-based API for processing XML \
+with Java that strives for correctness, simplicity, and performance."
+LICENSE = "LGPL-2.1"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3f18f166096348ef9d457214a2484816"
+
+HOMEPAGE = "http://xom.nu"
+
+# jaxen recipe depends on xom, avoid circular dependency
+# upstream jaxen moved to github, do not count on ephemeral github archives
+SRCNAME_jaxen = "jaxen"
+SRCREV_jaxen = "7d7755ac8b19daa2ff6f319f432b864cc72d89b6"
+PV_jaxen = "1.1.6"
+
+SRC_URI = "\
+	http://www.cafeconleche.org/XOM/${P}-src.tar.gz;name=archive \
+	git://github.com/codehaus/${SRCNAME_jaxen};name=jaxen \
+	file://04_remove_sun_import.patch \
+"
+SRC_URI[archive.md5sum] = "9f3a2ae827a9f6826fe76e4b7b0c22b3"
+SRC_URI[archive.sha256sum] = "39985c2debb8044005fd07b09cb06f10e75652b3c048c9b4431434215332bc85"
+
+S = "${WORKDIR}/XOM"
+
+inherit java-library
+
+DEPENDS = "fastjar-native virtual/javac-native xerces-j xalan-j"
+
+do_compile() {
+    mkdir -p build
+
+    oe_makeclasspath cp -s xercesImpl xalan2
+    cp=build:$cp
+
+    mv ${WORKDIR}/git/jaxen ${WORKDIR}/jaxen-${PV_jaxen}
+    rm -rf ${WORKDIR}/git
+    scp="${WORKDIR}/jaxen-${PV_jaxen}/src/java/main"
+
+    javac -sourcepath src:$scp -cp $cp -d build `find src -name "*.java" -and -not \( -wholename "*tests*" -or -wholename "*samples*" -or -wholename "*tools*" \)`
+    javac -sourcepath fatsrc:$scp -cp $cp -d build `find fatsrc -name "*.java" -and -not \( -wholename "*tests*" -or -wholename "*samples*" -or -wholename "*tools*" \)`
+    javac -sourcepath src15:$scp -cp $cp -d build `find src15 -name "*.java" -and -not \( -wholename "*tests*" -or -wholename "*samples*" -or -wholename "*tools*" \)`
+
+    (cd src && find . -name "*.properties" -exec cp {} ../build/{} \;)
+
+    # Remove Jaxen classes from build
+    rm -rf build/org/jaxen
+    rm -rf build/org/w3c
+
+    fastjar -C build -c -f ${JARFILENAME} .
+}
-- 
2.9.4

[meta-java][master][pyro][PATCH 2/4] jaxen: unblacklist and update to v1.1.6

[Tim Orling]

- Add SUMMARY and expand DESCRIPTION
- Upstream moved to github, use git not ephemeral archive tarball
- Fix path for 'find org ...'
- Move SRC_URI checksums to recommended location in recipe
- Add virtual/javac-native to DEPENDS for RSS

Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com>
---
 recipes-core/xml-commons/jaxen_1.1.1.bb | 35 -----------------------------
 recipes-core/xml-commons/jaxen_1.1.6.bb | 40 +++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 35 deletions(-)
 delete mode 100644 recipes-core/xml-commons/jaxen_1.1.1.bb
 create mode 100644 recipes-core/xml-commons/jaxen_1.1.6.bb

diff --git a/recipes-core/xml-commons/jaxen_1.1.1.bb b/recipes-core/xml-commons/jaxen_1.1.1.bb
deleted file mode 100644
index 4853683..0000000
--- a/recipes-core/xml-commons/jaxen_1.1.1.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION = "XPath library written in Java"
-LICENSE = "BSD"
-
-HOMEPAGE = "http://jaxen.codehaus.org/"
-
-DEPENDS = "fastjar-native xerces-j xom"
-
-SRC_URI = "\
-	http://dist.codehaus.org/jaxen/distributions/jaxen-${PV}-src.tar.gz;name=archive \
-	http://www.jdom.org/dist/binary/archive/jdom-1.1.tar.gz;name=jdom \
-	"
-
-PNBLACKLIST[jaxen] ?= "BROKEN: depends on broken 'xom'"
-
-inherit java-library
-
-do_compile() {
-  mkdir -p build
-
-  oe_makeclasspath cp -s xercesImpl xom
-	scp="src/java/main:${WORKDIR}/jdom-1.1/src/java"
-
-  javac -sourcepath $scp -cp $cp -d build `find src/java/main -name "*.java" -and -not -wholename "*dom4j*"`
-  (cd src && find org -name "*.properties" -exec cp {} ../build/{} \;)
-
-	rm -rf build/org/jdom
-
-  fastjar -C build -c -f ${JARFILENAME} .
-}
-
-
-SRC_URI[archive.md5sum] = "b598ae6b7e765a92e13667b0a80392f4"
-SRC_URI[archive.sha256sum] = "f24ae604a20da87e3716bb1d441c483e56479eaef4e99888f41be06059790bca"
-SRC_URI[jdom.md5sum] = "22745cbaaddb12884ed8ee09083d8fe2"
-SRC_URI[jdom.sha256sum] = "a13549087141be24ad176b659afdc2c675f1ffa5288ff999a193d6d44a282056"
diff --git a/recipes-core/xml-commons/jaxen_1.1.6.bb b/recipes-core/xml-commons/jaxen_1.1.6.bb
new file mode 100644
index 0000000..2e313fa
--- /dev/null
+++ b/recipes-core/xml-commons/jaxen_1.1.6.bb
@@ -0,0 +1,40 @@
+SUMMARY = "XPath library written in Java"
+DESCRIPTION = "Adaptable to many different object models, including \
+DOM, XOM, dom4j, and JDOM. Is it also possible to write adapters that \
+treat non-XML trees such as compiled Java byte code or Java beans as XML, \
+thus enabling you to query these trees with XPath too.\
+"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a2e66c2e2482aa23c11342f1469fa3b6"
+
+HOMEPAGE = "http://jaxen.org/"
+
+DEPENDS = "fastjar-native xerces-j xom"
+
+# upstream has moved to github, do not rely on ephemeral tarball, use git
+SRCREV = "7d7755ac8b19daa2ff6f319f432b864cc72d89b6"
+
+SRC_URI = "\
+        git://github.com/codehaus/${BPN} \
+        http://www.jdom.org/dist/binary/archive/jdom-1.1.tar.gz;name=jdom \
+"
+SRC_URI[jdom.md5sum] = "22745cbaaddb12884ed8ee09083d8fe2"
+SRC_URI[jdom.sha256sum] = "a13549087141be24ad176b659afdc2c675f1ffa5288ff999a193d6d44a282056"
+
+S = "${WORKDIR}/git/jaxen"
+
+inherit java-library
+
+do_compile() {
+  mkdir -p build
+
+  oe_makeclasspath cp -s xercesImpl xom
+	scp="src/java/main:${WORKDIR}/jdom-1.1/src/java"
+
+  javac -sourcepath $scp -cp $cp -d build `find src/java/main -name "*.java" -and -not -wholename "*dom4j*"`
+  (cd src/java/main && find org -name "*.properties" -exec cp {} ../../../build/{} \;)
+
+	rm -rf build/org/jdom
+
+  fastjar -C build -c -f ${JARFILENAME} .
+}
-- 
2.9.4

[meta-java][master][pyro][PATCH 3/4] dom4j: unblacklist and fix build

[Tim Orling]

- Add SUMMARY and expand DESCRIPTION
- Update HOMEPAGE
- Update URI for jaxme
- Add LIC_FILE_CHECKSUM
- Fix path for 'find org ...'
- Move SRC_URI checksums to recommended location in recipe
- Add virtual/javac-native to DEPENDS for RSS

Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com>
---
 recipes-core/xml-commons/dom4j_1.6.1.bb | 29 ++++++++++++++---------------
 recipes-core/xml-commons/jaxen_1.1.6.bb |  2 +-
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/recipes-core/xml-commons/dom4j_1.6.1.bb b/recipes-core/xml-commons/dom4j_1.6.1.bb
index 19dca74..97c9947 100644
--- a/recipes-core/xml-commons/dom4j_1.6.1.bb
+++ b/recipes-core/xml-commons/dom4j_1.6.1.bb
@@ -1,17 +1,22 @@
+SUMMARY = "A simple and flexible library for working with XML, XPath and XSLT"
 DESCRIPTION = "dom4j is a simple and flexible Java library for working with XML, XPath and XSLT"
 LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3f752b663f2a821c3b32482fc6aece3c"
 
-HOMEPAGE = "http://dom4j.org"
+HOMEPAGE = "http://dom4j.github.io"
 
-DEPENDS = "fastjar-native xerces-j xalan-j xpp2 xpp3 jaxen"
+DEPENDS = "fastjar-native virtual/javac-native \
+           xerces-j xalan-j xpp2 xpp3 jaxen"
 
 SRC_URI = "\
-	${SOURCEFORGE_MIRROR}/dom4j/${P}.tar.gz;name=archive \
-	http://apache.org/dist/ws/jaxme/source/ws-jaxme-0.5.2-src.tar.gz;name=jaxme \
-	file://debian.patch \
-	"
-
-PNBLACKLIST[dom4j] ?= "BROKEN: indirectly depends on broken 'xom'"
+        ${SOURCEFORGE_MIRROR}/dom4j/${P}.tar.gz;name=archive \
+        http://archive.apache.org/dist/ws/jaxme/source/ws-jaxme-0.5.2-src.tar.gz;name=jaxme \
+        file://debian.patch \
+"
+SRC_URI[archive.md5sum] = "1e7ef6d20939315714de4a8502f27b2d"
+SRC_URI[archive.sha256sum] = "01b4abf86bce337a2a900bf121b3107320ba63b4c0f352e1922fbec6e0736c6f"
+SRC_URI[jaxme.md5sum] = "084ebfe4a816058f8ff6bd731fa70df4"
+SRC_URI[jaxme.sha256sum] = "0415d721259acf95c564fb84606bb17f6227c1cc444e89b78d1cd9903c1c88dc"
 
 inherit java-library
 
@@ -22,16 +27,10 @@ do_compile() {
 	scp="src/java:${WORKDIR}/ws-jaxme-0.5.2/src/api"
 
   javac -sourcepath $scp -cp $cp -d build `find src/java -name "*.java" -and -not -wholename "*datatype*"`
-  (cd src && find org -name "*.properties" -exec cp {} ../build/{} \;)
+  (cd src/java && find org -name "*.properties" -exec cp {} ../../build/{} \;)
 
 	rm -rf build/org/w3c
 	rm -rf build/javax
 
   fastjar -C build -c -f ${JARFILENAME} .
 }
-
-
-SRC_URI[archive.md5sum] = "1e7ef6d20939315714de4a8502f27b2d"
-SRC_URI[archive.sha256sum] = "01b4abf86bce337a2a900bf121b3107320ba63b4c0f352e1922fbec6e0736c6f"
-SRC_URI[jaxme.md5sum] = "084ebfe4a816058f8ff6bd731fa70df4"
-SRC_URI[jaxme.sha256sum] = "0415d721259acf95c564fb84606bb17f6227c1cc444e89b78d1cd9903c1c88dc"
diff --git a/recipes-core/xml-commons/jaxen_1.1.6.bb b/recipes-core/xml-commons/jaxen_1.1.6.bb
index 2e313fa..d75ce75 100644
--- a/recipes-core/xml-commons/jaxen_1.1.6.bb
+++ b/recipes-core/xml-commons/jaxen_1.1.6.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a2e66c2e2482aa23c11342f1469fa3b6"
 
 HOMEPAGE = "http://jaxen.org/"
 
-DEPENDS = "fastjar-native xerces-j xom"
+DEPENDS = "fastjar-native virtual/javac-native xerces-j xom"
 
 # upstream has moved to github, do not rely on ephemeral tarball, use git
 SRCREV = "7d7755ac8b19daa2ff6f319f432b864cc72d89b6"
-- 
2.9.4

[meta-java][master][pyro][PATCH 4/4] jdom: unblacklist and update to v1.1.3

[Tim Orling]

    - Add SUMMARY and expand DESCRIPTION
    - Add LIC_FILES_CHECKSUM
    - Move SRC_URI checksums to recommended location in recipe
    - Add virtual/javac-native to DEPENDS for RSS

Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com>
---
 recipes-core/xml-commons/jdom_1.1.3.bb | 25 +++++++++++++++++++++++++
 recipes-core/xml-commons/jdom_1.1.bb   | 28 ----------------------------
 2 files changed, 25 insertions(+), 28 deletions(-)
 create mode 100644 recipes-core/xml-commons/jdom_1.1.3.bb
 delete mode 100644 recipes-core/xml-commons/jdom_1.1.bb

diff --git a/recipes-core/xml-commons/jdom_1.1.3.bb b/recipes-core/xml-commons/jdom_1.1.3.bb
new file mode 100644
index 0000000..80b836a
--- /dev/null
+++ b/recipes-core/xml-commons/jdom_1.1.3.bb
@@ -0,0 +1,25 @@
+SUMMARY = "Parses, manipulates, and outputs XML using standard Java constructs"
+DESCRIPTION = "JDOM aims to provide a complete, Java-based solution for \
+accessing, manipulating, and outputting XML data from Java code."
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=897c700e4c122d8f4ef8f6d253a6f744"
+
+HOMEPAGE = "http://jdom.org/"
+
+DEPENDS = "fastjar-native virtual/javac-native jaxen"
+
+SRC_URI = "http://www.jdom.org/dist/source/archive/jdom-${PV}.tar.gz" 
+SRC_URI[md5sum] = "dc8391e84cfdb170fcd8279aa370019f"
+SRC_URI[sha256sum] = "d471718c4ac7a1a2f10715b93cb3fcd2ecbab60384b73ad1c089712e47bd8d1f"
+
+inherit java-library
+
+do_compile() {
+  mkdir -p build
+
+  oe_makeclasspath cp -s jaxen
+
+  javac -sourcepath src/java -cp $cp -d build `find src/java -name "*.java"`
+
+  fastjar -C build -c -f ${JARFILENAME} .
+}
diff --git a/recipes-core/xml-commons/jdom_1.1.bb b/recipes-core/xml-commons/jdom_1.1.bb
deleted file mode 100644
index 4867e82..0000000
--- a/recipes-core/xml-commons/jdom_1.1.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION = "Parses, manipulates, and outputs XML using standard Java constructs"
-LICENSE = "BSD"
-
-HOMEPAGE = "http://jdom.org/"
-
-DEPENDS = "fastjar-native jaxen"
-
-SRC_URI = "\
-	http://www.jdom.org/dist/binary/archive/jdom-${PV}.tar.gz \
-	"
-
-PNBLACKLIST[jdom] ?= "BROKEN: indirectly depends on broken 'xom'"
-
-inherit java-library
-
-do_compile() {
-  mkdir -p build
-
-  oe_makeclasspath cp -s jaxen
-
-  javac -sourcepath src/java -cp $cp -d build `find src/java -name "*.java"`
-
-  fastjar -C build -c -f ${JARFILENAME} .
-}
-
-
-SRC_URI[md5sum] = "22745cbaaddb12884ed8ee09083d8fe2"
-SRC_URI[sha256sum] = "a13549087141be24ad176b659afdc2c675f1ffa5288ff999a193d6d44a282056"
-- 
2.9.4