[gentoo-commits] repo/gentoo:master commit in: dev-java/json/
commit: 840fc3a65626c05148b534938522467e94817d6a
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Sun Aug 11 19:05:16 2024 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Mon Aug 12 09:26:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=840fc3a6
dev-java/json: drop 20240205-r1
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/38106
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/json/Manifest| 1 -
dev-java/json/json-20240205-r1.ebuild | 62 ---
2 files changed, 63 deletions(-)
diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest
index a288e8afcbcd..b2d756b94a7f 100644
--- a/dev-java/json/Manifest
+++ b/dev-java/json/Manifest
@@ -1,3 +1,2 @@
-DIST json-20240205.tar.gz 245788 BLAKE2B
2c4fa44aa16a53cce153879af6a31364e21e9cc140bc7472535d2a8d2d0fc346502fd4a6e5022d326c80fe23557ce4ce408faf142bcdeec0c9b22aca13b044df
SHA512
55e79510819b8e318e15b04cab317fdfd9785ac6b8fe60ef740b2f1eb7298548622556b968def89f4f2eb7761765149f192747b0966698b431cfeb9f2ea72284
DIST json-20240303.tar.gz 245665 BLAKE2B
3462398895ab6da9610dac8851f2aa4528359e255015fd59a160fe99443819fa5bb57eb30ce177238d06abe95aaae9847cc85e4eee59c90edf7732bd823d9b89
SHA512
22465216eca7e4721aacca7b519d0bf1b0fe20b2de68ef0b6c62feae811e11203bfc733d8e9c97e2aa5b6ed30c74eefc601025b31807e51d49412516afc9
DIST json-path-2.9.0.jar 276633 BLAKE2B
bb83d6c6d972ea05dce3ef9878c0db0b93d6168cb796b63365a4615434c24edaad86bf021d6bf8736d67504ed8803c423efe01a323e094a59854cd9e73eb6862
SHA512
9a9dbb2cd36662c8049419ed891290602baeca2549eb7df62122cb20c91e66bc8c2c0e5e13199c4a70bf0b6e62ea4c2601f84e4c79d2af25ff1704481c86740a
diff --git a/dev-java/json/json-20240205-r1.ebuild
b/dev-java/json/json-20240205-r1.ebuild
deleted file mode 100644
index 8dcbc599e326..
--- a/dev-java/json/json-20240205-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.json:json:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A reference implementation of a JSON package in Java"
-HOMEPAGE="https://github.com/stleary/JSON-java";
-JPV="2.9.0"
-SRC_URI="https://codeload.github.com/stleary/JSON-java/tar.gz/${PV} ->
${P}.tar.gz
- test? (
-
https://repo1.maven.org/maven2/com/jayway/jsonpath/json-path/${JPV}/json-path-${JPV}.jar
- )"
-S="${WORKDIR}/JSON-java-${PV}"
-
-LICENSE="JSON"
-SLOT="0"
-KEYWORDS="amd64"
-
-DEPEND="
- >=virtual/jdk-1.8:*
- test? (
- dev-java/asm:9
- dev-java/json-smart:2
- dev-java/mockito:4
- dev-java/slf4j-api:0
- )
-"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-DOCS=( {CONTRIBUTING,README,SECURITY}.md )
-
-JAVA_AUTOMATIC_MODULE_NAME="org.json"
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="
- asm-9
- json-smart-2
- junit-4
- mockito-4
- slf4j-api
-"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-src_test() {
- JAVA_TEST_EXTRA_ARGS=( -Xss2M )
- JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/json-path-${JPV}.jar" # Test
compile dependency
-
- local vm_version="$(java-config -g PROVIDES_VERSION)"
- if ver_test "${vm_version}" -ge 17; then
- JAVA_TEST_EXTRA_ARGS+=(
--add-opens=java.base/java.lang=ALL-UNNAMED )
- JAVA_TEST_EXTRA_ARGS+=(
--add-opens=java.base/java.io=ALL-UNNAMED )
- fi
- java-pkg-simple_src_test
-}
[gentoo-commits] repo/gentoo:master commit in: dev-java/json/
commit: 4ee4cd8327a2d08a700f07e61083d819a0f8a0a2
Author: Arthur Zamarin gentoo org>
AuthorDate: Sun Aug 11 17:24:23 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sun Aug 11 17:24:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ee4cd83
dev-java/json: Stabilize 20240303 amd64, #937746
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/json/json-20240303.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/json/json-20240303.ebuild
b/dev-java/json/json-20240303.ebuild
index c53dca8a5657..b039a3797e52 100644
--- a/dev-java/json/json-20240303.ebuild
+++ b/dev-java/json/json-20240303.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/JSON-java-${PV}"
LICENSE="JSON"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
DEPEND="
>=virtual/jdk-1.8:*
[gentoo-commits] repo/gentoo:master commit in: dev-java/json/
commit: 36fa656d2ba9dc0269665fc8be8f493c0d1a9345
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Mon Jul 29 09:41:06 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Mon Jul 29 15:14:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36fa656d
dev-java/json: drop 20231013-r1
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/37779
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/json/Manifest| 2 --
dev-java/json/json-20231013-r1.ebuild | 65 ---
2 files changed, 67 deletions(-)
diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest
index d2c92e99c74d..a288e8afcbcd 100644
--- a/dev-java/json/Manifest
+++ b/dev-java/json/Manifest
@@ -1,5 +1,3 @@
-DIST json-20231013.tar.gz 240211 BLAKE2B
c0594f89c2b02273c736c0fc362f1e3d519d3d88b7e708e64bbd5ca202f539368e9856e311dd9ad42a24c317cfd727feed5af215fbc5e9bbcb18e797323684c8
SHA512
4c5eb3e9ef77825c9e7b874c9084b5bb75b39c527c3cb419fc45171e0d11b24796931a2d16255500ed86610da3ac7805b302ec0b1051f97c97795580dca7c183
DIST json-20240205.tar.gz 245788 BLAKE2B
2c4fa44aa16a53cce153879af6a31364e21e9cc140bc7472535d2a8d2d0fc346502fd4a6e5022d326c80fe23557ce4ce408faf142bcdeec0c9b22aca13b044df
SHA512
55e79510819b8e318e15b04cab317fdfd9785ac6b8fe60ef740b2f1eb7298548622556b968def89f4f2eb7761765149f192747b0966698b431cfeb9f2ea72284
DIST json-20240303.tar.gz 245665 BLAKE2B
3462398895ab6da9610dac8851f2aa4528359e255015fd59a160fe99443819fa5bb57eb30ce177238d06abe95aaae9847cc85e4eee59c90edf7732bd823d9b89
SHA512
22465216eca7e4721aacca7b519d0bf1b0fe20b2de68ef0b6c62feae811e11203bfc733d8e9c97e2aa5b6ed30c74eefc601025b31807e51d49412516afc9
-DIST json-path-2.1.0.jar 189658 BLAKE2B
2813abfc3b6c758f600bb5e8f8b73eac8dc2a642d461bc26c569a650378ea65cebf691afe975fa2dca406eb324863c36c4623b21c1df2cb83c92e6859b5a9d85
SHA512
c16fc68a04945ad49eb96c38f68a8b4ff351ab1bbc51685f42d22723b2dee4b827ba45cb6b8167199e3f4d22e668ef58665558beec8e11399ac547e9fcebd9f6
DIST json-path-2.9.0.jar 276633 BLAKE2B
bb83d6c6d972ea05dce3ef9878c0db0b93d6168cb796b63365a4615434c24edaad86bf021d6bf8736d67504ed8803c423efe01a323e094a59854cd9e73eb6862
SHA512
9a9dbb2cd36662c8049419ed891290602baeca2549eb7df62122cb20c91e66bc8c2c0e5e13199c4a70bf0b6e62ea4c2601f84e4c79d2af25ff1704481c86740a
diff --git a/dev-java/json/json-20231013-r1.ebuild
b/dev-java/json/json-20231013-r1.ebuild
deleted file mode 100644
index e036642fff8e..
--- a/dev-java/json/json-20231013-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.json:json:${PV}"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A reference implementation of a JSON package in Java"
-HOMEPAGE="https://github.com/stleary/JSON-java";
-SRC_URI="https://codeload.github.com/stleary/JSON-java/tar.gz/${PV} ->
${P}.tar.gz
- test? (
-
https://repo1.maven.org/maven2/com/jayway/jsonpath/json-path/2.1.0/json-path-2.1.0.jar
- )"
-S="${WORKDIR}/JSON-java-${PV}"
-
-LICENSE="JSON"
-SLOT="0"
-KEYWORDS="amd64"
-
-DEPEND="
- >=virtual/jdk-1.8:*
- test? (
- dev-java/asm:9
- dev-java/json-smart:2
- dev-java/mockito:4
- dev-java/slf4j-api:0
- )
-"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-DOCS=( {CONTRIBUTING,README,SECURITY}.md )
-
-JAVA_AUTOMATIC_MODULE_NAME="org.json"
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="
- asm-9
- json-smart-2
- junit-4
- mockito-4
- slf4j-api
-"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-src_prepare() {
- default #780585
- java-pkg-2_src_prepare
-}
-
-src_test() {
- JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/json-path-2.1.0.jar" # Test
compile dependency
-
- local vm_version="$(java-config -g PROVIDES_VERSION)"
- if ver_test "${vm_version}" -ge 17; then
- JAVA_TEST_EXTRA_ARGS+=(
--add-opens=java.base/java.lang=ALL-UNNAMED )
- JAVA_TEST_EXTRA_ARGS+=(
--add-opens=java.base/java.io=ALL-UNNAMED )
- fi
- java-pkg-simple_src_test
-}
[gentoo-commits] repo/gentoo:master commit in: dev-java/json/
commit: 2ba1910ac10793e5fb6e6644eab44624a2af52b0
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Mon Jul 29 09:35:05 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Mon Jul 29 15:14:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ba1910a
dev-java/json: unkeyword 20231013-r1 for x86
Closes: https://bugs.gentoo.org/930723
Closes: https://bugs.gentoo.org/926808
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/json/json-20231013-r1.ebuild | 2 +-
dev-java/json/json-20240205-r1.ebuild | 2 +-
dev-java/json/json-20240303.ebuild| 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-java/json/json-20231013-r1.ebuild
b/dev-java/json/json-20231013-r1.ebuild
index 33b11fb0702e..e036642fff8e 100644
--- a/dev-java/json/json-20231013-r1.ebuild
+++ b/dev-java/json/json-20231013-r1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/JSON-java-${PV}"
LICENSE="JSON"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64"
DEPEND="
>=virtual/jdk-1.8:*
diff --git a/dev-java/json/json-20240205-r1.ebuild
b/dev-java/json/json-20240205-r1.ebuild
index 49f6e727afd8..8dcbc599e326 100644
--- a/dev-java/json/json-20240205-r1.ebuild
+++ b/dev-java/json/json-20240205-r1.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/JSON-java-${PV}"
LICENSE="JSON"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64"
DEPEND="
>=virtual/jdk-1.8:*
diff --git a/dev-java/json/json-20240303.ebuild
b/dev-java/json/json-20240303.ebuild
index 5e807e77efd0..c53dca8a5657 100644
--- a/dev-java/json/json-20240303.ebuild
+++ b/dev-java/json/json-20240303.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/JSON-java-${PV}"
LICENSE="JSON"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
DEPEND="
>=virtual/jdk-1.8:*
[gentoo-commits] repo/gentoo:master commit in: dev-java/json/
commit: 8bfd6777a0e10eab4790c58cac598987f7379ab0
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Tue Jul 2 06:04:45 2024 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sun Jul 7 10:14:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bfd6777
dev-java/json: add 20240303
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes:
https://github.com/gentoo/gentoo/pull/37469/commits/31edb4127fec5b2528ec9c0bf65197e2a78af606
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/json/Manifest | 1 +
dev-java/json/json-20240303.ebuild | 81 ++
2 files changed, 82 insertions(+)
diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest
index 05f94127628e..d2c92e99c74d 100644
--- a/dev-java/json/Manifest
+++ b/dev-java/json/Manifest
@@ -1,4 +1,5 @@
DIST json-20231013.tar.gz 240211 BLAKE2B
c0594f89c2b02273c736c0fc362f1e3d519d3d88b7e708e64bbd5ca202f539368e9856e311dd9ad42a24c317cfd727feed5af215fbc5e9bbcb18e797323684c8
SHA512
4c5eb3e9ef77825c9e7b874c9084b5bb75b39c527c3cb419fc45171e0d11b24796931a2d16255500ed86610da3ac7805b302ec0b1051f97c97795580dca7c183
DIST json-20240205.tar.gz 245788 BLAKE2B
2c4fa44aa16a53cce153879af6a31364e21e9cc140bc7472535d2a8d2d0fc346502fd4a6e5022d326c80fe23557ce4ce408faf142bcdeec0c9b22aca13b044df
SHA512
55e79510819b8e318e15b04cab317fdfd9785ac6b8fe60ef740b2f1eb7298548622556b968def89f4f2eb7761765149f192747b0966698b431cfeb9f2ea72284
+DIST json-20240303.tar.gz 245665 BLAKE2B
3462398895ab6da9610dac8851f2aa4528359e255015fd59a160fe99443819fa5bb57eb30ce177238d06abe95aaae9847cc85e4eee59c90edf7732bd823d9b89
SHA512
22465216eca7e4721aacca7b519d0bf1b0fe20b2de68ef0b6c62feae811e11203bfc733d8e9c97e2aa5b6ed30c74eefc601025b31807e51d49412516afc9
DIST json-path-2.1.0.jar 189658 BLAKE2B
2813abfc3b6c758f600bb5e8f8b73eac8dc2a642d461bc26c569a650378ea65cebf691afe975fa2dca406eb324863c36c4623b21c1df2cb83c92e6859b5a9d85
SHA512
c16fc68a04945ad49eb96c38f68a8b4ff351ab1bbc51685f42d22723b2dee4b827ba45cb6b8167199e3f4d22e668ef58665558beec8e11399ac547e9fcebd9f6
DIST json-path-2.9.0.jar 276633 BLAKE2B
bb83d6c6d972ea05dce3ef9878c0db0b93d6168cb796b63365a4615434c24edaad86bf021d6bf8736d67504ed8803c423efe01a323e094a59854cd9e73eb6862
SHA512
9a9dbb2cd36662c8049419ed891290602baeca2549eb7df62122cb20c91e66bc8c2c0e5e13199c4a70bf0b6e62ea4c2601f84e4c79d2af25ff1704481c86740a
diff --git a/dev-java/json/json-20240303.ebuild
b/dev-java/json/json-20240303.ebuild
new file mode 100644
index ..5e807e77efd0
--- /dev/null
+++ b/dev-java/json/json-20240303.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.json:json:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple check-reqs
+
+DESCRIPTION="A reference implementation of a JSON package in Java"
+HOMEPAGE="https://github.com/stleary/JSON-java";
+JPV="2.9.0"
+SRC_URI="https://codeload.github.com/stleary/JSON-java/tar.gz/${PV} ->
${P}.tar.gz
+ test? (
+
https://repo1.maven.org/maven2/com/jayway/jsonpath/json-path/${JPV}/json-path-${JPV}.jar
+ )"
+S="${WORKDIR}/JSON-java-${PV}"
+
+LICENSE="JSON"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ test? (
+ dev-java/asm:9
+ dev-java/json-smart:2
+ dev-java/mockito:4
+ dev-java/slf4j-api:0
+ )
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( {CONTRIBUTING,README,SECURITY}.md )
+
+JAVA_AUTOMATIC_MODULE_NAME="org.json"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="
+ asm-9
+ json-smart-2
+ junit-4
+ mockito-4
+ slf4j-api
+"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+check_env() {
+ if use test; then
+ # this is needed only for tests
+ CHECKREQS_MEMORY="2048M"
+ check-reqs_pkg_pretend
+ fi
+}
+
+pkg_pretend() {
+ check_env
+}
+
+pkg_setup() {
+ check_env
+ java-pkg-2_pkg_setup
+}
+
+src_test() {
+ # setting Xms for bug #930723
+ # gradlew: DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"
+ JAVA_TEST_EXTRA_ARGS=" -Xmx${CHECKREQS_MEMORY}"
+ JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/json-path-${JPV}.jar" # Test
compile dependency
+
+ local vm_version="$(java-config -g PROVIDES_VERSION)"
+ if ver_test "${vm_version}" -ge 17; then
+ JAVA_TEST_EXTRA_ARGS+=(
--add-opens=java.base/java.lang=ALL-UNNAMED )
+ JAVA_TEST_EXTRA_ARGS+=(
--add-opens=java.base/java.io=ALL-UNNAMED )
+ fi
+ java-pkg-simple_src_test
+}
[gentoo-commits] repo/gentoo:master commit in: dev-java/json/
commit: 64ff94e3095b0f975876e4dfeeddf5ee4865b5f7
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Fri Mar 15 21:58:32 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Thu Apr 11 17:54:56 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64ff94e3
dev-java/json: set -Xss2M
also update json-path 2.4.0 -> 2.9.0 ( CVE-2023-51074 )
Closes: https://bugs.gentoo.org/927094
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/35775
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/json/Manifest | 2 +-
dev-java/json/{json-20240205.ebuild => json-20240205-r1.ebuild} | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest
index 4b7a16b268c1..05f94127628e 100644
--- a/dev-java/json/Manifest
+++ b/dev-java/json/Manifest
@@ -1,4 +1,4 @@
DIST json-20231013.tar.gz 240211 BLAKE2B
c0594f89c2b02273c736c0fc362f1e3d519d3d88b7e708e64bbd5ca202f539368e9856e311dd9ad42a24c317cfd727feed5af215fbc5e9bbcb18e797323684c8
SHA512
4c5eb3e9ef77825c9e7b874c9084b5bb75b39c527c3cb419fc45171e0d11b24796931a2d16255500ed86610da3ac7805b302ec0b1051f97c97795580dca7c183
DIST json-20240205.tar.gz 245788 BLAKE2B
2c4fa44aa16a53cce153879af6a31364e21e9cc140bc7472535d2a8d2d0fc346502fd4a6e5022d326c80fe23557ce4ce408faf142bcdeec0c9b22aca13b044df
SHA512
55e79510819b8e318e15b04cab317fdfd9785ac6b8fe60ef740b2f1eb7298548622556b968def89f4f2eb7761765149f192747b0966698b431cfeb9f2ea72284
DIST json-path-2.1.0.jar 189658 BLAKE2B
2813abfc3b6c758f600bb5e8f8b73eac8dc2a642d461bc26c569a650378ea65cebf691afe975fa2dca406eb324863c36c4623b21c1df2cb83c92e6859b5a9d85
SHA512
c16fc68a04945ad49eb96c38f68a8b4ff351ab1bbc51685f42d22723b2dee4b827ba45cb6b8167199e3f4d22e668ef58665558beec8e11399ac547e9fcebd9f6
-DIST json-path-2.4.0.jar 223186 BLAKE2B
b184f1b8241bd9b4c5d10662354f31044ea90bddfa7a08c0c995a02e7e50b04d11076d61af2988c2fee49401ad37593f89dd2dbc0bfa0e1b5b1d0653a592eea1
SHA512
b55b30cf85ca12e6a492fd48d4b6bb0b1f3ba610c195aa1a36eda2a80e24bf7688a6a802362d398108e822f6dcb7b713cf421bb4208897fc4f5cc7b8b9b4c97c
+DIST json-path-2.9.0.jar 276633 BLAKE2B
bb83d6c6d972ea05dce3ef9878c0db0b93d6168cb796b63365a4615434c24edaad86bf021d6bf8736d67504ed8803c423efe01a323e094a59854cd9e73eb6862
SHA512
9a9dbb2cd36662c8049419ed891290602baeca2549eb7df62122cb20c91e66bc8c2c0e5e13199c4a70bf0b6e62ea4c2601f84e4c79d2af25ff1704481c86740a
diff --git a/dev-java/json/json-20240205.ebuild
b/dev-java/json/json-20240205-r1.ebuild
similarity index 96%
rename from dev-java/json/json-20240205.ebuild
rename to dev-java/json/json-20240205-r1.ebuild
index b38dc12dd901..49f6e727afd8 100644
--- a/dev-java/json/json-20240205.ebuild
+++ b/dev-java/json/json-20240205-r1.ebuild
@@ -11,7 +11,7 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="A reference implementation of a JSON package in Java"
HOMEPAGE="https://github.com/stleary/JSON-java";
-JPV="2.4.0"
+JPV="2.9.0"
SRC_URI="https://codeload.github.com/stleary/JSON-java/tar.gz/${PV} ->
${P}.tar.gz
test? (
https://repo1.maven.org/maven2/com/jayway/jsonpath/json-path/${JPV}/json-path-${JPV}.jar
@@ -50,6 +50,7 @@ JAVA_TEST_RESOURCE_DIRS="src/test/resources"
JAVA_TEST_SRC_DIR="src/test/java"
src_test() {
+ JAVA_TEST_EXTRA_ARGS=( -Xss2M )
JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/json-path-${JPV}.jar" # Test
compile dependency
local vm_version="$(java-config -g PROVIDES_VERSION)"
[gentoo-commits] repo/gentoo:master commit in: dev-java/json/
commit: e6ddd033fc289d5a707947a12ab31fc0c0d2593c
Author: Arthur Zamarin gentoo org>
AuthorDate: Tue Mar 12 14:37:59 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Tue Mar 12 14:37:59 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6ddd033
dev-java/json: Stabilize 20240205 amd64, #926808
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/json/json-20240205.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/json/json-20240205.ebuild
b/dev-java/json/json-20240205.ebuild
index fda4c5cc15d8..b38dc12dd901 100644
--- a/dev-java/json/json-20240205.ebuild
+++ b/dev-java/json/json-20240205.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/JSON-java-${PV}"
LICENSE="JSON"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
DEPEND="
>=virtual/jdk-1.8:*
[gentoo-commits] repo/gentoo:master commit in: dev-java/json/
commit: 607e23499a76786cc312e328fbef27d46dab2248
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Tue Feb 6 06:57:59 2024 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Mon Feb 12 08:37:31 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=607e2349
dev-java/json: add 20240205
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/35275
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/json/Manifest | 2 ++
dev-java/json/json-20240205.ebuild | 61 ++
2 files changed, 63 insertions(+)
diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest
index d2c1e3c3d3b6..4b7a16b268c1 100644
--- a/dev-java/json/Manifest
+++ b/dev-java/json/Manifest
@@ -1,2 +1,4 @@
DIST json-20231013.tar.gz 240211 BLAKE2B
c0594f89c2b02273c736c0fc362f1e3d519d3d88b7e708e64bbd5ca202f539368e9856e311dd9ad42a24c317cfd727feed5af215fbc5e9bbcb18e797323684c8
SHA512
4c5eb3e9ef77825c9e7b874c9084b5bb75b39c527c3cb419fc45171e0d11b24796931a2d16255500ed86610da3ac7805b302ec0b1051f97c97795580dca7c183
+DIST json-20240205.tar.gz 245788 BLAKE2B
2c4fa44aa16a53cce153879af6a31364e21e9cc140bc7472535d2a8d2d0fc346502fd4a6e5022d326c80fe23557ce4ce408faf142bcdeec0c9b22aca13b044df
SHA512
55e79510819b8e318e15b04cab317fdfd9785ac6b8fe60ef740b2f1eb7298548622556b968def89f4f2eb7761765149f192747b0966698b431cfeb9f2ea72284
DIST json-path-2.1.0.jar 189658 BLAKE2B
2813abfc3b6c758f600bb5e8f8b73eac8dc2a642d461bc26c569a650378ea65cebf691afe975fa2dca406eb324863c36c4623b21c1df2cb83c92e6859b5a9d85
SHA512
c16fc68a04945ad49eb96c38f68a8b4ff351ab1bbc51685f42d22723b2dee4b827ba45cb6b8167199e3f4d22e668ef58665558beec8e11399ac547e9fcebd9f6
+DIST json-path-2.4.0.jar 223186 BLAKE2B
b184f1b8241bd9b4c5d10662354f31044ea90bddfa7a08c0c995a02e7e50b04d11076d61af2988c2fee49401ad37593f89dd2dbc0bfa0e1b5b1d0653a592eea1
SHA512
b55b30cf85ca12e6a492fd48d4b6bb0b1f3ba610c195aa1a36eda2a80e24bf7688a6a802362d398108e822f6dcb7b713cf421bb4208897fc4f5cc7b8b9b4c97c
diff --git a/dev-java/json/json-20240205.ebuild
b/dev-java/json/json-20240205.ebuild
new file mode 100644
index ..fda4c5cc15d8
--- /dev/null
+++ b/dev-java/json/json-20240205.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.json:json:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A reference implementation of a JSON package in Java"
+HOMEPAGE="https://github.com/stleary/JSON-java";
+JPV="2.4.0"
+SRC_URI="https://codeload.github.com/stleary/JSON-java/tar.gz/${PV} ->
${P}.tar.gz
+ test? (
+
https://repo1.maven.org/maven2/com/jayway/jsonpath/json-path/${JPV}/json-path-${JPV}.jar
+ )"
+S="${WORKDIR}/JSON-java-${PV}"
+
+LICENSE="JSON"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ test? (
+ dev-java/asm:9
+ dev-java/json-smart:2
+ dev-java/mockito:4
+ dev-java/slf4j-api:0
+ )
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( {CONTRIBUTING,README,SECURITY}.md )
+
+JAVA_AUTOMATIC_MODULE_NAME="org.json"
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="
+ asm-9
+ json-smart-2
+ junit-4
+ mockito-4
+ slf4j-api
+"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_test() {
+ JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/json-path-${JPV}.jar" # Test
compile dependency
+
+ local vm_version="$(java-config -g PROVIDES_VERSION)"
+ if ver_test "${vm_version}" -ge 17; then
+ JAVA_TEST_EXTRA_ARGS+=(
--add-opens=java.base/java.lang=ALL-UNNAMED )
+ JAVA_TEST_EXTRA_ARGS+=(
--add-opens=java.base/java.io=ALL-UNNAMED )
+ fi
+ java-pkg-simple_src_test
+}
[gentoo-commits] repo/gentoo:master commit in: dev-java/json/
commit: f47f393de5ff7a14f2fb9074e4ee0f17d41054f2
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Wed Jan 10 13:40:57 2024 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Thu Jan 11 09:46:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f47f393d
dev-java/json: drop 20220320
Bug: https://bugs.gentoo.org/918529
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/34733
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/json/Manifest | 1 -
dev-java/json/json-20220320.ebuild | 57 --
2 files changed, 58 deletions(-)
diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest
index 549c5a166a89..d2c1e3c3d3b6 100644
--- a/dev-java/json/Manifest
+++ b/dev-java/json/Manifest
@@ -1,3 +1,2 @@
-DIST json-20220320.tar.gz 229462 BLAKE2B
9d549e4e905e2a63985b0b2d9a6cfbf7483776799d6b907455356940b48242fda9344874f1625da06215991eae1cfa1e87f3f8f0a204807795ed50f3f9afdbc2
SHA512
1bcd99c69201ea6609a41ec1679467504cd129a8c5a9caede0829cd8eb70b0e59e504a4bc409f57e6b27091e11acbf6108830c6f1fe16919d0cb1daff643bdf0
DIST json-20231013.tar.gz 240211 BLAKE2B
c0594f89c2b02273c736c0fc362f1e3d519d3d88b7e708e64bbd5ca202f539368e9856e311dd9ad42a24c317cfd727feed5af215fbc5e9bbcb18e797323684c8
SHA512
4c5eb3e9ef77825c9e7b874c9084b5bb75b39c527c3cb419fc45171e0d11b24796931a2d16255500ed86610da3ac7805b302ec0b1051f97c97795580dca7c183
DIST json-path-2.1.0.jar 189658 BLAKE2B
2813abfc3b6c758f600bb5e8f8b73eac8dc2a642d461bc26c569a650378ea65cebf691afe975fa2dca406eb324863c36c4623b21c1df2cb83c92e6859b5a9d85
SHA512
c16fc68a04945ad49eb96c38f68a8b4ff351ab1bbc51685f42d22723b2dee4b827ba45cb6b8167199e3f4d22e668ef58665558beec8e11399ac547e9fcebd9f6
diff --git a/dev-java/json/json-20220320.ebuild
b/dev-java/json/json-20220320.ebuild
deleted file mode 100644
index 86e62eab5ee3..
--- a/dev-java/json/json-20220320.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri
https://codeload.github.com/stleary/JSON-java/tar.gz/20220320 --slot 0
--keywords "~amd64 ~x86" --ebuild json-20220320.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.json:json:20220320"
-# We don't have com.jayway.jsonpath:json-path
-# JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A reference implementation of a JSON package in Java"
-HOMEPAGE="https://github.com/stleary/JSON-java";
-SRC_URI="https://codeload.github.com/stleary/JSON-java/tar.gz/${PV} ->
${P}.tar.gz"
-
-LICENSE="JSON"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# Compile dependencies
-# POM: pom.xml
-# test? com.jayway.jsonpath:json-path:2.1.0 -> !!!groupId-not-found!!!
-# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
-# test? org.mockito:mockito-core:1.9.5 -> >=dev-java/mockito-1.9.5:0
-
-DEPEND="
- >=virtual/jdk-1.8:*"
-# test? (
-# !!!groupId-not-found!!!
-# >=dev-java/mockito-1.9.5:0
-# )
-#"
-
-RDEPEND="
- >=virtual/jre-1.8:*
-"
-
-DOCS=( {README,SECURITY}.md )
-
-S="${WORKDIR}/JSON-java-${PV}"
-
-JAVA_SRC_DIR="src/main/java"
-
-# JAVA_TEST_GENTOO_CLASSPATH="!!!groupId-not-found!!!,junit-4,mockito"
-# JAVA_TEST_SRC_DIR="src/test/java"
-# JAVA_TEST_RESOURCE_DIRS=(
-# "src/test/resources"
-# )
-
-src_install() {
- default # https://bugs.gentoo.org/789582
- java-pkg-simple_src_install
-}
[gentoo-commits] repo/gentoo:master commit in: dev-java/json/
commit: 0692f03e2c9dc4e33cb57f39165eabdea0655e6d
Author: Arthur Zamarin gentoo org>
AuthorDate: Wed Jan 10 11:40:11 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Wed Jan 10 11:40:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0692f03e
dev-java/json: Stabilize 20231013-r1 x86, #918593
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/json/json-20231013-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/json/json-20231013-r1.ebuild
b/dev-java/json/json-20231013-r1.ebuild
index ff26a6b1c443..33b11fb0702e 100644
--- a/dev-java/json/json-20231013-r1.ebuild
+++ b/dev-java/json/json-20231013-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -19,7 +19,7 @@ S="${WORKDIR}/JSON-java-${PV}"
LICENSE="JSON"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
DEPEND="
>=virtual/jdk-1.8:*
[gentoo-commits] repo/gentoo:master commit in: dev-java/json-smart/
commit: a83d6a54e10d217fd1eeba0b30da2120e7146461
Author: Arthur Zamarin gentoo org>
AuthorDate: Wed Jan 10 11:40:11 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Wed Jan 10 11:40:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a83d6a54
dev-java/json-smart: Stabilize 2.5.0 x86, #918593
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/json-smart/json-smart-2.5.0.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/json-smart/json-smart-2.5.0.ebuild
b/dev-java/json-smart/json-smart-2.5.0.ebuild
index 9b20d2f17507..04a95c02d05f 100644
--- a/dev-java/json-smart/json-smart-2.5.0.ebuild
+++ b/dev-java/json-smart/json-smart-2.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -19,7 +19,7 @@ S="${WORKDIR}/${PN}-v2-${PV}"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
RESTRICT="test" #839681
DEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-java/json/
commit: ab61974c85818c58079594033083e19d9f674e96
Author: Arthur Zamarin gentoo org>
AuthorDate: Tue Dec 5 19:46:05 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Tue Dec 5 19:46:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab61974c
dev-java/json: Stabilize 20231013-r1 amd64, #918593
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/json/json-20231013-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/json/json-20231013-r1.ebuild
b/dev-java/json/json-20231013-r1.ebuild
index a11eb3f69c95..ff26a6b1c443 100644
--- a/dev-java/json/json-20231013-r1.ebuild
+++ b/dev-java/json/json-20231013-r1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/JSON-java-${PV}"
LICENSE="JSON"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
DEPEND="
>=virtual/jdk-1.8:*
[gentoo-commits] repo/gentoo:master commit in: dev-java/json-smart/
commit: 0abc53ae49cd88ec42f275d7bb9dd499c8a382e0
Author: Arthur Zamarin gentoo org>
AuthorDate: Tue Dec 5 19:46:05 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Tue Dec 5 19:46:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0abc53ae
dev-java/json-smart: Stabilize 2.5.0 amd64, #918593
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/json-smart/json-smart-2.5.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/json-smart/json-smart-2.5.0.ebuild
b/dev-java/json-smart/json-smart-2.5.0.ebuild
index bed1dc2846b3..9b20d2f17507 100644
--- a/dev-java/json-smart/json-smart-2.5.0.ebuild
+++ b/dev-java/json-smart/json-smart-2.5.0.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${PN}-v2-${PV}"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
RESTRICT="test" #839681
DEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-java/json-smart/
commit: bcf0b6171c955df571b2e4f099608ed8cac9a058 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Sun Nov 26 11:26:38 2023 + Commit: Miroslav Šulc gentoo org> CommitDate: Mon Nov 27 08:41:49 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcf0b617 dev-java/json-smart: add github upstream metadata Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Signed-off-by: Miroslav Šulc gentoo.org> dev-java/json-smart/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-java/json-smart/metadata.xml b/dev-java/json-smart/metadata.xml index 4edced72dcda..d5b2471c532c 100644 --- a/dev-java/json-smart/metadata.xml +++ b/dev-java/json-smart/metadata.xml @@ -15,5 +15,6 @@ netplex/json-smart-v1 + netplex/json-smart-v2
[gentoo-commits] repo/gentoo:master commit in: dev-java/json/, dev-java/json/files/
commit: 5086b55e42c81dc9db9f5cc1cc7ffb1be742
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Sun Nov 26 11:39:43 2023 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Mon Nov 27 08:41:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5086b55e
dev-java/json: unbundle json-smart
Using net.minidev:accessors-smart replaces minidev's asm-1.0.2.jar
which allows switching mockito:0 -> mockito:4 and solves the test
failure.
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/33999
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/json/Manifest | 2 --
.../json/files/json-20231013-JSONObjectTest.patch | 31 --
...son-20231013.ebuild => json-20231013-r1.ebuild} | 14 --
3 files changed, 5 insertions(+), 42 deletions(-)
diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest
index ad2bfa90a8b3..549c5a166a89 100644
--- a/dev-java/json/Manifest
+++ b/dev-java/json/Manifest
@@ -1,5 +1,3 @@
-DIST asm-1.0.2.jar 71757 BLAKE2B
f4aaaba90cbe5a0e22c236c7d368e1ee7513511d924d8c19a4218abcbc874832bfa219024c0758933b855cd4eba351458c500bbbe66123d54a4d384383dfcb4d
SHA512
469ad53734d02b685506921e9318fc649da373eab5febfe23697f0ed948d04aa74e77792834f7cf2438a6b8bb91550cbb4d64c5037556dafa48118842fa7c881
DIST json-20220320.tar.gz 229462 BLAKE2B
9d549e4e905e2a63985b0b2d9a6cfbf7483776799d6b907455356940b48242fda9344874f1625da06215991eae1cfa1e87f3f8f0a204807795ed50f3f9afdbc2
SHA512
1bcd99c69201ea6609a41ec1679467504cd129a8c5a9caede0829cd8eb70b0e59e504a4bc409f57e6b27091e11acbf6108830c6f1fe16919d0cb1daff643bdf0
DIST json-20231013.tar.gz 240211 BLAKE2B
c0594f89c2b02273c736c0fc362f1e3d519d3d88b7e708e64bbd5ca202f539368e9856e311dd9ad42a24c317cfd727feed5af215fbc5e9bbcb18e797323684c8
SHA512
4c5eb3e9ef77825c9e7b874c9084b5bb75b39c527c3cb419fc45171e0d11b24796931a2d16255500ed86610da3ac7805b302ec0b1051f97c97795580dca7c183
DIST json-path-2.1.0.jar 189658 BLAKE2B
2813abfc3b6c758f600bb5e8f8b73eac8dc2a642d461bc26c569a650378ea65cebf691afe975fa2dca406eb324863c36c4623b21c1df2cb83c92e6859b5a9d85
SHA512
c16fc68a04945ad49eb96c38f68a8b4ff351ab1bbc51685f42d22723b2dee4b827ba45cb6b8167199e3f4d22e668ef58665558beec8e11399ac547e9fcebd9f6
-DIST json-smart-2.5.0.jar 120233 BLAKE2B
fb6f89b6df02789d24b650b9c55130363ee235af09f1446926135bf2f4de33757a3d4fd26f0e7f24e44532e21c5453022c781d8fec85e34ea4da92ce4ac992ae
SHA512
56284bb3cee2bcc3684cdcc610115c7eacafdbd70aa852cb0209616b0503dfd448c5110b50e11a71b1c61a6e7ea27594ff63cc968230374555cc6f652d69d372
diff --git a/dev-java/json/files/json-20231013-JSONObjectTest.patch
b/dev-java/json/files/json-20231013-JSONObjectTest.patch
deleted file mode 100644
index e077f19bd5a1..
--- a/dev-java/json/files/json-20231013-JSONObjectTest.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-There was 1 failure:
-1) jsonObjectByBean1(org.json.junit.JSONObjectTest)
-com.jayway.jsonpath.PathNotFoundException: No results for path:
$['mockitoInterceptor']
-at
com.jayway.jsonpath.internal.path.EvaluationContextImpl.getValue(EvaluationContextImpl.java:131)
-at com.jayway.jsonpath.JsonPath.read(JsonPath.java:187)
-at com.jayway.jsonpath.internal.JsonContext.read(JsonContext.java:164)
-at com.jayway.jsonpath.internal.JsonContext.read(JsonContext.java:151)
-at com.jayway.jsonpath.JsonPath.read(JsonPath.java:488)
-at
org.json.junit.JSONObjectTest.jsonObjectByBean1(JSONObjectTest.java:634)
-
-FAILURES!!!
-Tests run: 668, Failures: 1
a/src/test/java/org/json/junit/JSONObjectTest.java
-+++ b/src/test/java/org/json/junit/JSONObjectTest.java
-@@ -56,6 +56,7 @@ import org.json.junit.data.Singleton;
- import org.json.junit.data.SingletonEnum;
- import org.json.junit.data.WeirdList;
- import org.junit.Test;
-+import org.junit.Ignore;
-
- import com.jayway.jsonpath.Configuration;
- import com.jayway.jsonpath.JsonPath;
-@@ -601,7 +602,7 @@ public class JSONObjectTest {
- * bean getters return valid JSON types
- */
- @SuppressWarnings("boxing")
--@Test
-+@Test @Ignore
- public void jsonObjectByBean1() {
- /**
- * Default access classes have to be mocked since JSONObject, which is
diff --git a/dev-java/json/json-20231013.ebuild
b/dev-java/json/json-20231013-r1.ebuild
similarity index 74%
rename from dev-java/json/json-20231013.ebuild
rename to dev-java/json/json-20231013-r1.ebuild
index 3a3262132a5c..a11eb3f69c95 100644
--- a/dev-java/json/json-20231013.ebuild
+++ b/dev-java/json/json-20231013-r1.ebuild
@@ -14,8 +14,6 @@ HOMEPAGE="https://github.com/stleary/JSON-java";
SRC_URI="https://codeload.github.com/stleary/JSON-java/tar.gz/${PV} ->
${P}.tar.gz
test? (
https://repo1.maven.org/maven2/com/jayway/jsonpath/json-path/2.1.0/json-path-2.1.0.jar
-
https://repo1.maven.org/maven2/net/minidev/json-smart/2.5.0/json-smart-2.5.0.jar
-
https:/
[gentoo-commits] repo/gentoo:master commit in: dev-java/json-smart/
commit: 56b196d1ff1a916236fb9cd4ae588a1ddf2726de
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Sun Nov 26 11:17:50 2023 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Mon Nov 27 08:41:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56b196d1
dev-java/json-smart: add 2.5.0
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/json-smart/Manifest| 1 +
dev-java/json-smart/json-smart-2.5.0.ebuild | 71 +
2 files changed, 72 insertions(+)
diff --git a/dev-java/json-smart/Manifest b/dev-java/json-smart/Manifest
index e20ab08d97bb..08a0756cd16f 100644
--- a/dev-java/json-smart/Manifest
+++ b/dev-java/json-smart/Manifest
@@ -1 +1,2 @@
DIST json-smart-1.3.3.tar.gz 49430 BLAKE2B
805e16e0de5321a2e8164468757e9b722849f0fe90fd6822cc99f7afffd9f4e480fc4e14c2bbd12b325a27abc8ca7e93b4a17ce56ac352117cef336e1ebb3fe9
SHA512
c6006c6a00a085ea8810e18889450d11240dc3671351f20602214db418107808df1f413fe67c199d6529e4c0087f253360182ac4fa493bcaf72d2c18ed83
+DIST json-smart-2.5.0.tar.gz 88839 BLAKE2B
25760bd9c9ddecfef2fc3e60fc28b83def2223c7fc1e52ef39b3e6d01e5f2f29f36a35bfd43fc4d6ce6d5df5fcb25f59b1c86e1864a3044c69a6d0010335280b
SHA512
4bffadf68998da4b63b34bcc9dbf804fd2b21b8d9514de4e155127d5a2eb3db74c7e396959b54c61c08e169eeed85dff3ad2f1d899cfddca53e501c45cebae21
diff --git a/dev-java/json-smart/json-smart-2.5.0.ebuild
b/dev-java/json-smart/json-smart-2.5.0.ebuild
new file mode 100644
index ..bed1dc2846b3
--- /dev/null
+++ b/dev-java/json-smart/json-smart-2.5.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_PROVIDES="
+ net.minidev:accessors-smart:${PV}
+ net.minidev:json-smart:${PV}
+"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JSON Small and Fast Parser"
+HOMEPAGE="https://urielch.github.io";
+SRC_URI="https://github.com/netplex/json-smart-v2/archive/${PV}.tar.gz ->
${P}.tar.gz"
+S="${WORKDIR}/${PN}-v2-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+RESTRICT="test" #839681
+
+DEPEND="
+ dev-java/asm:9
+ >=virtual/jdk-1.8:*
+"
+RDEPEND=">=virtual/jre-1.8:*"
+
+src_compile() {
+ einfo "Compiling accessors-smart.jar"
+ JAVA_CLASSPATH_EXTRA="asm-9"
+ JAVA_JAR_FILENAME="accessors-smart.jar"
+ JAVA_SRC_DIR="accessors-smart/src/main/java"
+ java-pkg-simple_src_compile
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":accessors-smart.jar"
+ rm -r target || die
+
+ einfo "Compiling json-smart.jar"
+ JAVA_JAR_FILENAME="json-smart.jar"
+ JAVA_SRC_DIR="json-smart/src/main/java"
+ java-pkg-simple_src_compile
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":json-smart.jar"
+ rm -r target || die
+
+ if use doc; then
+ einfo "Compiling javadocs"
+ JAVA_SRC_DIR=(
+ accessors-smart/src/main/java
+ json-smart/src/main/java
+ )
+ JAVA_JAR_FILENAME="ignoreme.jar"
+ java-pkg-simple_src_compile
+ fi
+}
+
+src_install() {
+ einstalldocs
+ java-pkg_dojar "accessors-smart.jar"
+ java-pkg_dojar "json-smart.jar"
+
+ if use doc; then
+ java-pkg_dojavadoc target/api
+ fi
+
+ if use source; then
+ java-pkg_dosrc "accessors-smart/src/main/java/*"
+ java-pkg_dosrc "json-smart/src/main/java/*"
+ fi
+}
[gentoo-commits] repo/gentoo:master commit in: dev-java/json/, dev-java/json/files/
commit: 8e2e4560e1e391e9c24bb6af71aa7897a2f5e2e6
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Sat Nov 25 17:58:00 2023 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sun Nov 26 08:53:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e2e4560
dev-java/json: add 20231013 - CVE-2023-5072
Bug: https://bugs.gentoo.org/918529
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/33985
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/json/Manifest | 4 ++
.../json/files/json-20231013-JSONObjectTest.patch | 31 ++
dev-java/json/json-20231013.ebuild | 69 ++
3 files changed, 104 insertions(+)
diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest
index c41dbd88dc04..ad2bfa90a8b3 100644
--- a/dev-java/json/Manifest
+++ b/dev-java/json/Manifest
@@ -1 +1,5 @@
+DIST asm-1.0.2.jar 71757 BLAKE2B
f4aaaba90cbe5a0e22c236c7d368e1ee7513511d924d8c19a4218abcbc874832bfa219024c0758933b855cd4eba351458c500bbbe66123d54a4d384383dfcb4d
SHA512
469ad53734d02b685506921e9318fc649da373eab5febfe23697f0ed948d04aa74e77792834f7cf2438a6b8bb91550cbb4d64c5037556dafa48118842fa7c881
DIST json-20220320.tar.gz 229462 BLAKE2B
9d549e4e905e2a63985b0b2d9a6cfbf7483776799d6b907455356940b48242fda9344874f1625da06215991eae1cfa1e87f3f8f0a204807795ed50f3f9afdbc2
SHA512
1bcd99c69201ea6609a41ec1679467504cd129a8c5a9caede0829cd8eb70b0e59e504a4bc409f57e6b27091e11acbf6108830c6f1fe16919d0cb1daff643bdf0
+DIST json-20231013.tar.gz 240211 BLAKE2B
c0594f89c2b02273c736c0fc362f1e3d519d3d88b7e708e64bbd5ca202f539368e9856e311dd9ad42a24c317cfd727feed5af215fbc5e9bbcb18e797323684c8
SHA512
4c5eb3e9ef77825c9e7b874c9084b5bb75b39c527c3cb419fc45171e0d11b24796931a2d16255500ed86610da3ac7805b302ec0b1051f97c97795580dca7c183
+DIST json-path-2.1.0.jar 189658 BLAKE2B
2813abfc3b6c758f600bb5e8f8b73eac8dc2a642d461bc26c569a650378ea65cebf691afe975fa2dca406eb324863c36c4623b21c1df2cb83c92e6859b5a9d85
SHA512
c16fc68a04945ad49eb96c38f68a8b4ff351ab1bbc51685f42d22723b2dee4b827ba45cb6b8167199e3f4d22e668ef58665558beec8e11399ac547e9fcebd9f6
+DIST json-smart-2.5.0.jar 120233 BLAKE2B
fb6f89b6df02789d24b650b9c55130363ee235af09f1446926135bf2f4de33757a3d4fd26f0e7f24e44532e21c5453022c781d8fec85e34ea4da92ce4ac992ae
SHA512
56284bb3cee2bcc3684cdcc610115c7eacafdbd70aa852cb0209616b0503dfd448c5110b50e11a71b1c61a6e7ea27594ff63cc968230374555cc6f652d69d372
diff --git a/dev-java/json/files/json-20231013-JSONObjectTest.patch
b/dev-java/json/files/json-20231013-JSONObjectTest.patch
new file mode 100644
index ..e077f19bd5a1
--- /dev/null
+++ b/dev-java/json/files/json-20231013-JSONObjectTest.patch
@@ -0,0 +1,31 @@
+There was 1 failure:
+1) jsonObjectByBean1(org.json.junit.JSONObjectTest)
+com.jayway.jsonpath.PathNotFoundException: No results for path:
$['mockitoInterceptor']
+at
com.jayway.jsonpath.internal.path.EvaluationContextImpl.getValue(EvaluationContextImpl.java:131)
+at com.jayway.jsonpath.JsonPath.read(JsonPath.java:187)
+at com.jayway.jsonpath.internal.JsonContext.read(JsonContext.java:164)
+at com.jayway.jsonpath.internal.JsonContext.read(JsonContext.java:151)
+at com.jayway.jsonpath.JsonPath.read(JsonPath.java:488)
+at
org.json.junit.JSONObjectTest.jsonObjectByBean1(JSONObjectTest.java:634)
+
+FAILURES!!!
+Tests run: 668, Failures: 1
+--- a/src/test/java/org/json/junit/JSONObjectTest.java
b/src/test/java/org/json/junit/JSONObjectTest.java
+@@ -56,6 +56,7 @@ import org.json.junit.data.Singleton;
+ import org.json.junit.data.SingletonEnum;
+ import org.json.junit.data.WeirdList;
+ import org.junit.Test;
++import org.junit.Ignore;
+
+ import com.jayway.jsonpath.Configuration;
+ import com.jayway.jsonpath.JsonPath;
+@@ -601,7 +602,7 @@ public class JSONObjectTest {
+ * bean getters return valid JSON types
+ */
+ @SuppressWarnings("boxing")
+-@Test
++@Test @Ignore
+ public void jsonObjectByBean1() {
+ /**
+ * Default access classes have to be mocked since JSONObject, which is
diff --git a/dev-java/json/json-20231013.ebuild
b/dev-java/json/json-20231013.ebuild
new file mode 100644
index ..3a3262132a5c
--- /dev/null
+++ b/dev-java/json/json-20231013.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.json:json:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A reference implementation of a JSON package in Java"
+HOMEPAGE="https://github.com/stleary/JSON-java";
+SRC_URI="https://codeload.github.com/stleary/JSON-java/tar.gz/${PV} ->
${P}.tar.gz
+ test? (
+
https://repo1.maven.org/maven2/com/jayway/jsonpath/json-path/2.1.0/json-path-2.1.0.jar
+
https://repo1.maven.org/maven2/ne
[gentoo-commits] repo/gentoo:master commit in: dev-java/json-smart/
commit: f0dd3d1f0026cfc1710e6d36c1c65ec36695c781
Author: Sam James gentoo org>
AuthorDate: Tue Jul 18 17:20:32 2023 +
Commit: Sam James gentoo org>
CommitDate: Tue Jul 18 17:20:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0dd3d1f
dev-java/json-smart: Keyword 1.3.3 arm, #906822
Signed-off-by: Sam James gentoo.org>
dev-java/json-smart/json-smart-1.3.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/json-smart/json-smart-1.3.3.ebuild
b/dev-java/json-smart/json-smart-1.3.3.ebuild
index 732efdc914a4..c174d7e6acb7 100644
--- a/dev-java/json-smart/json-smart-1.3.3.ebuild
+++ b/dev-java/json-smart/json-smart-1.3.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://urielch.github.io";
SRC_URI="https://github.com/netplex/json-smart-v1/archive/${PV}.tar.gz ->
${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
[gentoo-commits] repo/gentoo:master commit in: dev-java/json-simple/
commit: 4d0d923b0d232a666820e3867e5a7290805a4264
Author: Sam James gentoo org>
AuthorDate: Tue Jul 18 17:20:31 2023 +
Commit: Sam James gentoo org>
CommitDate: Tue Jul 18 17:20:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d0d923b
dev-java/json-simple: Keyword 2.3.1 arm, #906822
Signed-off-by: Sam James gentoo.org>
dev-java/json-simple/json-simple-2.3.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/json-simple/json-simple-2.3.1.ebuild
b/dev-java/json-simple/json-simple-2.3.1.ebuild
index 1c07cb6309a1..db1876d94be6 100644
--- a/dev-java/json-simple/json-simple-2.3.1.ebuild
+++ b/dev-java/json-simple/json-simple-2.3.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${P}"
LICENSE="Apache-2.0"
SLOT="2.3"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
[gentoo-commits] repo/gentoo:master commit in: dev-java/json-smart/
commit: 396fe33744f03357774835e25085e8737488357b
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Jul 15 13:15:21 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Jul 15 13:15:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=396fe337
dev-java/json-smart: Stabilize 1.3.3 amd64, #910387
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/json-smart/json-smart-1.3.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/json-smart/json-smart-1.3.3.ebuild
b/dev-java/json-smart/json-smart-1.3.3.ebuild
index 2249a996229c..78add7892d40 100644
--- a/dev-java/json-smart/json-smart-1.3.3.ebuild
+++ b/dev-java/json-smart/json-smart-1.3.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://urielch.github.io";
SRC_URI="https://github.com/netplex/json-smart-v1/archive/${PV}.tar.gz ->
${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
[gentoo-commits] repo/gentoo:master commit in: dev-java/json-smart/
commit: cc08cc721e9e911ee31dede836588038401cf0ea Author: Sam James gentoo org> AuthorDate: Sun May 21 05:39:10 2023 + Commit: Sam James gentoo org> CommitDate: Sun May 21 05:41:47 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc08cc72 dev-java/json-smart: update maintainers Signed-off-by: Sam James gentoo.org> dev-java/json-smart/metadata.xml | 8 1 file changed, 8 insertions(+) diff --git a/dev-java/json-smart/metadata.xml b/dev-java/json-smart/metadata.xml index a6544c9f9455..4edced72dcda 100644 --- a/dev-java/json-smart/metadata.xml +++ b/dev-java/json-smart/metadata.xml @@ -1,10 +1,18 @@ https://www.gentoo.org/dtd/metadata.dtd";> + + thar...@gmail.com + Valérian Rousset + j...@gentoo.org Java + + proxy-ma...@gentoo.org + Proxy Maintainers + netplex/json-smart-v1
[gentoo-commits] repo/gentoo:master commit in: dev-java/json-smart/
commit: 5aedc2bd66fc9317738102ed0379bc8f75237d79
Author: Valérian Rousset users noreply github
com>
AuthorDate: Fri Apr 14 18:55:57 2023 +
Commit: Sam James gentoo org>
CommitDate: Sat May 20 09:21:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5aedc2bd
dev-java/json-smart: new package, add 1.3.3
Signed-off-by: Valérian Rousset users.noreply.github.com>
Signed-off-by: Sam James gentoo.org>
dev-java/json-smart/Manifest| 1 +
dev-java/json-smart/json-smart-1.3.3.ebuild | 26 ++
dev-java/json-smart/metadata.xml| 11 +++
3 files changed, 38 insertions(+)
diff --git a/dev-java/json-smart/Manifest b/dev-java/json-smart/Manifest
new file mode 100644
index ..e20ab08d97bb
--- /dev/null
+++ b/dev-java/json-smart/Manifest
@@ -0,0 +1 @@
+DIST json-smart-1.3.3.tar.gz 49430 BLAKE2B
805e16e0de5321a2e8164468757e9b722849f0fe90fd6822cc99f7afffd9f4e480fc4e14c2bbd12b325a27abc8ca7e93b4a17ce56ac352117cef336e1ebb3fe9
SHA512
c6006c6a00a085ea8810e18889450d11240dc3671351f20602214db418107808df1f413fe67c199d6529e4c0087f253360182ac4fa493bcaf72d2c18ed83
diff --git a/dev-java/json-smart/json-smart-1.3.3.ebuild
b/dev-java/json-smart/json-smart-1.3.3.ebuild
new file mode 100644
index ..2249a996229c
--- /dev/null
+++ b/dev-java/json-smart/json-smart-1.3.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="net.minidev:json-smart:1.3.3"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="old JSON parser"
+HOMEPAGE="https://urielch.github.io";
+SRC_URI="https://github.com/netplex/json-smart-v1/archive/${PV}.tar.gz ->
${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${PN}-v1-${PV}/json-smart"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
diff --git a/dev-java/json-smart/metadata.xml b/dev-java/json-smart/metadata.xml
new file mode 100644
index ..a6544c9f9455
--- /dev/null
+++ b/dev-java/json-smart/metadata.xml
@@ -0,0 +1,11 @@
+
+https://www.gentoo.org/dtd/metadata.dtd";>
+
+
+ j...@gentoo.org
+ Java
+
+
+ netplex/json-smart-v1
+
+
[gentoo-commits] repo/gentoo:master commit in: dev-java/json-simple/
commit: a16d860890b4ed48f3cc0cd1e3a69577db0e7279
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Sun Apr 9 08:28:44 2023 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sun Apr 9 13:13:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a16d8608
dev-java/json-simple: drop 1.1-r2
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/json-simple/Manifest | 1 -
dev-java/json-simple/json-simple-1.1-r2.ebuild | 30 --
2 files changed, 31 deletions(-)
diff --git a/dev-java/json-simple/Manifest b/dev-java/json-simple/Manifest
index 230b70a31c26..ca0205d6e68a 100644
--- a/dev-java/json-simple/Manifest
+++ b/dev-java/json-simple/Manifest
@@ -1,2 +1 @@
-DIST json-simple-1.1.tar.gz 22154 BLAKE2B
594717df45d56b4e70cee9aadca661a9da7e19c2a77e5ab2176396c48bdf061f25db0e4cbf5b93b12dc862dfca593a71dcd154f24c914a4d2ff510e3f4b11570
SHA512
f09cb298254a8f35b534670d6a1801eeaf58385529f459f413aed556df1ac577bea6e678a32065077abc851dc310b3af38b818f1737bd255f05e756d7e2da066
DIST json-simple-2.3.1.tar.gz 56230 BLAKE2B
c4a196ffa67a729a1964db8c30b95ccb0bef0c213a76e37e463153a895a5fdb8c6f02f6d188d28f0b56665bf24c75dbdeeb42d88297c8df5e1b409606b0f04f2
SHA512
b80ea33480f8b32511ee2db5cfacc9c02cb5dbf0765b41fb76e099f41ac6c0ea69d75fdf0a5f783e3bfb7b4f200c49ca192a3321e0d8480b3a8b67ada469dbb1
diff --git a/dev-java/json-simple/json-simple-1.1-r2.ebuild
b/dev-java/json-simple/json-simple-1.1-r2.ebuild
deleted file mode 100644
index d73b7b55ba0c..
--- a/dev-java/json-simple/json-simple-1.1-r2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="source doc"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="tag_release_1_1_1"
-
-DESCRIPTION="Simple Java toolkit for JSON"
-HOMEPAGE="http://www.json.org";
-SRC_URI="https://github.com/fangyidong/json-simple/archive/${MY_P}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${PN}-${MY_P}"
-
-JAVA_SRC_DIR="src/main"
-
-src_prepare() {
- default
- rm -rv src/test || die
-}
[gentoo-commits] repo/gentoo:master commit in: dev-java/json-simple/
commit: 83f0fe39fa3c984b625ab37ac4e058133e19d38e
Author: Arthur Zamarin gentoo org>
AuthorDate: Sun Apr 9 07:44:49 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sun Apr 9 07:44:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83f0fe39
dev-java/json-simple: Stabilize 2.3.1 ppc64, #904057
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/json-simple/json-simple-2.3.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/json-simple/json-simple-2.3.1.ebuild
b/dev-java/json-simple/json-simple-2.3.1.ebuild
index 4762c448b485..1a2f835b8547 100644
--- a/dev-java/json-simple/json-simple-2.3.1.ebuild
+++ b/dev-java/json-simple/json-simple-2.3.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${P}"
LICENSE="Apache-2.0"
SLOT="2.3"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
[gentoo-commits] repo/gentoo:master commit in: dev-java/json-simple/
commit: 3cca305975b578875884b6e5d6aec5d0782c57c9
Author: Sam James gentoo org>
AuthorDate: Sun Apr 9 07:44:06 2023 +
Commit: Sam James gentoo org>
CommitDate: Sun Apr 9 07:44:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cca3059
dev-java/json-simple: Stabilize 2.3.1 amd64, #904057
Signed-off-by: Sam James gentoo.org>
dev-java/json-simple/json-simple-2.3.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/json-simple/json-simple-2.3.1.ebuild
b/dev-java/json-simple/json-simple-2.3.1.ebuild
index c832c5ea49b4..4762c448b485 100644
--- a/dev-java/json-simple/json-simple-2.3.1.ebuild
+++ b/dev-java/json-simple/json-simple-2.3.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${P}"
LICENSE="Apache-2.0"
SLOT="2.3"
-KEYWORDS="~amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
[gentoo-commits] repo/gentoo:master commit in: dev-java/json-simple/
commit: a744391218089915fe66ba9c1911ec21d9f4b60c
Author: Sam James gentoo org>
AuthorDate: Sun Apr 9 07:44:05 2023 +
Commit: Sam James gentoo org>
CommitDate: Sun Apr 9 07:44:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7443912
dev-java/json-simple: Stabilize 2.3.1 x86, #904057
Signed-off-by: Sam James gentoo.org>
dev-java/json-simple/json-simple-2.3.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/json-simple/json-simple-2.3.1.ebuild
b/dev-java/json-simple/json-simple-2.3.1.ebuild
index e7d6ef026a03..c832c5ea49b4 100644
--- a/dev-java/json-simple/json-simple-2.3.1.ebuild
+++ b/dev-java/json-simple/json-simple-2.3.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${P}"
LICENSE="Apache-2.0"
SLOT="2.3"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 x86"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
[gentoo-commits] repo/gentoo:master commit in: dev-java/json-simple/
commit: 136521626740b63d3bef7153c2dc1a6cc9525976
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Thu Mar 9 10:19:04 2023 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Fri Mar 10 07:44:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13652162
dev-java/json-simple: add 2.3.1
Version needed to unbundle from net-vpn/i2p
Version 2.3.1 is 100% bytecode compatible to 2.3.0
Bug: https://bugs.gentoo.org/900515
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/30014
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/json-simple/Manifest | 1 +
dev-java/json-simple/json-simple-2.3.1.ebuild | 26 ++
dev-java/json-simple/metadata.xml | 2 +-
3 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/dev-java/json-simple/Manifest b/dev-java/json-simple/Manifest
index 2d05f995e396..230b70a31c26 100644
--- a/dev-java/json-simple/Manifest
+++ b/dev-java/json-simple/Manifest
@@ -1 +1,2 @@
DIST json-simple-1.1.tar.gz 22154 BLAKE2B
594717df45d56b4e70cee9aadca661a9da7e19c2a77e5ab2176396c48bdf061f25db0e4cbf5b93b12dc862dfca593a71dcd154f24c914a4d2ff510e3f4b11570
SHA512
f09cb298254a8f35b534670d6a1801eeaf58385529f459f413aed556df1ac577bea6e678a32065077abc851dc310b3af38b818f1737bd255f05e756d7e2da066
+DIST json-simple-2.3.1.tar.gz 56230 BLAKE2B
c4a196ffa67a729a1964db8c30b95ccb0bef0c213a76e37e463153a895a5fdb8c6f02f6d188d28f0b56665bf24c75dbdeeb42d88297c8df5e1b409606b0f04f2
SHA512
b80ea33480f8b32511ee2db5cfacc9c02cb5dbf0765b41fb76e099f41ac6c0ea69d75fdf0a5f783e3bfb7b4f200c49ca192a3321e0d8480b3a8b67ada469dbb1
diff --git a/dev-java/json-simple/json-simple-2.3.1.ebuild
b/dev-java/json-simple/json-simple-2.3.1.ebuild
new file mode 100644
index ..e7d6ef026a03
--- /dev/null
+++ b/dev-java/json-simple/json-simple-2.3.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="source doc test"
+MAVEN_ID="com.github.cliftonlabs:json-simple:2.3.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java 7+ toolkit to quickly develop RFC 4627 JSON compatible
applications"
+HOMEPAGE="https://www.json.org";
+SRC_URI="https://github.com/cliftonlabs/json-simple/archive/json-simple-${PV}.tar.gz";
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="Apache-2.0"
+SLOT="2.3"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
diff --git a/dev-java/json-simple/metadata.xml
b/dev-java/json-simple/metadata.xml
index 0c65410880a7..22e6f7bfad33 100644
--- a/dev-java/json-simple/metadata.xml
+++ b/dev-java/json-simple/metadata.xml
@@ -13,6 +13,6 @@
website,I found that wrappers to JSONObject and JSONArray can be
simpler,
due to the simplicity of JSON itself. So I wrote the JSON.simple
package.
- json-simple
+ cliftonlabs/json-simple
[gentoo-commits] repo/gentoo:master commit in: dev-java/json/
commit: e3d26dbec24b2148ece39d8e73032acb818566eb
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Sat Apr 23 06:07:04 2022 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sat Apr 23 07:05:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3d26dbe
dev-java/json: drop 20150729
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/json/Manifest | 1 -
dev-java/json/json-20150729.ebuild | 33 -
2 files changed, 34 deletions(-)
diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest
index 3cf2b7de9e33..c41dbd88dc04 100644
--- a/dev-java/json/Manifest
+++ b/dev-java/json/Manifest
@@ -1,2 +1 @@
-DIST json-20150729.zip 52114 BLAKE2B
8730eaa92002debf3563f1b07901118b2b5fb8754d5d35491ef7e4a7c8f208687a00ea2ab587e183d0d88af59f5527deb2a64e244b2668196f9f31a80099148f
SHA512
ad21ce236b9df04482e039e57a16edec4018214aa6e00379573dc7c6977062c759aa21084b70540d35656ebcdb5eaa6525defb88e281ee0e4e7277e32f22755c
DIST json-20220320.tar.gz 229462 BLAKE2B
9d549e4e905e2a63985b0b2d9a6cfbf7483776799d6b907455356940b48242fda9344874f1625da06215991eae1cfa1e87f3f8f0a204807795ed50f3f9afdbc2
SHA512
1bcd99c69201ea6609a41ec1679467504cd129a8c5a9caede0829cd8eb70b0e59e504a4bc409f57e6b27091e11acbf6108830c6f1fe16919d0cb1daff643bdf0
diff --git a/dev-java/json/json-20150729.ebuild
b/dev-java/json/json-20150729.ebuild
deleted file mode 100644
index a40b3e9d7189..
--- a/dev-java/json/json-20150729.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java implementation of the JavaScript Object Notation"
-HOMEPAGE="https://github.com/douglascrockford/JSON-java";
-SRC_URI="https://github.com/douglascrockford/JSON-java/archive/${PV}.zip ->
${P}.zip"
-
-LICENSE="JSON"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7"
-
-S="${WORKDIR}/JSON-java-${PV}"
-JAVA_SRC_DIR="src"
-
-java_prepare() {
- chmod a-x *.java || die
- mkdir -p src || die
- mv *.java src || die
-}
-
-src_install() {
- java-pkg-simple_src_install
- dodoc README
-}
[gentoo-commits] repo/gentoo:master commit in: dev-java/json/
commit: bcef5c51a7ca805138a80b369b74a4344d6e3d1d
Author: Sam James gentoo org>
AuthorDate: Sat Apr 23 01:52:51 2022 +
Commit: Sam James gentoo org>
CommitDate: Sat Apr 23 01:52:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcef5c51
dev-java/json: Stabilize 20220320 x86, #833412
Signed-off-by: Sam James gentoo.org>
dev-java/json/json-20220320.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/json/json-20220320.ebuild
b/dev-java/json/json-20220320.ebuild
index 0151873d71ab..dd9d6c76b588 100644
--- a/dev-java/json/json-20220320.ebuild
+++ b/dev-java/json/json-20220320.ebuild
@@ -19,7 +19,7 @@
SRC_URI="https://codeload.github.com/stleary/JSON-java/tar.gz/${PV} -> ${P}.tar.
LICENSE="JSON"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
# Compile dependencies
# POM: pom.xml
[gentoo-commits] repo/gentoo:master commit in: dev-java/json/
commit: 3ddb803654ab6d133637d6bfb8d661a3031d3672
Author: Sam James gentoo org>
AuthorDate: Sat Apr 23 01:53:06 2022 +
Commit: Sam James gentoo org>
CommitDate: Sat Apr 23 01:53:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ddb8036
dev-java/json: Stabilize 20220320 amd64, #833412
Signed-off-by: Sam James gentoo.org>
dev-java/json/json-20220320.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/json/json-20220320.ebuild
b/dev-java/json/json-20220320.ebuild
index dd9d6c76b588..86e62eab5ee3 100644
--- a/dev-java/json/json-20220320.ebuild
+++ b/dev-java/json/json-20220320.ebuild
@@ -19,7 +19,7 @@
SRC_URI="https://codeload.github.com/stleary/JSON-java/tar.gz/${PV} -> ${P}.tar.
LICENSE="JSON"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
# Compile dependencies
# POM: pom.xml
[gentoo-commits] repo/gentoo:master commit in: dev-java/json/
commit: c5ef719e68c724074826c5759576e732d1fc74c5
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Mon Mar 21 23:39:11 2022 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Tue Mar 22 07:31:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5ef719e
dev-java/json: Drop 20160212
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/24700
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/json/Manifest | 1 -
dev-java/json/json-20160212.ebuild | 33 -
2 files changed, 34 deletions(-)
diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest
index c3bd95bfc118..3cf2b7de9e33 100644
--- a/dev-java/json/Manifest
+++ b/dev-java/json/Manifest
@@ -1,3 +1,2 @@
DIST json-20150729.zip 52114 BLAKE2B
8730eaa92002debf3563f1b07901118b2b5fb8754d5d35491ef7e4a7c8f208687a00ea2ab587e183d0d88af59f5527deb2a64e244b2668196f9f31a80099148f
SHA512
ad21ce236b9df04482e039e57a16edec4018214aa6e00379573dc7c6977062c759aa21084b70540d35656ebcdb5eaa6525defb88e281ee0e4e7277e32f22755c
-DIST json-20160212.zip 52295 BLAKE2B
a0cd21b9cdf5f14ad7531af2e48f8a6f22b8f05d3b2baba48c659bb91b7791681c74e37a4011bf2ef525c4e39edf2c7c73d1275514f44c8bc7e8eddf5c2b76e6
SHA512
6648443c55f7e427e700a2bcb5cce8e4b796c42c0afb53a455dc847b0636f2e009171a39f96f0c317fdc1080ddc106dcd4c8066cfbd71091db3ad83bf7c0ae2c
DIST json-20220320.tar.gz 229462 BLAKE2B
9d549e4e905e2a63985b0b2d9a6cfbf7483776799d6b907455356940b48242fda9344874f1625da06215991eae1cfa1e87f3f8f0a204807795ed50f3f9afdbc2
SHA512
1bcd99c69201ea6609a41ec1679467504cd129a8c5a9caede0829cd8eb70b0e59e504a4bc409f57e6b27091e11acbf6108830c6f1fe16919d0cb1daff643bdf0
diff --git a/dev-java/json/json-20160212.ebuild
b/dev-java/json/json-20160212.ebuild
deleted file mode 100644
index e0a506eb6468..
--- a/dev-java/json/json-20160212.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java implementation of the JavaScript Object Notation"
-HOMEPAGE="https://github.com/douglascrockford/JSON-java";
-SRC_URI="https://github.com/douglascrockford/JSON-java/archive/${PV}.zip ->
${P}.zip"
-
-LICENSE="JSON"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7"
-
-S="${WORKDIR}/JSON-java-${PV}"
-JAVA_SRC_DIR="src"
-
-java_prepare() {
- chmod a-x *.java || die
- mkdir -p src || die
- mv *.java src || die
-}
-
-src_install() {
- java-pkg-simple_src_install
- dodoc README
-}
[gentoo-commits] repo/gentoo:master commit in: dev-java/json/
commit: ea89f2da6f48a43f39854032381b3117a5fc315e
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Mon Mar 21 23:36:46 2022 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Tue Mar 22 07:31:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea89f2da
dev-java/json: Bump to 20220320, min java 1.8:*
Bug: https://bugs.gentoo.org/833412
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/json/Manifest | 1 +
dev-java/json/json-20220320.ebuild | 57 ++
dev-java/json/metadata.xml | 11 ++--
3 files changed, 66 insertions(+), 3 deletions(-)
diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest
index 6434984e3124..c3bd95bfc118 100644
--- a/dev-java/json/Manifest
+++ b/dev-java/json/Manifest
@@ -1,2 +1,3 @@
DIST json-20150729.zip 52114 BLAKE2B
8730eaa92002debf3563f1b07901118b2b5fb8754d5d35491ef7e4a7c8f208687a00ea2ab587e183d0d88af59f5527deb2a64e244b2668196f9f31a80099148f
SHA512
ad21ce236b9df04482e039e57a16edec4018214aa6e00379573dc7c6977062c759aa21084b70540d35656ebcdb5eaa6525defb88e281ee0e4e7277e32f22755c
DIST json-20160212.zip 52295 BLAKE2B
a0cd21b9cdf5f14ad7531af2e48f8a6f22b8f05d3b2baba48c659bb91b7791681c74e37a4011bf2ef525c4e39edf2c7c73d1275514f44c8bc7e8eddf5c2b76e6
SHA512
6648443c55f7e427e700a2bcb5cce8e4b796c42c0afb53a455dc847b0636f2e009171a39f96f0c317fdc1080ddc106dcd4c8066cfbd71091db3ad83bf7c0ae2c
+DIST json-20220320.tar.gz 229462 BLAKE2B
9d549e4e905e2a63985b0b2d9a6cfbf7483776799d6b907455356940b48242fda9344874f1625da06215991eae1cfa1e87f3f8f0a204807795ed50f3f9afdbc2
SHA512
1bcd99c69201ea6609a41ec1679467504cd129a8c5a9caede0829cd8eb70b0e59e504a4bc409f57e6b27091e11acbf6108830c6f1fe16919d0cb1daff643bdf0
diff --git a/dev-java/json/json-20220320.ebuild
b/dev-java/json/json-20220320.ebuild
new file mode 100644
index ..0151873d71ab
--- /dev/null
+++ b/dev-java/json/json-20220320.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri
https://codeload.github.com/stleary/JSON-java/tar.gz/20220320 --slot 0
--keywords "~amd64 ~x86" --ebuild json-20220320.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.json:json:20220320"
+# We don't have com.jayway.jsonpath:json-path
+# JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A reference implementation of a JSON package in Java"
+HOMEPAGE="https://github.com/stleary/JSON-java";
+SRC_URI="https://codeload.github.com/stleary/JSON-java/tar.gz/${PV} ->
${P}.tar.gz"
+
+LICENSE="JSON"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Compile dependencies
+# POM: pom.xml
+# test? com.jayway.jsonpath:json-path:2.1.0 -> !!!groupId-not-found!!!
+# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
+# test? org.mockito:mockito-core:1.9.5 -> >=dev-java/mockito-1.9.5:0
+
+DEPEND="
+ >=virtual/jdk-1.8:*"
+# test? (
+# !!!groupId-not-found!!!
+# >=dev-java/mockito-1.9.5:0
+# )
+#"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+"
+
+DOCS=( {README,SECURITY}.md )
+
+S="${WORKDIR}/JSON-java-${PV}"
+
+JAVA_SRC_DIR="src/main/java"
+
+# JAVA_TEST_GENTOO_CLASSPATH="!!!groupId-not-found!!!,junit-4,mockito"
+# JAVA_TEST_SRC_DIR="src/test/java"
+# JAVA_TEST_RESOURCE_DIRS=(
+# "src/test/resources"
+# )
+
+src_install() {
+ default # https://bugs.gentoo.org/789582
+ java-pkg-simple_src_install
+}
diff --git a/dev-java/json/metadata.xml b/dev-java/json/metadata.xml
index c7e742473ea0..44f2fdc3862b 100644
--- a/dev-java/json/metadata.xml
+++ b/dev-java/json/metadata.xml
@@ -1,11 +1,16 @@
https://www.gentoo.org/dtd/metadata.dtd";>
-
- douglascrockford/JSON-java
-
j...@gentoo.org
Java
+
+ https://github.com/stleary/JSON-java/issues
+ https://github.com/stleary/JSON-java/wiki/
+ stleary/JSON-java
+
+
+ JSON is a light-weight, language independent, data interchange
format. See http://www.JSON.org/ The files in this package implement JSON
encoders/decoders in Java. It also includes the capability to convert between
JSON and XML, HTTP headers, Cookies, and CDL. This is a reference
implementation. There is a large number of JSON packages in Java. Perhaps
someday the Java community will standardize on one. Until then, choose
carefully. The license includes this restriction: \"The software shall be used
for good, not evil.\" If your conscience cannot live with that, then choose a
different package.
+
[gentoo-commits] repo/gentoo:master commit in: dev-java/json-simple/
commit: afb9dff1c8a04e24568fe17c1c68d8f7b9aae0cf
Author: Wolfgang E. Sanyer gmail com>
AuthorDate: Mon May 3 20:17:47 2021 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Tue May 4 09:14:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afb9dff1
dev-java/json-simple: update java deps
Signed-off-by: Wolfgang E. Sanyer gmail.com>
Closes:
https://github.com/gentoo/gentoo/pull/20608/commits/fcb0ebe0d15c3c3e08ab95a15a7f9bffb8c22637
Signed-off-by: Miroslav Šulc gentoo.org>
.../{json-simple-1.1-r1.ebuild => json-simple-1.1-r2.ebuild} | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-java/json-simple/json-simple-1.1-r1.ebuild
b/dev-java/json-simple/json-simple-1.1-r2.ebuild
similarity index 82%
rename from dev-java/json-simple/json-simple-1.1-r1.ebuild
rename to dev-java/json-simple/json-simple-1.1-r2.ebuild
index a91c4fbc828..d73b7b55ba0 100644
--- a/dev-java/json-simple/json-simple-1.1-r1.ebuild
+++ b/dev-java/json-simple/json-simple-1.1-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
JAVA_PKG_IUSE="source doc"
@@ -17,8 +17,8 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ppc64 x86"
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
S="${WORKDIR}/${PN}-${MY_P}"
[gentoo-commits] repo/gentoo:master commit in: dev-java/json/
commit: 78b1dea2077c6b16a362b2a4ca06855decd843d9
Author: Ulrich Müller gentoo org>
AuthorDate: Fri Jul 5 10:41:32 2019 +
Commit: Ulrich Müller gentoo org>
CommitDate: Fri Jul 5 10:42:33 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78b1dea2
dev-java/json: Fix LICENSE.
Acked-by: Patrice Clement gentoo.org>
Closes: https://bugs.gentoo.org/689314
Package-Manager: Portage-2.3.67, Repoman-2.3.15
Signed-off-by: Ulrich Müller gentoo.org>
dev-java/json/json-20150729.ebuild | 5 +++--
dev-java/json/json-20160212.ebuild | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/dev-java/json/json-20150729.ebuild
b/dev-java/json/json-20150729.ebuild
index 6af44fe16da..1a1e7bda2a3 100644
--- a/dev-java/json/json-20150729.ebuild
+++ b/dev-java/json/json-20150729.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -9,7 +9,8 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Java implementation of the JavaScript Object Notation"
HOMEPAGE="https://github.com/douglascrockford/JSON-java";
SRC_URI="https://github.com/douglascrockford/JSON-java/archive/${PV}.zip ->
${P}.zip"
-LICENSE="BSD"
+
+LICENSE="JSON"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE=""
diff --git a/dev-java/json/json-20160212.ebuild
b/dev-java/json/json-20160212.ebuild
index 09e93dc0828..e0a506eb646 100644
--- a/dev-java/json/json-20160212.ebuild
+++ b/dev-java/json/json-20160212.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -9,7 +9,8 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Java implementation of the JavaScript Object Notation"
HOMEPAGE="https://github.com/douglascrockford/JSON-java";
SRC_URI="https://github.com/douglascrockford/JSON-java/archive/${PV}.zip ->
${P}.zip"
-LICENSE="BSD"
+
+LICENSE="JSON"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
[gentoo-commits] repo/gentoo:master commit in: dev-java/json/
commit: f98d214ea04a71402128894e577dc740e2fc8689
Author: Patrice Clement gentoo org>
AuthorDate: Sat Oct 13 22:04:09 2018 +
Commit: Patrice Clement gentoo org>
CommitDate: Sat Oct 13 22:04:09 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f98d214e
dev-java/json: update HOMEPAGE.
Closes: https://bugs.gentoo.org/668222
Signed-off-by: Patrice Clement gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.10
dev-java/json/json-20150729.ebuild | 4 ++--
dev-java/json/json-20160212.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-java/json/json-20150729.ebuild
b/dev-java/json/json-20150729.ebuild
index 5c65acbd6d3..6af44fe16da 100644
--- a/dev-java/json/json-20150729.ebuild
+++ b/dev-java/json/json-20150729.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc source"
inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Java implementation of the JavaScript Object Notation"
-HOMEPAGE="http://www.json.org/java/";
+HOMEPAGE="https://github.com/douglascrockford/JSON-java";
SRC_URI="https://github.com/douglascrockford/JSON-java/archive/${PV}.zip ->
${P}.zip"
LICENSE="BSD"
SLOT="0"
diff --git a/dev-java/json/json-20160212.ebuild
b/dev-java/json/json-20160212.ebuild
index db4c7252b88..09e93dc0828 100644
--- a/dev-java/json/json-20160212.ebuild
+++ b/dev-java/json/json-20160212.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc source"
inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Java implementation of the JavaScript Object Notation"
-HOMEPAGE="http://www.json.org/java/";
+HOMEPAGE="https://github.com/douglascrockford/JSON-java";
SRC_URI="https://github.com/douglascrockford/JSON-java/archive/${PV}.zip ->
${P}.zip"
LICENSE="BSD"
SLOT="0"
[gentoo-commits] repo/gentoo:master commit in: dev-java/json-simple/files/
commit: 55cfa83b79d42d2801480a3bbcacb7ce720adbfc
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Sat May 12 15:45:10 2018 +
Commit: James Le Cuirot gentoo org>
CommitDate: Sun May 13 09:38:15 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55cfa83b
dev-java/json-simple: remove unused patch(es)
Closes: https://github.com/gentoo/gentoo/pull/8377
...imple-1.1-extra-constructors-from-azureus.patch | 48 --
1 file changed, 48 deletions(-)
diff --git
a/dev-java/json-simple/files/json-simple-1.1-extra-constructors-from-azureus.patch
b/dev-java/json-simple/files/json-simple-1.1-extra-constructors-from-azureus.patch
deleted file mode 100644
index 5b45a973e41..000
---
a/dev-java/json-simple/files/json-simple-1.1-extra-constructors-from-azureus.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -Nur json_simple-1.1-all/src/org/json/simple/JSONArray.java
json_simple-1.1-all_patched//src/org/json/simple/JSONArray.java
json_simple-1.1-all/src/org/json/simple/JSONArray.java 2009-02-01
12:45:34.0 +0200
-+++ json_simple-1.1-all_patched//src/org/json/simple/JSONArray.java
2011-09-25 11:23:37.398818358 +0300
-@@ -19,6 +19,18 @@
- public class JSONArray extends ArrayList implements List, JSONAware,
JSONStreamAware {
- private static final long serialVersionUID = 3957988303675231981L;
-
-+ public JSONArray() {
-+ super();
-+ }
-+
-+ public JSONArray(java.util.Collection arg0) {
-+ super(arg0);
-+ }
-+
-+ public JSONArray(int initialCapacity) {
-+ super(initialCapacity);
-+ }
-+
- /**
- * Encode a list into JSON text and write it to out.
- * If this list is also a JSONStreamAware or a JSONAware, JSONStreamAware
and JSONAware specific behaviours will be ignored at this top level.
-diff -Nur json_simple-1.1-all/src/org/json/simple/JSONObject.java
json_simple-1.1-all_patched//src/org/json/simple/JSONObject.java
json_simple-1.1-all/src/org/json/simple/JSONObject.java2009-02-01
12:45:34.0 +0200
-+++ json_simple-1.1-all_patched//src/org/json/simple/JSONObject.java
2011-09-25 11:24:34.815103065 +0300
-@@ -18,6 +18,22 @@
- public class JSONObject extends HashMap implements Map, JSONAware,
JSONStreamAware{
- private static final long serialVersionUID = -503443796854799292L;
-
-+ public JSONObject() {
-+ super();
-+ }
-+
-+ public JSONObject(int initialCapacity, float loadFactor) {
-+ super(initialCapacity, loadFactor);
-+ }
-+
-+ public JSONObject(int initialCapacity) {
-+ super(initialCapacity);
-+ }
-+
-+ public JSONObject(Map arg0) {
-+ super(arg0);
-+ }
-+
- /**
- * Encode a map into JSON text and write it to out.
- * If this map is also a JSONAware or JSONStreamAware, JSONAware or
JSONStreamAware specific behaviours will be ignored at this top level.
[gentoo-commits] repo/gentoo:master commit in: dev-java/json-simple/
commit: 76253880c49513abaacac551e2943c82552408c1
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Wed May 2 10:15:18 2018 +
Commit: Patrice Clement gentoo org>
CommitDate: Fri May 4 20:49:05 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76253880
dev-java/json-simple: remove old>
dev-java/json-simple/Manifest | 1 -
dev-java/json-simple/json-simple-1.1.ebuild | 47 -
2 files changed, 48 deletions(-)
diff --git a/dev-java/json-simple/Manifest b/dev-java/json-simple/Manifest
index 69caaa7038e..2d05f995e39 100644
--- a/dev-java/json-simple/Manifest
+++ b/dev-java/json-simple/Manifest
@@ -1,2 +1 @@
DIST json-simple-1.1.tar.gz 22154 BLAKE2B
594717df45d56b4e70cee9aadca661a9da7e19c2a77e5ab2176396c48bdf061f25db0e4cbf5b93b12dc862dfca593a71dcd154f24c914a4d2ff510e3f4b11570
SHA512
f09cb298254a8f35b534670d6a1801eeaf58385529f459f413aed556df1ac577bea6e678a32065077abc851dc310b3af38b818f1737bd255f05e756d7e2da066
-DIST json_simple-1.1-all.zip 44814 BLAKE2B
09a1bf3213c6724d167a514c47e9a4084c217687633f075d0a1019be253d3b37e1a26c7e291570f73a5942c5d7e586d4a8ce78e938e755cb3d8150f82dd0306d
SHA512
02a5300456dbe2a1b5331b247ad964237d11d2281b35351f1f7bed6867eaf5bb6fb07ca1a50f87e30cd93221c5119e8b5f6f273357ab5fcfeda164ec119c0404
diff --git a/dev-java/json-simple/json-simple-1.1.ebuild
b/dev-java/json-simple/json-simple-1.1.ebuild
deleted file mode 100644
index 039d5734474..000
--- a/dev-java/json-simple/json-simple-1.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-JAVA_PKG_IUSE="source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Simple Java toolkit for JSON"
-HOMEPAGE="http://www.json.org";
-
-MY_PN="${PN/-/_}"
-MY_P="${MY_PN}-${PV}-all"
-SRC_URI="https://json-simple.googlecode.com/files/${MY_P}.zip";
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4
- test? ( dev-java/ant-junit )
- app-arch/unzip"
-RDEPEND=">=virtual/jre-1.4"
-
-S="${WORKDIR}/${MY_P}"
-
-java_prepare() {
- epatch "${FILESDIR}/${P}-extra-constructors-from-azureus.patch"
- rm -rv build lib || die
-}
-
-#JAVA_ANT_ENCODING="ISO-8859-1"
-#EANT_BUILD_TARGET="dist"
-
-JAVA_PKG_BSFIX_NAME+=" test.xml"
-
-src_test() {
- java-pkg_jar-from --into lib junit
- ANT_TASKS="ant-junit" eant -f test.xml
-}
-
-src_install() {
- java-pkg_newjar lib/${MY_P/-all/}.jar ${PN}.jar
- dodoc README.txt AUTHORS.txt ChangeLog.txt || die
- use source && java-pkg_dosrc src/org
-}
[gentoo-commits] repo/gentoo:master commit in: dev-java/json-simple/
commit: 0037345d4b7071d5b8832ffe89fa8d97c915bac4
Author: Patrice Clement gentoo org>
AuthorDate: Mon Apr 23 16:11:22 2018 +
Commit: Patrice Clement gentoo org>
CommitDate: Wed Apr 25 07:21:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0037345d
dev-java/json-simple: EAPI 6 bump.
Package-Manager: Portage-2.3.24, Repoman-2.3.6
dev-java/json-simple/Manifest | 1 +
dev-java/json-simple/json-simple-1.1-r1.ebuild | 30 ++
2 files changed, 31 insertions(+)
diff --git a/dev-java/json-simple/Manifest b/dev-java/json-simple/Manifest
index 38277ec68fd..69caaa7038e 100644
--- a/dev-java/json-simple/Manifest
+++ b/dev-java/json-simple/Manifest
@@ -1 +1,2 @@
+DIST json-simple-1.1.tar.gz 22154 BLAKE2B
594717df45d56b4e70cee9aadca661a9da7e19c2a77e5ab2176396c48bdf061f25db0e4cbf5b93b12dc862dfca593a71dcd154f24c914a4d2ff510e3f4b11570
SHA512
f09cb298254a8f35b534670d6a1801eeaf58385529f459f413aed556df1ac577bea6e678a32065077abc851dc310b3af38b818f1737bd255f05e756d7e2da066
DIST json_simple-1.1-all.zip 44814 BLAKE2B
09a1bf3213c6724d167a514c47e9a4084c217687633f075d0a1019be253d3b37e1a26c7e291570f73a5942c5d7e586d4a8ce78e938e755cb3d8150f82dd0306d
SHA512
02a5300456dbe2a1b5331b247ad964237d11d2281b35351f1f7bed6867eaf5bb6fb07ca1a50f87e30cd93221c5119e8b5f6f273357ab5fcfeda164ec119c0404
diff --git a/dev-java/json-simple/json-simple-1.1-r1.ebuild
b/dev-java/json-simple/json-simple-1.1-r1.ebuild
new file mode 100644
index 000..bc80ab3d7c3
--- /dev/null
+++ b/dev-java/json-simple/json-simple-1.1-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="source doc"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="tag_release_1_1_1"
+
+DESCRIPTION="Simple Java toolkit for JSON"
+HOMEPAGE="http://www.json.org";
+SRC_URI="https://github.com/fangyidong/json-simple/archive/${MY_P}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+JAVA_SRC_DIR="src/main"
+
+src_prepare() {
+ default
+ rm -rv src/test || die
+}
[gentoo-commits] repo/gentoo:master commit in: dev-java/json-simple/
commit: de690f834c2570a45746f1e739c16ae9ba84acff
Author: Patrice Clement gentoo org>
AuthorDate: Mon Apr 23 16:13:35 2018 +
Commit: Patrice Clement gentoo org>
CommitDate: Wed Apr 25 07:21:30 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de690f83
dev-java/json-simple: stable for all arches (ALLARCHES).
Package-Manager: Portage-2.3.24, Repoman-2.3.6
dev-java/json-simple/json-simple-1.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/json-simple/json-simple-1.1-r1.ebuild
b/dev-java/json-simple/json-simple-1.1-r1.ebuild
index bc80ab3d7c3..a91c4fbc828 100644
--- a/dev-java/json-simple/json-simple-1.1-r1.ebuild
+++ b/dev-java/json-simple/json-simple-1.1-r1.ebuild
@@ -15,7 +15,7 @@
SRC_URI="https://github.com/fangyidong/json-simple/archive/${MY_P}.tar.gz -> ${P
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
DEPEND=">=virtual/jdk-1.6"
RDEPEND=">=virtual/jre-1.6"
[gentoo-commits] repo/gentoo:master commit in: dev-java/json/
commit: 84de5875c639f463abfb51a801b7805558cc65a8
Author: James Le Cuirot gentoo org>
AuthorDate: Tue May 30 22:19:47 2017 +
Commit: James Le Cuirot gentoo org>
CommitDate: Tue May 30 22:19:47 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84de5875
dev-java/json: Fix distfile name, bug #619846
Package-Manager: Portage-2.3.6, Repoman-2.3.2
dev-java/json/Manifest | 4 ++--
dev-java/json/json-20150729.ebuild | 4 ++--
dev-java/json/json-20160212.ebuild | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest
index d8cccd96d16..3425aa5e99f 100644
--- a/dev-java/json/Manifest
+++ b/dev-java/json/Manifest
@@ -1,2 +1,2 @@
-DIST 20150729.zip 52114 SHA256
62ecc38b4b86a2d864123f1d68ec9e898e250ea2d4c0798fdff52ba79db52c38 SHA512
ad21ce236b9df04482e039e57a16edec4018214aa6e00379573dc7c6977062c759aa21084b70540d35656ebcdb5eaa6525defb88e281ee0e4e7277e32f22755c
WHIRLPOOL
393a81436e9441b7f0b6eeacf45323c306ffc623c15bb786c46431893318c128e4ab48b4ac610480897673ced33e7706a65a68107d42be0b58a65379db886624
-DIST 20160212.zip 52295 SHA256
3cdf14d879be05e2749edee7570d8747ce63df72312cb66cc51b37ab258ac5c2 SHA512
6648443c55f7e427e700a2bcb5cce8e4b796c42c0afb53a455dc847b0636f2e009171a39f96f0c317fdc1080ddc106dcd4c8066cfbd71091db3ad83bf7c0ae2c
WHIRLPOOL
03be8d2069f2653c596baaf82eeeffea45c94272961e9a62f8e04823840813e7a9284592e90d2e6e6bb8c9fbb31aea76229786495d5c0f997e53d9306ebd0047
+DIST json-20150729.zip 52114 SHA256
62ecc38b4b86a2d864123f1d68ec9e898e250ea2d4c0798fdff52ba79db52c38 SHA512
ad21ce236b9df04482e039e57a16edec4018214aa6e00379573dc7c6977062c759aa21084b70540d35656ebcdb5eaa6525defb88e281ee0e4e7277e32f22755c
WHIRLPOOL
393a81436e9441b7f0b6eeacf45323c306ffc623c15bb786c46431893318c128e4ab48b4ac610480897673ced33e7706a65a68107d42be0b58a65379db886624
+DIST json-20160212.zip 52295 SHA256
3cdf14d879be05e2749edee7570d8747ce63df72312cb66cc51b37ab258ac5c2 SHA512
6648443c55f7e427e700a2bcb5cce8e4b796c42c0afb53a455dc847b0636f2e009171a39f96f0c317fdc1080ddc106dcd4c8066cfbd71091db3ad83bf7c0ae2c
WHIRLPOOL
03be8d2069f2653c596baaf82eeeffea45c94272961e9a62f8e04823840813e7a9284592e90d2e6e6bb8c9fbb31aea76229786495d5c0f997e53d9306ebd0047
diff --git a/dev-java/json/json-20150729.ebuild
b/dev-java/json/json-20150729.ebuild
index 61ec8715621..5c65acbd6d3 100644
--- a/dev-java/json/json-20150729.ebuild
+++ b/dev-java/json/json-20150729.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -8,7 +8,7 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Java implementation of the JavaScript Object Notation"
HOMEPAGE="http://www.json.org/java/";
-SRC_URI="https://github.com/douglascrockford/JSON-java/archive/${PV}.zip";
+SRC_URI="https://github.com/douglascrockford/JSON-java/archive/${PV}.zip ->
${P}.zip"
LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 x86"
diff --git a/dev-java/json/json-20160212.ebuild
b/dev-java/json/json-20160212.ebuild
index c2ab4e318ae..db4c7252b88 100644
--- a/dev-java/json/json-20160212.ebuild
+++ b/dev-java/json/json-20160212.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -8,7 +8,7 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Java implementation of the JavaScript Object Notation"
HOMEPAGE="http://www.json.org/java/";
-SRC_URI="https://github.com/douglascrockford/JSON-java/archive/${PV}.zip";
+SRC_URI="https://github.com/douglascrockford/JSON-java/archive/${PV}.zip ->
${P}.zip"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
[gentoo-commits] repo/gentoo:master commit in: dev-java/json/
commit: a8750e252df1757c49f924cf9705b6136c1699d8
Author: Austin English gentoo org>
AuthorDate: Fri Oct 14 07:10:34 2016 +
Commit: Austin English gentoo org>
CommitDate: Fri Oct 14 07:11:09 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8750e25
dev-java/json: version bump - 20160212
Package-Manager: portage-2.3.0
dev-java/json/Manifest | 1 +
dev-java/json/json-20160212.ebuild | 33 +
2 files changed, 34 insertions(+)
diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest
index 00ca07f..d8cccd9 100644
--- a/dev-java/json/Manifest
+++ b/dev-java/json/Manifest
@@ -1 +1,2 @@
DIST 20150729.zip 52114 SHA256
62ecc38b4b86a2d864123f1d68ec9e898e250ea2d4c0798fdff52ba79db52c38 SHA512
ad21ce236b9df04482e039e57a16edec4018214aa6e00379573dc7c6977062c759aa21084b70540d35656ebcdb5eaa6525defb88e281ee0e4e7277e32f22755c
WHIRLPOOL
393a81436e9441b7f0b6eeacf45323c306ffc623c15bb786c46431893318c128e4ab48b4ac610480897673ced33e7706a65a68107d42be0b58a65379db886624
+DIST 20160212.zip 52295 SHA256
3cdf14d879be05e2749edee7570d8747ce63df72312cb66cc51b37ab258ac5c2 SHA512
6648443c55f7e427e700a2bcb5cce8e4b796c42c0afb53a455dc847b0636f2e009171a39f96f0c317fdc1080ddc106dcd4c8066cfbd71091db3ad83bf7c0ae2c
WHIRLPOOL
03be8d2069f2653c596baaf82eeeffea45c94272961e9a62f8e04823840813e7a9284592e90d2e6e6bb8c9fbb31aea76229786495d5c0f997e53d9306ebd0047
diff --git a/dev-java/json/json-20160212.ebuild
b/dev-java/json/json-20160212.ebuild
new file mode 100644
index ..f3193e5
--- /dev/null
+++ b/dev-java/json/json-20160212.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java implementation of the JavaScript Object Notation"
+HOMEPAGE="http://www.json.org/java/";
+SRC_URI="https://github.com/douglascrockford/JSON-java/archive/${PV}.zip";
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/JSON-java-${PV}"
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+ chmod a-x *.java || die
+ mkdir -p src || die
+ mv *.java src || die
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ dodoc README
+}
[gentoo-commits] repo/gentoo:master commit in: dev-java/json-simple/files/
commit: 6c2017b332d278e2d47ee68beddba4d88f794d39 Author: Michael Mair-Keimberger (asterix) gmail com> AuthorDate: Wed Aug 3 19:01:49 2016 + Commit: James Le Cuirot gentoo org> CommitDate: Fri Aug 5 16:37:48 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c2017b3 dev-java/json-simple: remove unused file dev-java/json-simple/files/build.xml | 49 1 file changed, 49 deletions(-) diff --git a/dev-java/json-simple/files/build.xml b/dev-java/json-simple/files/build.xml deleted file mode 100644 index 9157aa4..000 --- a/dev-java/json-simple/files/build.xml +++ /dev/null @@ -1,49 +0,0 @@ - - -simple example build file - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
[gentoo-commits] repo/gentoo:master commit in: dev-java/json/
commit: 2a347c7e055fce36c56423a7b8a3f5a8b6bf Author: Peter Foley pefoley com> AuthorDate: Tue Mar 1 22:31:16 2016 + Commit: Ian Delaney gentoo org> CommitDate: Tue Mar 1 22:31:16 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a347c7e dev-java/json: fix SYSTEM url in metadata.xml Package-Manager: portage-2.2.27 dev-java/json/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/json/metadata.xml b/dev-java/json/metadata.xml index ed6abb8..8ec4071 100644 --- a/dev-java/json/metadata.xml +++ b/dev-java/json/metadata.xml @@ -1,5 +1,5 @@ -https://www.gentoo.org/dtd/metadata.dtd";> +http://www.gentoo.org/dtd/metadata.dtd";> JSON (JavaScript Object Notation) is a lightweight data-interchange format.
[gentoo-commits] repo/gentoo:master commit in: dev-java/json/
commit: 3655adbc745713ef555622da8b013e824dba5bec Author: James Le Cuirot gentoo org> AuthorDate: Sat Feb 20 14:54:14 2016 + Commit: James Le Cuirot gentoo org> CommitDate: Sat Feb 20 14:54:42 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3655adbc dev-java/json: Remove pointless maintainer entries Package-Manager: portage-2.2.27 dev-java/json/metadata.xml | 8 +--- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dev-java/json/metadata.xml b/dev-java/json/metadata.xml index 925cb10..ed6abb8 100644 --- a/dev-java/json/metadata.xml +++ b/dev-java/json/metadata.xml @@ -7,13 +7,7 @@ douglascrockford/JSON-java - - ch...@gentoo.org - - - monsie...@gentoo.org - - + j...@gentoo.org Java
[gentoo-commits] repo/gentoo:master commit in: dev-java/json/
commit: dfe1c5f0cbabb874a2daaac2380929be8354e40a
Author: Patrice Clement gentoo org>
AuthorDate: Mon Dec 7 07:56:57 2015 +
Commit: Patrice Clement gentoo org>
CommitDate: Mon Dec 7 10:10:26 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfe1c5f0
dev-java/json: Stable for amd64. Stable for x86 using the ALLARCHES policy.
Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement gentoo.org>
dev-java/json/json-20150729.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/json/json-20150729.ebuild
b/dev-java/json/json-20150729.ebuild
index 6e33966..1324c46 100644
--- a/dev-java/json/json-20150729.ebuild
+++ b/dev-java/json/json-20150729.ebuild
@@ -12,8 +12,8 @@ HOMEPAGE="http://www.json.org/java/";
SRC_URI="https://github.com/douglascrockford/JSON-java/archive/${PV}.zip";
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
+KEYWORDS="amd64 x86"
+IUSE=""
DEPEND=">=virtual/jdk-1.7"
RDEPEND=">=virtual/jre-1.7"
[gentoo-commits] repo/gentoo:master commit in: dev-java/json/
commit: 809fddc0508d6584f6626c35ef4bea8309f0a1c8
Author: Patrice Clement gentoo org>
AuthorDate: Tue Oct 20 08:23:37 2015 +
Commit: Patrice Clement gentoo org>
CommitDate: Tue Oct 20 08:24:21 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=809fddc0
dev-java/json: Initial import. Fixes bug 161720.
Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement gentoo.org>
dev-java/json/Manifest | 1 +
dev-java/json/json-20150729.ebuild | 33 +
dev-java/json/metadata.xml | 17 +
3 files changed, 51 insertions(+)
diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest
new file mode 100644
index 000..00ca07f
--- /dev/null
+++ b/dev-java/json/Manifest
@@ -0,0 +1 @@
+DIST 20150729.zip 52114 SHA256
62ecc38b4b86a2d864123f1d68ec9e898e250ea2d4c0798fdff52ba79db52c38 SHA512
ad21ce236b9df04482e039e57a16edec4018214aa6e00379573dc7c6977062c759aa21084b70540d35656ebcdb5eaa6525defb88e281ee0e4e7277e32f22755c
WHIRLPOOL
393a81436e9441b7f0b6eeacf45323c306ffc623c15bb786c46431893318c128e4ab48b4ac610480897673ced33e7706a65a68107d42be0b58a65379db886624
diff --git a/dev-java/json/json-20150729.ebuild
b/dev-java/json/json-20150729.ebuild
new file mode 100644
index 000..6e33966
--- /dev/null
+++ b/dev-java/json/json-20150729.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java implementation of the JavaScript Object Notation"
+HOMEPAGE="http://www.json.org/java/";
+SRC_URI="https://github.com/douglascrockford/JSON-java/archive/${PV}.zip";
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/JSON-java-${PV}"
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+ chmod a-x *.java || die
+ mkdir -p src || die
+ mv *.java src || die
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ dodoc README || die
+}
diff --git a/dev-java/json/metadata.xml b/dev-java/json/metadata.xml
new file mode 100644
index 000..d9dd049
--- /dev/null
+++ b/dev-java/json/metadata.xml
@@ -0,0 +1,17 @@
+
+https://www.gentoo.org/dtd/metadata.dtd";>
+
+ java
+
+ JSON (JavaScript Object Notation) is a lightweight
data-interchange format.
+
+
+ douglascrockford/JSON-java
+
+
+ ch...@gentoo.org
+
+
+ monsie...@gentoo.org
+
+
