* [gentoo-commits] repo/gentoo:master commit in: dev-java/scram/
@ 2022-06-20 7:41 Florian Schmaus
0 siblings, 0 replies; 7+ messages in thread
From: Florian Schmaus @ 2022-06-20 7:41 UTC (permalink / raw
To: gentoo-commits
commit: a7cbb74c1a726e9d658630eb780ce1254102c9cc
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Wed Jun 15 11:11:31 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon Jun 20 06:49:25 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7cbb74c
dev-java/scram: new package, add 2.1
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
dev-java/scram/Manifest | 1 +
dev-java/scram/metadata.xml | 7 +++
dev-java/scram/scram-2.1.ebuild | 104 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 112 insertions(+)
diff --git a/dev-java/scram/Manifest b/dev-java/scram/Manifest
new file mode 100644
index 000000000000..42494f4d9f77
--- /dev/null
+++ b/dev-java/scram/Manifest
@@ -0,0 +1 @@
+DIST scram-2.1.tar.gz 64263 BLAKE2B 59b71ee0faa32d2478e38e4275b7c83efb3f7a3ede0c068a8c0a6fe970248d22b539c50b97127b1b757839758d119b395fedd85d85425bd019e0972c2df20ef4 SHA512 e0757b306db03c56f03fa0907e46693337854c152a321cae1b109a1c16b0cb5be2482a92d64a420432a3ea31371990cbac444f965abde89c04083005b30012ef
diff --git a/dev-java/scram/metadata.xml b/dev-java/scram/metadata.xml
new file mode 100644
index 000000000000..75321cfb5598
--- /dev/null
+++ b/dev-java/scram/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-java/scram/scram-2.1.ebuild b/dev-java/scram/scram-2.1.ebuild
new file mode 100644
index 000000000000..a3af5e23f1dd
--- /dev/null
+++ b/dev-java/scram/scram-2.1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom common/pom.xml --download-uri https://gitlab.com/ongresinc/scram/-/archive/2.1/scram-2.1.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild scram-2.1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.ongres.scram:common:2.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java Implementation of the Salted Challenge Response Authentication Mechanism"
+HOMEPAGE="https://gitlab.com/ongresinc/scram"
+SRC_URI="https://gitlab.com/ongresinc/${PN}/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+# Common dependencies
+# POM: common/pom.xml
+# com.ongres.stringprep:saslprep:1.1 -> >=dev-java/stringprep-2.0:0
+
+CP_DEPEND="
+ dev-java/saslprep:0
+"
+
+# Compile dependencies
+# POM: common/pom.xml
+# com.google.code.findbugs:annotations:3.0.1 -> !!!artifactId-not-found!!!
+# com.google.code.findbugs:jsr305:3.0.1 -> >=dev-java/jsr305-3.0.2:0
+# POM: common/pom.xml
+# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ ${CP_DEPEND}
+ dev-java/findbugs-annotations:0
+ dev-java/jsr305:0
+ test? ( dev-java/stringprep:0 )
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}"
+
+DOCS=( CHANGELOG NOTICE README.md )
+
+S="${WORKDIR}/${P}"
+
+JAVA_CLASSPATH_EXTRA="findbugs-annotations,jsr305"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,stringprep"
+
+src_compile() {
+ einfo "Compiling module common"
+ JAVA_SRC_DIR="common/src/main/java"
+ JAVA_JAR_FILENAME="common.jar"
+ java-pkg-simple_src_compile
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":common.jar"
+ rm -r target || die
+
+ einfo "Compiling module client"
+ JAVA_SRC_DIR="client/src/main/java"
+ JAVA_JAR_FILENAME="client.jar"
+ java-pkg-simple_src_compile
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":client.jar"
+ rm -r target || die
+
+ if use doc; then
+ einfo "Compiling javadocs"
+ JAVA_SRC_DIR=(
+ "common/src/main/java"
+ "client/src/main/java"
+ )
+ JAVA_JAR_FILENAME="ignoreme.jar"
+ java-pkg-simple_src_compile
+ fi
+}
+
+src_test() {
+ einfo "Testing module common"
+ JAVA_TEST_SRC_DIR="common/src/test/java"
+ java-pkg-simple_src_test
+
+ einfo "Testing module cwclientcommon"
+ JAVA_TEST_SRC_DIR="client/src/test/java"
+ java-pkg-simple_src_test
+}
+
+src_install() {
+ default
+ java-pkg_dojar "common.jar"
+ java-pkg_dojar "client.jar"
+ if use doc; then
+ java-pkg_dojavadoc target/api
+ fi
+ if use source; then
+ java-pkg_dosrc "common/src/main/java/*"
+ java-pkg_dosrc "client/src/main/java/*"
+ fi
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/scram/
@ 2022-07-25 4:19 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2022-07-25 4:19 UTC (permalink / raw
To: gentoo-commits
commit: a960cfdf519177d3ae9b9a69795e3f35a5d2d086
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 25 04:18:23 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 25 04:18:23 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a960cfdf
dev-java/scram: Stabilize 2.1 ppc64, #859361
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/scram/scram-2.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/scram/scram-2.1.ebuild b/dev-java/scram/scram-2.1.ebuild
index f43f944a27e0..0595dcc0736d 100644
--- a/dev-java/scram/scram-2.1.ebuild
+++ b/dev-java/scram/scram-2.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://gitlab.com/ongresinc/${PN}/-/archive/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64 x86"
+KEYWORDS="~amd64 ppc64 x86"
# Common dependencies
# POM: common/pom.xml
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/scram/
@ 2022-07-28 7:06 Agostino Sarubbo
0 siblings, 0 replies; 7+ messages in thread
From: Agostino Sarubbo @ 2022-07-28 7:06 UTC (permalink / raw
To: gentoo-commits
commit: 558ef21322f06d77993ee7170c8e447d49362f7c
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 28 07:06:00 2022 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Jul 28 07:06:00 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=558ef213
dev-java/scram: amd64 stable wrt bug #859361
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
dev-java/scram/scram-2.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/scram/scram-2.1.ebuild b/dev-java/scram/scram-2.1.ebuild
index 0595dcc0736d..c944a40da08f 100644
--- a/dev-java/scram/scram-2.1.ebuild
+++ b/dev-java/scram/scram-2.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://gitlab.com/ongresinc/${PN}/-/archive/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
# Common dependencies
# POM: common/pom.xml
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/scram/
@ 2022-09-17 12:47 Florian Schmaus
0 siblings, 0 replies; 7+ messages in thread
From: Florian Schmaus @ 2022-09-17 12:47 UTC (permalink / raw
To: gentoo-commits
commit: e0c6279f932fcc2c0fda87afea4ed7baf50f2eea
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Aug 23 06:17:39 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sat Sep 17 12:47:16 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0c6279f
dev-java/scram: adjust MAVEN_ID
java-ebuilder did not find it for dev-java/jdbc-postgresql
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
dev-java/scram/scram-2.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/scram/scram-2.1.ebuild b/dev-java/scram/scram-2.1.ebuild
index c944a40da08f..c29fd451b086 100644
--- a/dev-java/scram/scram-2.1.ebuild
+++ b/dev-java/scram/scram-2.1.ebuild
@@ -7,7 +7,7 @@
EAPI=8
JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.ongres.scram:common:2.1"
+MAVEN_ID="com.ongres.scram:client:2.1"
JAVA_TESTING_FRAMEWORKS="junit-4"
inherit java-pkg-2 java-pkg-simple
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/scram/
@ 2024-02-06 9:34 Miroslav Šulc
0 siblings, 0 replies; 7+ messages in thread
From: Miroslav Šulc @ 2024-02-06 9:34 UTC (permalink / raw
To: gentoo-commits
commit: b4dbcf91085d19baffd30881776aadd2d973f7cc
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Feb 5 16:04:11 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Feb 6 09:33:55 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4dbcf91
dev-java/scram: fix test compile errors
Closes: https://bugs.gentoo.org/923827
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/scram/scram-2.1.ebuild | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/dev-java/scram/scram-2.1.ebuild b/dev-java/scram/scram-2.1.ebuild
index c29fd451b086..b533f76dcbb3 100644
--- a/dev-java/scram/scram-2.1.ebuild
+++ b/dev-java/scram/scram-2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
@@ -81,9 +81,7 @@ src_compile() {
}
src_test() {
- einfo "Testing module common"
- JAVA_TEST_SRC_DIR="common/src/test/java"
- java-pkg-simple_src_test
+ cp -r {common,client}/src/test/java || die
einfo "Testing module cwclientcommon"
JAVA_TEST_SRC_DIR="client/src/test/java"
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/scram/
@ 2024-02-06 9:34 Miroslav Šulc
0 siblings, 0 replies; 7+ messages in thread
From: Miroslav Šulc @ 2024-02-06 9:34 UTC (permalink / raw
To: gentoo-commits
commit: 55c64cf5baa028cc91202d93efec400cc8dbce17
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Feb 5 16:07:45 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Feb 6 09:33:55 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55c64cf5
dev-java/scram: code cleanup
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/scram/Manifest | 2 +-
dev-java/scram/scram-2.1.ebuild | 57 +++++++++++++----------------------------
2 files changed, 19 insertions(+), 40 deletions(-)
diff --git a/dev-java/scram/Manifest b/dev-java/scram/Manifest
index 42494f4d9f77..5ba3c94824d5 100644
--- a/dev-java/scram/Manifest
+++ b/dev-java/scram/Manifest
@@ -1 +1 @@
-DIST scram-2.1.tar.gz 64263 BLAKE2B 59b71ee0faa32d2478e38e4275b7c83efb3f7a3ede0c068a8c0a6fe970248d22b539c50b97127b1b757839758d119b395fedd85d85425bd019e0972c2df20ef4 SHA512 e0757b306db03c56f03fa0907e46693337854c152a321cae1b109a1c16b0cb5be2482a92d64a420432a3ea31371990cbac444f965abde89c04083005b30012ef
+DIST scram-2.1.tar.bz2 52442 BLAKE2B e9ec2367251770c4adb3d4bf62702c8ca13264fd12270dfb4f138c740536eb508a383486a81e1ab2bb0f8d4792642d033180c0e43ac287917543249fd16c8a76 SHA512 e2807d2c4b7984b5d9f53cb5ea6f9b2c2d5b48b5e695f25fb775cb3f22672851a9299cfe95912f109205c74817cf9f2fd706f8d49e473257e2571f409ec34044
diff --git a/dev-java/scram/scram-2.1.ebuild b/dev-java/scram/scram-2.1.ebuild
index b533f76dcbb3..6e7eeccf9430 100644
--- a/dev-java/scram/scram-2.1.ebuild
+++ b/dev-java/scram/scram-2.1.ebuild
@@ -1,9 +1,6 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom common/pom.xml --download-uri https://gitlab.com/ongresinc/scram/-/archive/2.1/scram-2.1.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild scram-2.1.ebuild
-
EAPI=8
JAVA_PKG_IUSE="doc source test"
@@ -14,43 +11,36 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Java Implementation of the Salted Challenge Response Authentication Mechanism"
HOMEPAGE="https://gitlab.com/ongresinc/scram"
-SRC_URI="https://gitlab.com/ongresinc/${PN}/-/archive/${PV}/${P}.tar.gz"
+SRC_URI="https://gitlab.com/ongresinc/${PN}/-/archive/${PV}/${P}.tar.bz2"
+S="${WORKDIR}/${P}"
LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 ppc64 x86"
-# Common dependencies
-# POM: common/pom.xml
-# com.ongres.stringprep:saslprep:1.1 -> >=dev-java/stringprep-2.0:0
-
-CP_DEPEND="
- dev-java/saslprep:0
-"
+CP_DEPEND="dev-java/saslprep:0"
-# Compile dependencies
-# POM: common/pom.xml
-# com.google.code.findbugs:annotations:3.0.1 -> !!!artifactId-not-found!!!
-# com.google.code.findbugs:jsr305:3.0.1 -> >=dev-java/jsr305-3.0.2:0
-# POM: common/pom.xml
-# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4
-
-DEPEND="
- >=virtual/jdk-1.8:*
- ${CP_DEPEND}
+DEPEND="${CP_DEPEND}
dev-java/findbugs-annotations:0
dev-java/jsr305:0
+ >=virtual/jdk-1.8:*
test? ( dev-java/stringprep:0 )
"
-RDEPEND="
+RDEPEND="${CP_DEPEND}
>=virtual/jre-1.8:*
- ${CP_DEPEND}"
+"
DOCS=( CHANGELOG NOTICE README.md )
-S="${WORKDIR}/${P}"
-
+JAVADOC_CLASSPATH="
+ findbugs-annotations
+ saslprep
+"
+JAVADOC_SRC_DIRS=(
+ "common/src/main/java"
+ "client/src/main/java"
+)
JAVA_CLASSPATH_EXTRA="findbugs-annotations,jsr305"
JAVA_TEST_GENTOO_CLASSPATH="junit-4,stringprep"
@@ -69,15 +59,7 @@ src_compile() {
JAVA_GENTOO_CLASSPATH_EXTRA+=":client.jar"
rm -r target || die
- if use doc; then
- einfo "Compiling javadocs"
- JAVA_SRC_DIR=(
- "common/src/main/java"
- "client/src/main/java"
- )
- JAVA_JAR_FILENAME="ignoreme.jar"
- java-pkg-simple_src_compile
- fi
+ use doc && ejavadoc
}
src_test() {
@@ -89,12 +71,9 @@ src_test() {
}
src_install() {
- default
+ JAVA_JAR_FILENAME="client.jar"
+ java-pkg-simple_src_install
java-pkg_dojar "common.jar"
- java-pkg_dojar "client.jar"
- if use doc; then
- java-pkg_dojavadoc target/api
- fi
if use source; then
java-pkg_dosrc "common/src/main/java/*"
java-pkg_dosrc "client/src/main/java/*"
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/scram/
@ 2024-02-06 9:34 Miroslav Šulc
0 siblings, 0 replies; 7+ messages in thread
From: Miroslav Šulc @ 2024-02-06 9:34 UTC (permalink / raw
To: gentoo-commits
commit: 536fe0e6d0480ef8aa9cccb444cf696801af3c86
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Feb 5 16:15:09 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Feb 6 09:33:55 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=536fe0e6
dev-java/scram: add gitlab upstream metadata
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/35192
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/scram/metadata.xml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/dev-java/scram/metadata.xml b/dev-java/scram/metadata.xml
index 75321cfb5598..0feb6155dbc1 100644
--- a/dev-java/scram/metadata.xml
+++ b/dev-java/scram/metadata.xml
@@ -4,4 +4,7 @@
<maintainer type="project">
<email>java@gentoo.org</email>
</maintainer>
+ <upstream>
+ <remote-id type="gitlab">ongresinc/scram</remote-id>
+ </upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-02-06 9:34 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-20 7:41 [gentoo-commits] repo/gentoo:master commit in: dev-java/scram/ Florian Schmaus
-- strict thread matches above, loose matches on Subject: below --
2022-07-25 4:19 Sam James
2022-07-28 7:06 Agostino Sarubbo
2022-09-17 12:47 Florian Schmaus
2024-02-06 9:34 Miroslav Šulc
2024-02-06 9:34 Miroslav Šulc
2024-02-06 9:34 Miroslav Šulc
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox