# ChangeLog for dev-java/jackson-annotations
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jackson-annotations/ChangeLog,v 1.1 2014/01/12 18:26:21 ercpe Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jackson-annotations/ChangeLog,v 1.2 2015/03/04 23:20:10 chewi Exp $
+
+*jackson-annotations-2.5.1 (04 Mar 2015)
+
+ 04 Mar 2015; James Le Cuirot <chewi@gentoo.org>
+ +jackson-annotations-2.5.1.ebuild, -files/2.3.0-build.xml,
+ -jackson-annotations-2.3.0.ebuild:
+ Version bump.
*jackson-annotations-2.3.0 (12 Jan 2014)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX 2.3.0-build.xml 4552 SHA256 adac7635820206130910950a835be4ed5162d29216134084918059b3d2517679 SHA512 e4c0d5ab73125aa5d39873a175eadb01c26f5fb7bf1f9280028411988e44f6ce4d1ed4b3853bd913b0e6f3acf68cbe187af92e7f0c94783f27fcdeca2ab49e8c WHIRLPOOL 8858a5b711747d33f3d85ddd8ff8da7cb621d27b7b6db06bece33ef32138cb374c89f5d0c9788392c0fab8804afc79efeca6cdfb33b430b245cc796e5d12dd92
-DIST jackson-annotations-2.3.0.tar.gz 25784 SHA256 31075d438e9c289b88949c599eb117bf0df7be1b32a821cf9bcef85a94f38f54 SHA512 533c0a798e79d89395e803bb96cf3bc8d21ddbe9a1c35194350e3f61d1fe1b85683cbb6cd7d80c42ac014007cc86ac54a3c6702e55eeebebf359cf2c66254499 WHIRLPOOL 2079e689f3bc795e96bdfc88643c82901e09e6e288b36945b463e5f1c5b4df54d70b99d4898d2108abf29ea5e6628bde9ee6e913e5b0fa2e45d297550229b1bf
-EBUILD jackson-annotations-2.3.0.ebuild 866 SHA256 05073e2507dae08c31bf7f37baeed7680aa505d6113eb1cf31245829af82b450 SHA512 d251032d6c4d9c9af9e67196c84a62faf7a70c1a61355bdc2c60d77d24667258d282a54570be286db1174eebf07e16cdec135c13686df5b36eb6fa969079d8ae WHIRLPOOL aa0730f34ea0a02a4094f72918caa16c0a9654f05ddf60ac476b5e6821210a47ac2f87e1594a144e5fde2587053eaef5d68fc5ce6e69b5be815f7f743e3927f9
-MISC ChangeLog 458 SHA256 479dd021db9a3e188fbd08b3f4557f26f3a1dd591ddf11cc5838e42066ea5427 SHA512 d61e724aa1f09d7c98eaa794fc66882abf8433f1fe05bf944decd0c68f3f1addd352712b5e741d8f939ef8168b8a8ca32da4fd7cbf20f27571e93ac648300d5a WHIRLPOOL 1bfd10c1ce3f8e68899f452b6fdfe5873707fa3e50382fc7946625c65fb6cc457ed5d992e1db2d89738079ac9970024f3ff86fda4da8dfc65d53950c921812f2
+DIST jackson-annotations-2.5.1.tar.gz 30360 SHA256 420d3ec38878c63d674500878539d1f32917e3aac1b9d53461020c01629d9f18 SHA512 3ff90be8927db847379371c5997a7f37bd55b368cd884b50913f454c704e10ac7819072409533cc6b8441dcb239c3694332ae8e800590d2b9c6701cccdc65364 WHIRLPOOL 04a484acf05db44e599da61388b288e5a9f9fff7289740d8620d8b4b1b6201fa4bc3722c5266904b28ab97caca84e7a4bcb67864c1b52b91ba96bc0c92ad3ef5
+EBUILD jackson-annotations-2.5.1.ebuild 762 SHA256 ce71788330721f73366556f41129d69bbe1d925a7f20cf088ddb5fb14e687ca2 SHA512 4d83bf0c8a14d3d484ad915ee21130a4ace1602c61d4dafaed73aeaa8da0f4e8ead8d2891bb43b098aa083cdc2c7141ad93088841780298e2945e6b4eb34f245 WHIRLPOOL 6a69e23288a9569425e3ffa53a7941650a64545921e5ebc1756775cfae4142f83291cdf105f7170390bdf04ae0624d110601aadf0b73e9390aa50a073436b232
+MISC ChangeLog 665 SHA256 987fbddf16bb3d250184bd7348c6298181b473defb98caaf2c0c9684d3e7514b SHA512 8f7bf5ae9911716dba1f885962eb0ed80aacd28a59086c0e809009a8c529aa5eac8c523c569e8b12c08a0452f0f23dfbb5508e406cc5272fe77db5f3f1352f96 WHIRLPOOL 9e24e1d723179e904fdd04c0dbca44acc9c5944cb2146852e9475ac59ba22cadb7921bb2651ea4923c0edeb12fdad99475447ddf16b481ef5554eef9bca4dbd5
MISC metadata.xml 159 SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b SHA512 269cf19c37f2d136b926f546ec83ffdbc1374b2b6e26f8a31f21854143380386c31bfc7b2a0b9c47fb1f7c02607ddbdd43e517cb5c3270515e465c4dd7788843 WHIRLPOOL afb402fec04cddb3184b69eb8a8d36b404edd2870fd06c8f5e99be39c341ea6fa7542e0b680fac05529522ed33838e8279381d7a6de9dbc58fe55841229d8a51
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
-iQEcBAEBCAAGBQJS0t5SAAoJEKCEBkJ3xQHtPBkH/0yr9eRDcBl1G8frVG7Px9i2
-bcljBFng/GvahIV6AxBruZxOWwRapbmk8dpEgRDCOO8TKsVp1pyrVCD6M+Ux2u0h
-G9npk3Ov+jv+od4xr4CRzcMIE4u49zlRw2ti3AZkBbDzYU2B8YhSxYs1eczG8n4C
-Ojp36WdxqdU02h6ejLU7PD7x3bmOXP5Ui+/qxqvIGgRNNjTnpwtjooQEVSCMRx/G
-PfZ1Q/h8Cj3+8U+Pd4zIaIgNKavd8TCmEQ+9LaJxaXMjYHT6c0YX89U1Rk0RntDM
-8XCajU3imNIy+FBjEeyojtuOofTTC5nbe75ZL4mb3WbyF3nlbZ1mgYctUJdnVi0=
-=j9Su
+iQJ8BAEBCABmBQJU95MwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3krEcP/284e8uq93rbqGehP0Rb4E5Z
+QeC6p54m0a2C8De4Bei60Db1M1Lm4okJuilopC+pw5oV+88lbsqvwtjdL8sP3hG5
+2tv8AQs2skiwShecrftKDynxbm38zxCnS7AWXwtZD0OkF/dqd2d6dyI+xWN3yoy/
+7uDmggw7AYIGqLnfJCQl5QPg0Kut0XKStDPwKotfXBX5IE2H9VXKuo3j2s5ujas+
+9UTA77AuQwWPeD1ngil5twcXZ9v74SzepFZwd9N5iAgQI5To9wJCHHbse/GdGR0i
+zDGDel6wAqBAOVwIH/lNlRV5Z825FAlc5VXgxJemfIkje9+lo1cm9Wx08Kfjht1Y
+AXsO3NWGz52Sbl2DG5xwqNxdbvSDVSR7qyk2vdD6NLDKYY6pQ9OsjL70Em8PY2o0
+l6qP+2r64aMO9sRO4VcmevL56CBScKf3ewvvKUfhU3dL3fCFsOLxiOg7KpRVl2w9
+YXrWN7PnXvK/HBu9jr4xYiebBIU4lodWy8eQnK31Ktm+j+D5JQwf/kjm6IyNtlUS
+LTfYeFK3IWDpwXR93jLPFbfFXBORfmpWCmyg/IbLcOv5eliLCAnE7dT7/lVn8Dc0
+jB8swSbX6C98QOYu523//9sfaP55ZnKBBFc696JbKHEyu2Y9c3mipxNpm0Xz96YH
+ycAaCaXv4HqI9S7A2U8q
+=LMVB
-----END PGP SIGNATURE-----
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="jackson-annotations" default="jar" basedir=".">
- <property file="${user.home}/.m2/maven.properties" />
- <property file="maven-build.properties" />
-
- <property name="maven.build.finalName" value="${ant.project.name}" />
- <property name="maven.build.dir" value="target" />
- <property name="maven.build.outputDir" value="${maven.build.dir}/classes" />
- <property name="maven.build.srcDir.0" value="src/main/java" />
- <property name="maven.build.resourceDir.0" value="src/main/resources" />
- <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes" />
- <property name="maven.build.testDir.0" value="src/test/java" />
- <property name="maven.build.testResourceDir.0" value="src/test/resources" />
- <property name="maven.test.reports" value="${maven.build.dir}/test-reports" />
- <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site" />
-
- <property name="maven.repo.local" value="${user.home}/.m2/repository" />
- <property name="maven.settings.offline" value="false" />
- <property name="maven.settings.interactiveMode" value="true" />
-
- <path id="build.classpath" />
- <path id="build.test.classpath">
- </path>
-
- <target name="clean" description="Clean the output directory">
- <delete dir="${maven.build.dir}" />
- </target>
-
- <target name="compile" description="Compile the code">
- <mkdir dir="${maven.build.outputDir}" />
- <javac destdir="${maven.build.outputDir}" nowarn="true" debug="true" optimize="true" deprecation="true" target="1.6" verbose="false" fork="false" source="1.6">
- <src>
- <pathelement location="${maven.build.srcDir.0}" />
- </src>
- <classpath refid="build.classpath" />
- </javac>
- <copy todir="${maven.build.outputDir}">
- <fileset dir="${maven.build.resourceDir.0}" />
- </copy>
- </target>
-
- <target name="compile-tests" depends="compile" description="Compile the test code" unless="maven.test.skip">
- <mkdir dir="${maven.build.testOutputDir}" />
- <javac destdir="${maven.build.testOutputDir}" nowarn="true" debug="true" optimize="true" deprecation="true" target="1.6" verbose="false" fork="false" source="1.6">
- <src>
- <pathelement location="${maven.build.testDir.0}" />
- </src>
- <classpath>
- <path refid="build.test.classpath" />
- <pathelement location="${maven.build.outputDir}" />
- </classpath>
- </javac>
- <copy todir="${maven.build.testOutputDir}">
- <fileset dir="${maven.build.testResourceDir.0}" />
- </copy>
- </target>
-
- <target name="test" depends="compile-tests" description="Run the test cases">
- <mkdir dir="${maven.test.reports}" />
- <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
- <sysproperty key="basedir" value="." />
- <formatter type="xml" />
- <formatter type="plain" usefile="false" />
- <classpath>
- <path refid="build.test.classpath" />
- <pathelement location="${maven.build.outputDir}" />
- <pathelement location="${maven.build.testOutputDir}" />
- </classpath>
- <batchtest todir="${maven.test.reports}" unless="test">
- <fileset dir="${maven.build.testDir.0}">
- <include name="**/Test*.java" />
- <include name="**/*Test.java" />
- <include name="**/*TestCase.java" />
- <exclude name="**/*Abstract*Test.java" />
- <exclude name="**/BaseTest.java" />
- <exclude name="**/ConcurrencyReadTest.java" />
- </fileset>
- </batchtest>
- <batchtest todir="${maven.test.reports}" if="test">
- <fileset dir="${maven.build.testDir.0}">
- <include name="**/${test}.java" />
- <exclude name="**/*Abstract*Test.java" />
- <exclude name="**/BaseTest.java" />
- <exclude name="**/ConcurrencyReadTest.java" />
- </fileset>
- </batchtest>
- </junit>
- </target>
-
- <target name="javadoc" description="Generates the Javadoc of the application">
- <javadoc sourcepath="${maven.build.srcDir.0}" packagenames="*" destdir="${maven.reporting.outputDirectory}/apidocs" access="protected" old="false" verbose="false" encoding="UTF-8" version="true" use="true" author="true" splitindex="false" nodeprecated="false" nodeprecatedlist="false" notree="false" noindex="false" nohelp="false" nonavbar="false" serialwarn="false" charset="ISO-8859-1" source="1.6" linksource="false" breakiterator="false" maxmemory="1g">
- </javadoc>
- </target>
-
- <target name="jar" depends="compile" description="Package the application">
- <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" compress="true" index="false" basedir="${maven.build.outputDir}" excludes="**/package.html" />
- </target>
-
-</project>
+++ /dev/null
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jackson-annotations/jackson-annotations-2.3.0.ebuild,v 1.1 2014/01/12 18:26:21 ercpe Exp $
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="High-performance JSON processor"
-HOMEPAGE="http://jackson.codehaus.org"
-SRC_URI="https://github.com/FasterXML/${PN}/archive/${PN}-${PV}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 LGPL-2.1 )"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5"
-
-S="${WORKDIR}/${PN}-${PN}-${PV}"
-
-java_prepare() {
- cp "${FILESDIR}"/${PV}-build.xml "${S}"/build.xml || die
-}
-
-src_install() {
- java-pkg_dojar target/${PN}.jar
-
- use doc && java-pkg_dojavadoc target/site/apidocs/
- use source && java-pkg_dosrc src/main/java/*
-}
--- /dev/null
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jackson-annotations/jackson-annotations-2.5.1.ebuild,v 1.1 2015/03/04 23:20:10 chewi Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="High-performance JSON processor"
+HOMEPAGE="https://github.com/FasterXML/jackson-annotations"
+SRC_URI="https://github.com/FasterXML/${PN}/archive/${PN}-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5"
+
+S="${WORKDIR}/${PN}-${P}/src"
+JAVA_SRC_DIR="main/java"
+
+src_install() {
+ java-pkg-simple_src_install
+ dodoc ../README.md ../release-notes/VERSION
+}
# ChangeLog for dev-java/jackson-databind
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jackson-databind/ChangeLog,v 1.1 2014/01/12 18:53:43 ercpe Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jackson-databind/ChangeLog,v 1.2 2015/03/04 23:21:13 chewi Exp $
+
+*jackson-databind-2.5.1 (04 Mar 2015)
+
+ 04 Mar 2015; James Le Cuirot <chewi@gentoo.org> +files/real-cglib.patch,
+ +jackson-databind-2.5.1.ebuild, -files/2.3.1-build.xml,
+ -jackson-databind-2.3.1.ebuild:
+ Version bump.
*jackson-databind-2.3.1 (12 Jan 2014)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX 2.3.1-build.xml 4681 SHA256 693692a010f0c1c12b1648ab06eb65ee419d83a6ee4dbaffd9c17b09e2073190 SHA512 8bbede14ae4e6f73e01eb1abc6dfc65667fbb25af2bcc63a48047394daaa10f30584b6aa57c5bb9993e0e26d32d6afbe2f1d037b943d3cfc021db3cafcf14d62 WHIRLPOOL b212b39abc201b8151489d09793d8678de9b123832e249226899efdc16bb8fd820640615c359b21b7d3b1dc822f6d328a9e24496a9064c4666f1612e2cf4dddc
-DIST jackson-databind-2.3.1.tar.gz 770926 SHA256 81418be27bd496db4710e6bea03d67e45ba38bda6441b0da06717444ab7b6707 SHA512 3b0c7e7b6bae95f6c864bdac6d70b9a8a82902c4966c02ba0f04fdc4f3746114dc2ec5afea91ce5804b79ac4d8106fea1aa5a0d85b21e68f38382de3161a56bb WHIRLPOOL 50f56be513455b7e781e1603da9ff5d9e0d88b717bc762e398630447b44c247329c2e88cc93dbf9c257e375f0e135ede92e2dcdee8628a37a97fbb226fe6235c
-EBUILD jackson-databind-2.3.1.ebuild 1457 SHA256 d9fef26bd5cbb2686b5893b8dd519ad0da1627552e061a39e199e9cfea76d12a SHA512 a2537a7e6425233833833501802377d78d9001c44e20da2baea59493ce4df1063602d6c91298d23dc882819fdabde5a4dba17212736eb4fa4e7aa89f0feef67c WHIRLPOOL 26ff1b768c473265df5e2e1c7035b3d1346ddabd7adeb20f9f50128f98207607832092448c6431c8aef5be8cacc156c82fc2739e3ed9d2ac2460981749a1eb28
-MISC ChangeLog 443 SHA256 799c7c01f30434cbf32ecec22cb43155f327a8da4db5a748e30b86c3d51b90b3 SHA512 c085a3da496362c2ce9f7489f4355b0e0ab7f5dbf31ac817dde48b6adc78ed2da3c8f6ba22204e09ed2568e58da07a0ed476dc27bcf73f165ac807302271e87b WHIRLPOOL e72ec112c17e46aa29c89bd74ad74b4936ed3eaa40945513c24b5ad979882c0839436dc1b26ee549b3e918416942955ab7183243e0488e4c23ada64fb73761da
+AUX real-cglib.patch 1168 SHA256 18517dfc73d42bb81b053d35e39969c81ef1d3b7fc9ce7fc038e109c71a93952 SHA512 7b16eb9c65990817a2f141dea2df60aeb9f8680fa1426ba5329ad0cda493fcba6e87062f85a837a6165982b73385bed5a671e719d5754b78956d6d0ab5f277d3 WHIRLPOOL 21ae60434c690de1671cceb472dc16e05fc1669e28d464d70370d5eedc92e740ede9836865dda97267e60552972f44286e723788aa066d89328dcdaabad2ff5d
+DIST jackson-databind-2.5.1.tar.gz 914121 SHA256 7673a6650d4cd353d3dadfea0afaae30e33a9416550c21772a16ecf36fca1fee SHA512 72792495612143a4601999036a40b67658df5af43c8dde1408c48d4b19581b770442f36bf448a22e19fbc31dbaec2e4cae61b5c7ee7c6c939478083ce1e24131 WHIRLPOOL 92a0fd63e1cdc03da89c024c60c1f6cd2134800d749945daecf2568f1b40db94c83641d6d6219f2d4d70425a8d07d191be39e18b07af9fe0176e1bcc595fde06
+EBUILD jackson-databind-2.5.1.ebuild 2011 SHA256 a5f438234c4fd01a71df8ad1752bde07d4025aa2f13af06469b64313f96c6164 SHA512 ac1aec575ad1059ace0b08d1f8e61772d947163ddea74150110890898d0ba4e86199613cdd49906bc8c9415dc9fb228ebaa0795fb0a5607eaf10ef0eb81be3c4 WHIRLPOOL f9844f9bf63d6d48b24dec96f075c89044c6b33e7d85af45e8332196ae6142540ddac6acd8478499da370476f9ed7054908e9eedf45b154fe2c50c14373d05b6
+MISC ChangeLog 666 SHA256 f3abff5cc045d940ce50c1ca26a4ce8b14f4fa80c6dd107a7b0bb3a541345db6 SHA512 f45f6596080c3d524c84f7b44dcc21165dac3a7ef371c75a46503d9ce9d3e422c872f0555ed82870d59108f88b36e973653ef2069e2cdc41e4b11eebd75c19b7 WHIRLPOOL 0d38104a28ebd6e6885e0b6759a784cb434f406f6b861cd6ef86de835f5dd3fbf123c2742f577814e5bc8a0230284b264da7e4ee5fac8bb1525b6d5a529e848a
MISC metadata.xml 159 SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b SHA512 269cf19c37f2d136b926f546ec83ffdbc1374b2b6e26f8a31f21854143380386c31bfc7b2a0b9c47fb1f7c02607ddbdd43e517cb5c3270515e465c4dd7788843 WHIRLPOOL afb402fec04cddb3184b69eb8a8d36b404edd2870fd06c8f5e99be39c341ea6fa7542e0b680fac05529522ed33838e8279381d7a6de9dbc58fe55841229d8a51
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
-iQEcBAEBCAAGBQJS0uS9AAoJEKCEBkJ3xQHtAcQIAJxl5gRc5VSVjGscsQqIELvl
-vBxo9RGrJqfOUfpvbKTr4PL7I8Qa+rbogtDywXRHQL4zNYyiQOPky6fYP9jYXJLH
-C18X34u6lzRTReZXqVwHy98e9MdSz4wvWlCdVa0LIMDFSfiDE+1FtqoPXJaakezW
-OxAN6kJ1b7LEl+be2pTvcM5S4d5P29xu03wSqgtIoFJ7YeNrv6XyOKBZWBAEp/1K
-RRjOpBBuOVVq0ziWpi4I7vXPKCqvqaDDV2yqLOhPpmdIEOkq9bisVq3yNpENu62X
-HN+YGrXEIE0Au6KM1TROGL5u1ZmscXOgDAS8eCO7vDuAL37mv6ErjLk3zIoDCfc=
-=sP5O
+iQJ8BAEBCABmBQJU95NvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3k0McP/jcWThEZ94NiCTYPJa33wJkI
+qgQI8gCo/aO8U5c2ltkQnOwKFNx/oiSo2jxUd5v9q/6i3cHRv6OgokhpiYYyH7de
+km4dnklODSbKG5EzPUp/ZI6I3PA4BYkuZ0M2UHyjvAFgEsG7MtjzJQEK5c7ynOr6
+GDyiaGa8/nNWfJnhpLEBq1cZySV55aQMeAQkPHAhpFdL7xbDx+DRKHcmwZnPX7Gu
+m+j5F/V4vf6K1IhOTxWVvPpPkBvxb+oaPK/d30IpAIdImgcpKKAaEQdl6B0k6qBi
+CcbaeLdvXwnFgapPpDEm4PmWMoBdM3VHRf9X4bHhRQn5ATxSNMf/6tfQFhvx1B+D
+GUqALjsYLoqXLPi/aIewPX6A5zXqs26MlrEiS6LzISoLyOvisBzAhGFB0ZNLHIpq
+MyZB/svOKyuhHgD3ZIZSCJJ7hO0g9S0NBYVCFHljV2aWVRADK7AvDHumBVIKUg6+
+32mshpSjGUv+M9xxa81rQmtQFD1Mu/iR7WPCEM9Gv/qhoOSvGoTtZcuA3na7k61r
+PNdDcUrgEDm9Xj7T/fSPk/NPfqoPqa8nVquT37f5vxq5fddtigxiuFxtC1xxf006
+Qso93WHoMh6OhnPEp/E+J/KM4hGTD5uhqmZskZa88BUykD9f1vybjuVA9szN2jvK
+7W5H356nqRev//oyayBc
+=FJCj
-----END PGP SIGNATURE-----
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="jackson-databind" default="jar" basedir=".">
- <property file="${user.home}/.m2/maven.properties" />
- <property file="maven-build.properties" />
-
- <property name="maven.build.finalName" value="${ant.project.name}" />
- <property name="maven.build.dir" value="target" />
- <property name="maven.build.outputDir" value="${maven.build.dir}/classes" />
- <property name="maven.build.srcDir.0" value="src/main/java" />
- <property name="maven.build.resourceDir.0" value="src/main/resources" />
- <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes" />
- <property name="maven.build.testDir.0" value="src/test/java" />
- <property name="maven.build.testResourceDir.0" value="src/test/resources" />
- <property name="maven.test.reports" value="${maven.build.dir}/test-reports" />
- <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site" />
-
- <property name="maven.repo.local" value="${user.home}/.m2/repository" />
- <property name="maven.settings.offline" value="false" />
- <property name="maven.settings.interactiveMode" value="true" />
-
- <path id="build.classpath" />
- <path id="build.test.classpath">
- </path>
-
- <target name="clean" description="Clean the output directory">
- <delete dir="${maven.build.dir}" />
- </target>
-
- <target name="compile" description="Compile the code">
- <mkdir dir="${maven.build.outputDir}" />
- <javac destdir="${maven.build.outputDir}" nowarn="true" debug="true" optimize="true" deprecation="false" target="1.6" verbose="false" fork="false" source="1.6">
- <src>
- <pathelement location="${maven.build.srcDir.0}" />
- </src>
- <classpath refid="build.classpath" />
- </javac>
- <copy todir="${maven.build.outputDir}">
- <fileset dir="${maven.build.resourceDir.0}" />
- </copy>
- </target>
-
- <target name="compile-tests" depends="compile" description="Compile the test code" unless="maven.test.skip">
- <mkdir dir="${maven.build.testOutputDir}" />
- <javac destdir="${maven.build.testOutputDir}" nowarn="true" debug="true" optimize="true" deprecation="false" target="1.6" verbose="false" fork="false" source="1.6">
- <src>
- <pathelement location="${maven.build.testDir.0}" />
- </src>
- <classpath>
- <path refid="build.test.classpath" />
- <pathelement location="${maven.build.outputDir}" />
- </classpath>
- </javac>
- </target>
-
- <target name="test" depends="compile-tests" description="Run the test cases">
- <mkdir dir="${maven.test.reports}" />
- <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
- <sysproperty key="basedir" value="." />
- <formatter type="xml" />
- <formatter type="plain" usefile="false" />
- <classpath>
- <path refid="build.test.classpath" />
- <pathelement location="${maven.build.outputDir}" />
- <pathelement location="${maven.build.testOutputDir}" />
- </classpath>
- <batchtest todir="${maven.test.reports}" unless="test">
- <fileset dir="${maven.build.testDir.0}">
- <include name="**/Test*.java" />
- <include name="**/*Test.java" />
- <include name="**/*TestCase.java" />
- <exclude name="**/*Abstract*Test.java" />
- <exclude name="**/Base*Test.java" />
- <exclude name="**/ConcurrencyReadTest.java" />
- <exclude name="**/TestConvertingSerializer.java" />
- <exclude name="**/TestCreatorWithPolymorphic113.java" />
- </fileset>
- </batchtest>
- <batchtest todir="${maven.test.reports}" if="test">
- <fileset dir="${maven.build.testDir.0}">
- <include name="**/${test}.java" />
- <exclude name="**/*Abstract*Test.java" />
- <exclude name="**/Base*Test.java" />
- <exclude name="**/ConcurrencyReadTest.java" />
- <exclude name="**/TestConvertingSerializer.java" />
- <exclude name="**/TestCreatorWithPolymorphic113.java" />
- </fileset>
- </batchtest>
- </junit>
- </target>
-
- <target name="javadoc" description="Generates the Javadoc of the application">
- <javadoc sourcepath="${maven.build.srcDir.0}" packagenames="*" destdir="${maven.reporting.outputDirectory}/apidocs" access="protected" old="false" verbose="false" encoding="UTF-8" version="true" use="true" author="true" splitindex="false" nodeprecated="false" nodeprecatedlist="false" notree="false" noindex="false" nohelp="false" nonavbar="false" serialwarn="false" charset="ISO-8859-1" source="1.6" linksource="false" breakiterator="false" maxmemory="1g">
- </javadoc>
- </target>
-
- <target name="jar" depends="compile" description="Package the application">
- <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" compress="true" index="false" basedir="${maven.build.outputDir}" excludes="**/package.html" />
- </target>
-
-</project>
--- /dev/null
+From 2dbcc7408ff1104b84a982a5cde77ef11bc0dd93 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Wed, 4 Mar 2015 23:07:36 +0000
+Subject: [PATCH] Use the real cglib, not the repackaged version
+
+---
+ .../java/com/fasterxml/jackson/databind/interop/TestHibernate.java | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/test/java/com/fasterxml/jackson/databind/interop/TestHibernate.java b/src/test/java/com/fasterxml/jackson/databind/interop/TestHibernate.java
+index 48dc573..b7d89b6 100644
+--- a/src/test/java/com/fasterxml/jackson/databind/interop/TestHibernate.java
++++ b/src/test/java/com/fasterxml/jackson/databind/interop/TestHibernate.java
+@@ -3,9 +3,9 @@ package com.fasterxml.jackson.databind.interop;
+ import java.lang.reflect.Method;
+ import java.util.*;
+
+-import org.hibernate.repackage.cglib.proxy.Enhancer;
+-import org.hibernate.repackage.cglib.proxy.MethodInterceptor;
+-import org.hibernate.repackage.cglib.proxy.MethodProxy;
++import net.sf.cglib.proxy.Enhancer;
++import net.sf.cglib.proxy.MethodInterceptor;
++import net.sf.cglib.proxy.MethodProxy;
+
+ import com.fasterxml.jackson.databind.*;
+
+--
+2.0.4
+
+++ /dev/null
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jackson-databind/jackson-databind-2.3.1.ebuild,v 1.1 2014/01/12 18:53:43 ercpe Exp $
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="High-performance JSON processor"
-HOMEPAGE="http://jackson.codehaus.org"
-SRC_URI="https://github.com/FasterXML/${PN}/archive/${PN}-${PV}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 LGPL-2.1 )"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="dev-java/jackson:${SLOT}
- dev-java/jackson-annotations:${SLOT}"
-RDEPEND=">=virtual/jre-1.5
- ${CDEPEND}"
-DEPEND=">=virtual/jdk-1.5
- ${CDEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="jackson-${SLOT},jackson-annotations-${SLOT}"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4,cglib-2.2,groovy"
-
-S="${WORKDIR}/${PN}-${PN}-${PV}"
-
-java_prepare() {
- cp "${FILESDIR}"/${PV}-build.xml "${S}"/build.xml || die
-
- sed -e 's:@package@:com.fasterxml.jackson.databind.cfg:g' \
- -e "s:@projectversion@:${PV}:g" \
- -e 's:@projectgroupid@:com.fasterxml.jackson.core:g' \
- -e 's:@projectartifactid@:jackson-databind:g' \
- "${S}/src/main/java/com/fasterxml/jackson/databind/cfg/PackageVersion.java.in" \
- > "${S}/src/main/java/com/fasterxml/jackson/databind/cfg/PackageVersion.java" || die
-}
-
-src_install() {
- java-pkg_dojar target/${PN}.jar
- use source && java-pkg_dosrc src/main/java/*
-}
--- /dev/null
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jackson-databind/jackson-databind-2.5.1.ebuild,v 1.1 2015/03/04 23:21:13 chewi Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-pkg-simple
+
+DESCRIPTION="High-performance JSON processor"
+HOMEPAGE="https://github.com/FasterXML/jackson-databind"
+SRC_URI="https://github.com/FasterXML/${PN}/archive/${PN}-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="test" # 27/1306 failures :(
+
+CDEPEND="~dev-java/jackson-${PV}:${SLOT}
+ ~dev-java/jackson-annotations-${PV}:${SLOT}"
+RDEPEND=">=virtual/jre-1.5
+ ${CDEPEND}"
+DEPEND=">=virtual/jdk-1.5
+ ${CDEPEND}
+ test? (
+ dev-java/cglib:2.2
+ dev-java/groovy:0
+ dev-java/junit:4
+ )"
+
+S="${WORKDIR}/${PN}-${P}/src"
+JAVA_SRC_DIR="main/java"
+JAVA_GENTOO_CLASSPATH="jackson-${SLOT},jackson-annotations-${SLOT}"
+
+java_prepare() {
+ epatch "${FILESDIR}/real-cglib.patch"
+
+ sed -e 's:@package@:com.fasterxml.jackson.databind.cfg:g' \
+ -e "s:@projectversion@:${PV}:g" \
+ -e 's:@projectgroupid@:com.fasterxml.jackson.core:g' \
+ -e 's:@projectartifactid@:jackson-databind:g' \
+ "${S}/main/java/com/fasterxml/jackson/databind/cfg/PackageVersion.java.in" \
+ > "${S}/main/java/com/fasterxml/jackson/databind/cfg/PackageVersion.java" || diee
+
+ # Requires newer JScience. Could be any class but they chose this!
+ rm "${S}/test/java/com/fasterxml/jackson/databind/deser/TestNoClassDefFoundDeserializer.java" || die
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ dodoc ../README.md ../release-notes/{CREDITS,VERSION}
+}
+
+src_test() {
+ cd test/java || die
+
+ local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars --with-dependencies cglib-2.2,groovy,junit-4,${JAVA_GENTOO_CLASSPATH})"
+ local TESTS=$(find * -name "Test*.java")
+ TESTS="${TESTS//.java}"
+ TESTS="${TESTS//\//.}"
+
+ ejavac -cp "${CP}" -d . $(find * -name "*.java")
+ ejunit4 -classpath "${CP}" ${TESTS}
+}
# ChangeLog for dev-java/jackson
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jackson/ChangeLog,v 1.2 2014/01/12 18:19:01 ercpe Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jackson/ChangeLog,v 1.3 2015/03/04 23:18:48 chewi Exp $
+
+*jackson-2.5.1 (04 Mar 2015)
+
+ 04 Mar 2015; James Le Cuirot <chewi@gentoo.org> +jackson-2.5.1.ebuild,
+ -files/2.3.1-build.xml, -jackson-2.3.1.ebuild:
+ Version bump.
*jackson-2.3.1 (12 Jan 2014)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX 2.3.1-build.xml 4545 SHA256 f4df2a593fb4ca996189a3b9c3e181a520cf9b2549b2b80990fbdf600c67f406 SHA512 adfad4033b5fa9f98fdf08e9e4e8ca3bd1b8988a9794109a4611b917b49e3d63231fabe18fca89d0222f82a066ed9d29d5d796279f3acd76c3430133114a5676 WHIRLPOOL c958e2c3299845d62aaf1e16be2e15fe33284ff6008fd45352a025a8e6669fab22b250ee8ecef2c74f437f992de6a54cc221cb6e517b5f48b2cb5bec09d9d868
-DIST jackson-core-2.3.1.tar.gz 249262 SHA256 51e6a8caeda8cf907992c352323bcc448c7d34d8b32bbd51ec08e40a43a0a4b1 SHA512 a9785e6bb841da305109868f609e0ba8a5e3618950bbd8366074e5edd9392ec207f0feb9067ec0a9960f9bf60ddd97d074e1c52838025889789612d197de0cb3 WHIRLPOOL 5c72dc7c2e02736bce98bc553cbd94599176c1755114aed8c1de527c5615010060ea948fc8a5cd54a09a0e3cc94e4c6a4edde1cd0485d2d35144d33e47e638ad
+DIST jackson-core-2.5.1.tar.gz 267908 SHA256 576a103f24abedba09e83cd5fa6d2a00a25deec627e29e1d8e9c38382a057f85 SHA512 bb2c3f25eb76d4acd5fed0d5d666af572f6e66b6eb0cb37b26da405d8230b92204d9b6282dda2c2c16fd3059da9aa1c0f9a4a93b3be73e99f0277befd0d6e499 WHIRLPOOL b089c0e37153ad63dcc6af705d57a2a35124b35db283761b40c0558af42b1009b58232eec99fbb1c79ea2896f21f687af226ab604d2bf4eab8d4f365563c69e7
DIST jackson-core-lgpl-1.9.13-sources.jar 240367 SHA256 f4dad3a1b9a20fbcfd375034309e717e16740c3d770725037f165ef2cfe852bd SHA512 eae08be1f72e868a41423a67abc0af4b63365cb98bdebff4178c8b89fdfaf24324aacec1c95b1bb3d04da0b18c2fe05c87fbe6601a52c9cdbf4a8d3de3457542 WHIRLPOOL bbf02776cfef330e6283569ba0caca323846cd4562c80e6671a6e47e4afead5fc5c5e7cca95feb9d461e560285fab301f65f33cadab1ef039ece78a6fc39e8f5
EBUILD jackson-1.9.13.ebuild 628 SHA256 1a6842924d6f12613d4528e28cc7ebe55c960974393549edf9de7d0f4857d472 SHA512 3d5979a18df620d6fba126706e7e6e398f28d4cfe22c39cd0bfe87d9bb714fbee7b60d583db0a9551bcddf8514767f8a8b5452d5c10d9337abf6fc5e25b3fa09 WHIRLPOOL f641074d5b3092b6092604cd56529e4aa0e70be647dd6afbfa7a25895a11e96a7b60db05710c180ae665dc4f430bc0b17d5dc0083ddc7039ef296fb9fc2a2c54
-EBUILD jackson-2.3.1.ebuild 1420 SHA256 94f1afe1eb3e7b12f542838333fe5784ca85b00737261b708cf3eafd70041e72 SHA512 67f2a705b953cd53b2fd1938ab5d46bb00aba6308175b833c78f4f7105debcf9897f1a1816202591d1fe63642a17809cc5e1066ab6300539f1078d54b5b08c4e WHIRLPOOL 701dd1fb427da090a2c3522ed379217314e5aa0fa543e25c191a601820cc32d1d08dd44e14b5771fdba443d0588b867203901197e94bc24d1b6b2eead0d4d47b
-MISC ChangeLog 586 SHA256 ea6aa1ac2b7c2f2f4d9723e60b2d336c94d2fe62f9eba562fe41bf1ab2af08e8 SHA512 9dc273b0b16515a5c75ba5204f85f91b9f8da10aa6ca5346e58ac35103e2b1892662b0da531d22706edfe8334cee87fc2b44ac02e5233efbd0a7595b6234e165 WHIRLPOOL 4b22859e5f4d201318387f6c70a58b526ae32ae2978a6bfdf6743d6165eae7025ee4bff78a5d589a246d3d912e90630fba839659c0749acab39ff40956c7b1d2
+EBUILD jackson-2.5.1.ebuild 1461 SHA256 e962444ae8039bb05e5429cfd9b02376185f0d847fed3640208eb359758c1ed8 SHA512 10b1b705f8362ff02efd644b39e84536a056c90952b6e40f701b7fef1cf61aa53a08b7e7198c97f568cd669edaa40061e7bd39aaa75079cc8caa6118f4802e5e WHIRLPOOL 380d7a1ff9e6dc9e61f1eaa4123af73236f439ca86eb61a9db9a30845cc73ecdfbba6c4d8bbe5c9537a7cd6e9f2a5e239782e6aaf0951c8d492db5c7649b721e
+MISC ChangeLog 755 SHA256 abc1114b71b8ba1c63c817ab07bace19c4f7547478e69149d80e1fce79506966 SHA512 20b91aaa80d71672fe446cf13ffab8c17986bf02b4137618539144d9b01107682cf73d82a24656e484aa8ee6bf701f80cdbe0892e2d196262271383a462233c2 WHIRLPOOL 841992ac9e499e6482b367db727c81a9c8a5ec5f97452bb554445d360fa24450a445cf8067ca44b70a14bba606a59b908379803544304b60d93075538205bf90
MISC metadata.xml 159 SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b SHA512 269cf19c37f2d136b926f546ec83ffdbc1374b2b6e26f8a31f21854143380386c31bfc7b2a0b9c47fb1f7c02607ddbdd43e517cb5c3270515e465c4dd7788843 WHIRLPOOL afb402fec04cddb3184b69eb8a8d36b404edd2870fd06c8f5e99be39c341ea6fa7542e0b680fac05529522ed33838e8279381d7a6de9dbc58fe55841229d8a51
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
-iQEcBAEBCAAGBQJS0tyaAAoJEKCEBkJ3xQHtByAH/1hK5EhTemSwF8guwUQef46+
-iYfAHmXwwqSppsqRhQp08Ip/jgj3o+lgIafZkVHDoPD7E3BZbhXFhhdegeMEq2gt
-5HlPVuzKv4gNer936aB0WeZ0uwKyCCJecA+AyuQgMyUstKkdDZaqUL3Xrfg4k7Ns
-M7eLIjLWDNunYzDIfUxXgNzOJVjXvEbFpZ2yCvPXReE54OABEXrxfyVjLeK8cxGr
-4o4c0oIWBs4KEe+iFV68u66DP19ouNU11QQ/QMqK3c7W4h5ug2bQuHD7g2I2FAJC
-1VxmRTspMa0ysFjrwgb7d3oBbrjVZj6JNNwSrs6yDMKew03Eue7QlKMZ8rlTff8=
-=AZ2Y
+iQJ8BAEBCABmBQJU95L6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kZgEP/ik2fBBcRaksr4T9Gh4QwxK/
+XnwUCcgCvrY5kiPNJQPAlwjIAa/+tvHEOPix0469aiNSc24fn32xTzKC0OodQnfF
+/+k4C79Ea8TXqVP5QcxChzGvRIuVC8fbmxxnmcnrxZc2p4FBfqkpODbQ2v0M1V+T
+z0SFmkMfHETo9O0mEBPa7kWvFOmrVWTD6zDEsu34+BSlcB05zerjhbe258dZK1qT
+v8rDVkP5T/qUXKD66Y6XD5VqTGn6fw6pgKfwub70zIHK59n+fz4qWwLg7nMM/eWb
+Di400IdWE1Cg6Tw+lVcR27QiFrsw+v0dV/RBpWByNJCZaE7BDZyVDZ5UQ7nDA5sF
+UQ6bze+fem++TyIbbPiqGLqRVwQY0e5Z12ZtPvgJqahKj2IydIRXncWuuxvNnxDM
+xyEC1GdIDVNJCZpRmUsE/Qg3so1AwMSY5zcOu7MlR4Ha2fWwBCCeC3Sdiw6iBPEd
+bpEYfJRQ4RDPT7PzCPBT43v7+sFQjKnDK0I7dKlKXXgn6hA4tqNGb8uMS+v+5MxN
+G2JNleouK4cOEpIW6F+i/a3KOqCv0DMJWkMppDtcmBFN5KPjTX3jf4LE96gPXExR
+GcseIOxzEXgCaPAGEDXNUTe1p4SLCtaIuY8RGd+ovikLurcX0N4cWPQ776Kl1P1a
+b3iAy9nDufedr25ep1bG
+=k/rS
-----END PGP SIGNATURE-----
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="jackson-core" default="jar" basedir=".">
- <property file="${user.home}/.m2/maven.properties" />
- <property file="maven-build.properties" />
-
- <property name="maven.build.finalName" value="${ant.project.name}" />
- <property name="maven.build.dir" value="target" />
- <property name="maven.build.outputDir" value="${maven.build.dir}/classes" />
- <property name="maven.build.srcDir.0" value="src/main/java" />
- <property name="maven.build.resourceDir.0" value="src/main/resources" />
- <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes" />
- <property name="maven.build.testDir.0" value="src/test/java" />
- <property name="maven.build.testResourceDir.0" value="src/test/resources" />
- <property name="maven.test.reports" value="${maven.build.dir}/test-reports" />
- <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site" />
-
- <property name="maven.repo.local" value="${user.home}/.m2/repository" />
- <property name="maven.settings.offline" value="false" />
- <property name="maven.settings.interactiveMode" value="true" />
-
- <path id="build.classpath" />
- <path id="build.test.classpath">
- </path>
-
- <target name="clean" description="Clean the output directory">
- <delete dir="${maven.build.dir}" />
- </target>
-
- <target name="compile" description="Compile the code">
- <mkdir dir="${maven.build.outputDir}" />
- <javac destdir="${maven.build.outputDir}" nowarn="true" debug="true" optimize="true" deprecation="true" target="1.6" verbose="false" fork="false" source="1.6">
- <src>
- <pathelement location="${maven.build.srcDir.0}" />
- </src>
- <classpath refid="build.classpath" />
- </javac>
- <copy todir="${maven.build.outputDir}">
- <fileset dir="${maven.build.resourceDir.0}" />
- </copy>
- </target>
-
- <target name="compile-tests" depends="compile" description="Compile the test code" unless="maven.test.skip">
- <mkdir dir="${maven.build.testOutputDir}" />
- <javac destdir="${maven.build.testOutputDir}" nowarn="true" debug="true" optimize="true" deprecation="true" target="1.6" verbose="false" fork="false" source="1.6">
- <src>
- <pathelement location="${maven.build.testDir.0}" />
- </src>
- <classpath>
- <path refid="build.test.classpath" />
- <pathelement location="${maven.build.outputDir}" />
- </classpath>
- </javac>
- <copy todir="${maven.build.testOutputDir}">
- <fileset dir="${maven.build.testResourceDir.0}" />
- </copy>
- </target>
-
- <target name="test" depends="compile-tests" description="Run the test cases">
- <mkdir dir="${maven.test.reports}" />
- <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
- <sysproperty key="basedir" value="." />
- <formatter type="xml" />
- <formatter type="plain" usefile="false" />
- <classpath>
- <path refid="build.test.classpath" />
- <pathelement location="${maven.build.outputDir}" />
- <pathelement location="${maven.build.testOutputDir}" />
- </classpath>
- <batchtest todir="${maven.test.reports}" unless="test">
- <fileset dir="${maven.build.testDir.0}">
- <include name="**/Test*.java" />
- <include name="**/*Test.java" />
- <include name="**/*TestCase.java" />
- <exclude name="**/*Abstract*Test.java" />
- <exclude name="**/BaseTest.java" />
- <exclude name="**/ConcurrencyReadTest.java" />
- </fileset>
- </batchtest>
- <batchtest todir="${maven.test.reports}" if="test">
- <fileset dir="${maven.build.testDir.0}">
- <include name="**/${test}.java" />
- <exclude name="**/*Abstract*Test.java" />
- <exclude name="**/BaseTest.java" />
- <exclude name="**/ConcurrencyReadTest.java" />
- </fileset>
- </batchtest>
- </junit>
- </target>
-
- <target name="javadoc" description="Generates the Javadoc of the application">
- <javadoc sourcepath="${maven.build.srcDir.0}" packagenames="*" destdir="${maven.reporting.outputDirectory}/apidocs" access="protected" old="false" verbose="false" encoding="UTF-8" version="true" use="true" author="true" splitindex="false" nodeprecated="false" nodeprecatedlist="false" notree="false" noindex="false" nohelp="false" nonavbar="false" serialwarn="false" charset="ISO-8859-1" source="1.6" linksource="false" breakiterator="false" maxmemory="1g">
- </javadoc>
- </target>
-
- <target name="jar" depends="compile" description="Package the application">
- <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" compress="true" index="false" basedir="${maven.build.outputDir}" excludes="**/package.html" />
- </target>
-
-</project>
+++ /dev/null
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jackson/jackson-2.3.1.ebuild,v 1.1 2014/01/12 18:19:01 ercpe Exp $
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="High-performance JSON processor"
-HOMEPAGE="http://jackson.codehaus.org"
-SRC_URI="https://github.com/FasterXML/${PN}-core/archive/${PN}-core-${PV}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 LGPL-2.1 )"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5
- test? (
- dev-java/ant-junit4
- dev-java/junit:4
- )
-"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_TEST_GENTOO_CLASSPATH="junit-4"
-
-S="${WORKDIR}/${PN}-core-${PN}-core-${PV}"
-
-java_prepare() {
- cp "${FILESDIR}"/${PV}-build.xml "${S}"/build.xml || die
-
- sed -e 's:@package@:com.fasterxml.jackson.core.json:g' \
- -e "s:@projectversion@:${PV}:g" \
- -e 's:@projectgroupid@:com.fasterxml.jackson.core:g' \
- -e 's:@projectartifactid@:jackson-core:g' \
- "${S}/src/main/java/com/fasterxml/jackson/core/json/PackageVersion.java.in" \
- > "${S}/src/main/java/com/fasterxml/jackson/core/json/PackageVersion.java" || die
-}
-
-src_install() {
- java-pkg_dojar target/${PN}-core.jar
-
- use doc && java-pkg_dojavadoc target/site/apidocs/
- use source && java-pkg_dosrc src/main/java/*
-}
-
-src_test() {
- EANT_TASKS="ant-junit4"
- java-pkg-2_src_test
-}
\ No newline at end of file
--- /dev/null
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jackson/jackson-2.5.1.ebuild,v 1.1 2015/03/04 23:18:48 chewi Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="High-performance JSON processor"
+HOMEPAGE="https://github.com/FasterXML/jackson-core"
+SRC_URI="https://github.com/FasterXML/${PN}-core/archive/${PN}-core-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5
+ test? ( dev-java/junit:4 )"
+
+S="${WORKDIR}/${PN}-core-${PN}-core-${PV}/src"
+JAVA_SRC_DIR="main/java"
+
+java_prepare() {
+ sed -e 's:@package@:com.fasterxml.jackson.core.json:g' \
+ -e "s:@projectversion@:${PV}:g" \
+ -e 's:@projectgroupid@:com.fasterxml.jackson.core:g' \
+ -e 's:@projectartifactid@:jackson-core:g' \
+ "${S}/main/java/com/fasterxml/jackson/core/json/PackageVersion.java.in" \
+ > "${S}/main/java/com/fasterxml/jackson/core/json/PackageVersion.java" || die
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ dodoc ../README.md ../release-notes/{CREDITS,VERSION}
+}
+
+src_test() {
+ cd test/java || die
+
+ local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars junit-4)"
+ local TESTS=$(find * -name "Test*.java")
+ TESTS="${TESTS//.java}"
+ TESTS="${TESTS//\//.}"
+
+ ejavac -cp "${CP}" -d . $(find * -name "*.java")
+ ejunit4 -classpath "${CP}" ${TESTS}
+}