* [gentoo-commits] repo/gentoo:master commit in: dev-java/velocity/
@ 2021-05-18 18:04 Miroslav Šulc
0 siblings, 0 replies; 27+ messages in thread
From: Miroslav Šulc @ 2021-05-18 18:04 UTC (permalink / raw
To: gentoo-commits
commit: 2c78da96b1afc9c1374508c38bd32514273d1e8d
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue May 18 18:03:45 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue May 18 18:03:45 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c78da96
dev-java/velocity: removed obsolete and vulnerable 1.7-r2
Bug: https://bugs.gentoo.org/775248
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/velocity/Manifest | 1 -
dev-java/velocity/velocity-1.7-r2.ebuild | 67 --------------------------------
2 files changed, 68 deletions(-)
diff --git a/dev-java/velocity/Manifest b/dev-java/velocity/Manifest
index 2728c27d189..7b243dc27a9 100644
--- a/dev-java/velocity/Manifest
+++ b/dev-java/velocity/Manifest
@@ -1,2 +1 @@
-DIST velocity-1.7.tar.gz 5882643 BLAKE2B 4c1499bb015fe1c6b87257a60d247b1b0fb8558e6f879a3d04cf9ef0561ed69b89491c9ebba55cc54d14f6d377b300ee0f7e55ae4118236bba60dc632b5686b3 SHA512 542c9cc0efa118693bf1c952ac4b0c7c3d0229ef804afaa4f0f1c01ad40b0112055c21df7f800c302bf173d58461a864b29b9bc4b9174029d9748f88f2fcf9ab
DIST velocity-2.3.tar.gz 443754 BLAKE2B 16b7aaa87eb6be899f40d09ee8aa50b2ac24dd59c33f29b944d46ea84a77de07cd69f344632b4b829b92a92fe6ccd75cf79e021787b2ca59a79040aa08a53eed SHA512 987f2991a96fa8fae43ff2f72d6a57b25b1cb7d98b7def7a1a6e9a308c8b5b86e394444c47ee0eca8b70d41b341759c7309404dc4b952dbc65fc3a5b92d46cdb
diff --git a/dev-java/velocity/velocity-1.7-r2.ebuild b/dev-java/velocity/velocity-1.7-r2.ebuild
deleted file mode 100644
index facc1a8d7f5..00000000000
--- a/dev-java/velocity/velocity-1.7-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="examples doc source"
-MAVEN_ID="org.apache.velocity:velocity:1.7"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java framework for easy creation/rendering of documents"
-HOMEPAGE="http://velocity.apache.org"
-SRC_URI="mirror://apache/${PN}/engine/${PV}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-CDEPEND="
- dev-java/jdom:0
- dev-java/log4j:0
- dev-java/ant-core:0
- dev-java/werken-xpath:0
- dev-java/jakarta-oro:2.0
- dev-java/avalon-logkit:2.0
- dev-java/commons-lang:2.1
- dev-java/commons-logging:0
- dev-java/commons-collections:0
- java-virtuals/servlet-api:2.3
-"
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.6
-"
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.6"
-
-JAVA_GENTOO_CLASSPATH="
- jdom
- log4j
- ant-core
- werken-xpath
- jakarta-oro-2.0
- servlet-api-2.3
- commons-logging
- commons-lang-2.1
- avalon-logkit-2.0
- commons-collections
-"
-
-JAVA_SRC_DIR="src"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}"
-
-java_prepare() {
- java-pkg_clean
- rm -rv test src/test || die
-}
-
-src_install() {
- java-pkg-simple_src_install
- use examples && java-pkg_doexamples examples
-}
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/velocity/
@ 2024-11-05 10:47 Florian Schmaus
0 siblings, 0 replies; 27+ messages in thread
From: Florian Schmaus @ 2024-11-05 10:47 UTC (permalink / raw
To: gentoo-commits
commit: 0465cfd9155461e1e99b122fcdfded0bb7607844
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sun Nov 3 09:12:38 2024 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Nov 5 10:46:49 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0465cfd9
dev-java/velocity: add 2.4.1
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
dev-java/velocity/Manifest | 1 +
dev-java/velocity/velocity-2.4.1.ebuild | 113 ++++++++++++++++++++++++++++++++
2 files changed, 114 insertions(+)
diff --git a/dev-java/velocity/Manifest b/dev-java/velocity/Manifest
index dfd5c8305a30..f30870a05ae7 100644
--- a/dev-java/velocity/Manifest
+++ b/dev-java/velocity/Manifest
@@ -1,2 +1,3 @@
DIST velocity-2.3_p20240314.tar.gz 440967 BLAKE2B c5fcea7af49d6c46d5c0943efe82f3c04d921afc2c53201b97842ae71714e7035d075c147b3bea71e959db12dd970b7879ade73bbc23bab09a1fd262e21f2fc6 SHA512 9055e780d2a3c798bfe30e5c7859a7311c4984b551d7b2ffa68c57c076549326d0ddae31eabff8009ea021c749331d34c71eee8cab55599dea5f3c8dba841a02
+DIST velocity-2.4.1.tar.gz 445671 BLAKE2B 3a142303bd7bb1a6e012b9d33f96078fa925249bd62287e166e45faca7ad605b1b57f8f72b4829d009e4c11f54780727d919a96bcc081d83c26adf0a61eaecaa SHA512 3e821eaeb705e6ede8a51a8d3bff00d26909c20738bed92f5ef9600f3736709324807f7bbb93f5d431e60380b9a4f757f47cca6ec64e8e774c7ec1e4708d25f1
DIST velocity-2.4.tar.gz 444952 BLAKE2B 0db598bad6743383e62e89acc55b887f28108b6065c3e615b78485e4f94c9f1a316bff7c04d66052541d6173311e97dab28142dad69e6caca168b2a2fcc28637 SHA512 b3f7ae68fa2e0f30193f089a2e8ee5366e71726d93e85fa2f4c3f95d20aa599df053ee7103c71b01c89fe08dd5276e5a2c7da3e26eaffeafd94c078241a9e264
diff --git a/dev-java/velocity/velocity-2.4.1.ebuild b/dev-java/velocity/velocity-2.4.1.ebuild
new file mode 100644
index 000000000000..a2dc2a871796
--- /dev/null
+++ b/dev-java/velocity/velocity-2.4.1.ebuild
@@ -0,0 +1,113 @@
+# 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.apache.velocity:velocity-engine-core:2.4.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Apache Velocity is a general purpose template engine"
+HOMEPAGE="https://velocity.apache.org"
+SRC_URI="https://github.com/apache/${PN}-engine/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-engine-${PV}/${PN}-engine-core"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+CP_DEPEND="
+ dev-java/commons-lang:3.6
+ dev-java/slf4j-api:0
+"
+
+DEPEND="
+ ${CP_DEPEND}
+ >=dev-java/commons-io-2.17.0:1
+ >=virtual/jdk-1.8:*
+ test? (
+ >=dev-db/hsqldb-2.4.1:0
+ dev-java/slf4j-simple:0
+ )
+"
+
+RDEPEND="
+ ${CP_DEPEND}
+ >=virtual/jre-1.8:*
+"
+
+JAVACC_SLOT="7.0.13"
+BDEPEND="dev-java/javacc:${JAVACC_SLOT}"
+
+JAVA_CLASSPATH_EXTRA="commons-io-1"
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_EXTRA_ARGS="-Dtest.compare.dir=target/test-classes -Dtest.result.dir=results"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,hsqldb,slf4j-simple"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+ java-pkg-2_src_prepare
+
+ cp -r src/main/{,resources/org/apache/velocity/runtime}/parser || die
+
+ sed -e "s/\${project.version}/${PV}/" \
+ src/main/java-templates/org/apache/velocity/runtime/VelocityEngineVersion.java > \
+ src/main/java/org/apache/velocity/runtime/VelocityEngineVersion.java || die
+
+ sed -i \
+ -e 's/\${parser.basename}/Standard/g' \
+ -e 's/\${parser.package}/org.apache.velocity.runtime.parser/g' \
+ -e 's/\${parser.char.asterisk}/\*/g' \
+ -e 's/\${parser.char.at}/\@/g' \
+ -e 's/\${parser.char.dollar}/\$/g' \
+ -e 's/\${parser.char.hash}/\#/g' \
+ "${S}/src/main/parser/Parser.jjt" || die
+
+ # File "StandardParserTreeConstants.java" does not exist. Will create one.
+ # File "StandardParserVisitor.java" does not exist. Will create one.
+ # File "JJTStandardParserState.java" does not exist. Will create one.
+ "jjtree-${JAVACC_SLOT}" -GRAMMAR_ENCODING=UTF-8 \
+ -JDK_VERSION=1.8 \
+ -BUILD_NODE_FILES=false \
+ -MULTI=true \
+ -NODE_PACKAGE=org.apache.velocity.runtime.parser.node \
+ -NODE_USES_PARSER=true \
+ -STATIC=false \
+ -OUTPUT_DIRECTORY="${JAVA_SRC_DIR}/org/apache/velocity/runtime/parser/node" \
+ "${S}/src/main/parser/Parser.jjt" \
+ || die "Code generation via jjtree failed"
+
+ "javacc-${JAVACC_SLOT}" -GRAMMAR_ENCODING=UTF-8 \
+ -JDK_VERSION=1.8 \
+ -STATIC=false \
+ -DEBUG_PARSER=false \
+ -DEBUG_LOOKAHEAD=false \
+ -DEBUG_TOKEN_MANAGER=false \
+ -BUILD_PARSER=true \
+ -TOKEN_MANAGER_USES_PARSER=true \
+ -OUTPUT_DIRECTORY="${JAVA_SRC_DIR}" \
+ "${JAVA_SRC_DIR}/org/apache/velocity/runtime/parser/node/Parser.jj" \
+ || die "Parser.java code generation via javacc failed"
+
+ # Avoid "error: duplicate class: org.apache.velocity.runtime.parser...."
+ rm -v "${JAVA_SRC_DIR}/CharStream.java" || die "cannot remove 'CharStream.java'"
+ rm -v "${JAVA_SRC_DIR}/ParseException.java" || die "cannot remove 'ParseException.java'"
+}
+
+src_test() {
+ pushd src/test/java || die
+ # DataSourceResourceLoaderTestCase.java requires configured jdbc
+ local JAVA_TEST_RUN_ONLY=$(find * \
+ -name "*TestCase.java" \
+ ! -name "BaseTestCase.java" \
+ ! -name "DataSourceResourceLoaderTestCase.java" \
+ )
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+ popd
+ java-pkg-simple_src_test
+}
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/velocity/
@ 2024-11-05 10:47 Florian Schmaus
0 siblings, 0 replies; 27+ messages in thread
From: Florian Schmaus @ 2024-11-05 10:47 UTC (permalink / raw
To: gentoo-commits
commit: ac3ad9328f8a657db98247515c4acfdc5f396368
Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 5 10:45:13 2024 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Nov 5 10:46:52 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac3ad932
dev-java/velocity: add missing die to popd, redirect stdout of (push|pop)d
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
dev-java/velocity/velocity-2.3_p20240314.ebuild | 4 ++--
dev-java/velocity/velocity-2.4.1.ebuild | 4 ++--
dev-java/velocity/velocity-2.4.ebuild | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dev-java/velocity/velocity-2.3_p20240314.ebuild b/dev-java/velocity/velocity-2.3_p20240314.ebuild
index 2288fd91a1a5..03a0be67f16f 100644
--- a/dev-java/velocity/velocity-2.3_p20240314.ebuild
+++ b/dev-java/velocity/velocity-2.3_p20240314.ebuild
@@ -94,7 +94,7 @@ src_prepare() {
}
src_test() {
- pushd src/test/java || die
+ pushd src/test/java > /dev/null || die
# DataSourceResourceLoaderTestCase.java requires configured jdbc
local JAVA_TEST_RUN_ONLY=$(find * \
-name "*TestCase.java" \
@@ -103,6 +103,6 @@ src_test() {
)
JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
- popd
+ popd > /dev/null || die
java-pkg-simple_src_test
}
diff --git a/dev-java/velocity/velocity-2.4.1.ebuild b/dev-java/velocity/velocity-2.4.1.ebuild
index a2dc2a871796..b674930844e6 100644
--- a/dev-java/velocity/velocity-2.4.1.ebuild
+++ b/dev-java/velocity/velocity-2.4.1.ebuild
@@ -99,7 +99,7 @@ src_prepare() {
}
src_test() {
- pushd src/test/java || die
+ pushd src/test/java > /dev/null || die
# DataSourceResourceLoaderTestCase.java requires configured jdbc
local JAVA_TEST_RUN_ONLY=$(find * \
-name "*TestCase.java" \
@@ -108,6 +108,6 @@ src_test() {
)
JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
- popd
+ popd > /dev/null || die
java-pkg-simple_src_test
}
diff --git a/dev-java/velocity/velocity-2.4.ebuild b/dev-java/velocity/velocity-2.4.ebuild
index 27d9d96922dc..e3727ab40d9f 100644
--- a/dev-java/velocity/velocity-2.4.ebuild
+++ b/dev-java/velocity/velocity-2.4.ebuild
@@ -99,7 +99,7 @@ src_prepare() {
}
src_test() {
- pushd src/test/java || die
+ pushd src/test/java > /dev/null || die
# DataSourceResourceLoaderTestCase.java requires configured jdbc
local JAVA_TEST_RUN_ONLY=$(find * \
-name "*TestCase.java" \
@@ -108,6 +108,6 @@ src_test() {
)
JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
- popd
+ popd > /dev/null || die
java-pkg-simple_src_test
}
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/velocity/
@ 2024-10-20 10:23 Miroslav Šulc
0 siblings, 0 replies; 27+ messages in thread
From: Miroslav Šulc @ 2024-10-20 10:23 UTC (permalink / raw
To: gentoo-commits
commit: 0e91ee511c84b43e0d37980be436361ef1b8e646
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Fri Oct 4 19:58:56 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Oct 20 10:23:49 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e91ee51
dev-java/velocity: add metadata changelog
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/38836/commits/9384e3941e9ff08a55954c51debdd252cbc8af65
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/velocity/metadata.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev-java/velocity/metadata.xml b/dev-java/velocity/metadata.xml
index 8e49c08df5a1..859cbf7156a4 100644
--- a/dev-java/velocity/metadata.xml
+++ b/dev-java/velocity/metadata.xml
@@ -6,6 +6,7 @@
<name>Java</name>
</maintainer>
<upstream>
+ <changelog>https://velocity.apache.org/engine/2.4/changes.html</changelog>
<remote-id type="github">apache/velocity-engine</remote-id>
</upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/velocity/
@ 2024-10-20 10:23 Miroslav Šulc
0 siblings, 0 replies; 27+ messages in thread
From: Miroslav Šulc @ 2024-10-20 10:23 UTC (permalink / raw
To: gentoo-commits
commit: a7619cc9df196fa115b4be7ab9250319d62c4195
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Fri Oct 4 19:54:50 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Oct 20 10:20:26 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7619cc9
dev-java/velocity: add 2.4
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/38836/commits/c4323537b30a21ab59ee217ac4e80d73993b5c7a
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/velocity/Manifest | 1 +
dev-java/velocity/velocity-2.4.ebuild | 113 ++++++++++++++++++++++++++++++++++
2 files changed, 114 insertions(+)
diff --git a/dev-java/velocity/Manifest b/dev-java/velocity/Manifest
index 7920653cd469..dfd5c8305a30 100644
--- a/dev-java/velocity/Manifest
+++ b/dev-java/velocity/Manifest
@@ -1 +1,2 @@
DIST velocity-2.3_p20240314.tar.gz 440967 BLAKE2B c5fcea7af49d6c46d5c0943efe82f3c04d921afc2c53201b97842ae71714e7035d075c147b3bea71e959db12dd970b7879ade73bbc23bab09a1fd262e21f2fc6 SHA512 9055e780d2a3c798bfe30e5c7859a7311c4984b551d7b2ffa68c57c076549326d0ddae31eabff8009ea021c749331d34c71eee8cab55599dea5f3c8dba841a02
+DIST velocity-2.4.tar.gz 444952 BLAKE2B 0db598bad6743383e62e89acc55b887f28108b6065c3e615b78485e4f94c9f1a316bff7c04d66052541d6173311e97dab28142dad69e6caca168b2a2fcc28637 SHA512 b3f7ae68fa2e0f30193f089a2e8ee5366e71726d93e85fa2f4c3f95d20aa599df053ee7103c71b01c89fe08dd5276e5a2c7da3e26eaffeafd94c078241a9e264
diff --git a/dev-java/velocity/velocity-2.4.ebuild b/dev-java/velocity/velocity-2.4.ebuild
new file mode 100644
index 000000000000..27d9d96922dc
--- /dev/null
+++ b/dev-java/velocity/velocity-2.4.ebuild
@@ -0,0 +1,113 @@
+# 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.apache.velocity:velocity-engine-core:2.3"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Apache Velocity is a general purpose template engine"
+HOMEPAGE="https://velocity.apache.org"
+SRC_URI="https://github.com/apache/${PN}-engine/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-engine-${PV}/${PN}-engine-core"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+CP_DEPEND="
+ dev-java/commons-lang:3.6
+ dev-java/slf4j-api:0
+"
+
+DEPEND="
+ ${CP_DEPEND}
+ dev-java/commons-io:1
+ >=virtual/jdk-1.8:*
+ test? (
+ dev-db/hsqldb:0
+ dev-java/slf4j-simple:0
+ )
+"
+
+RDEPEND="
+ ${CP_DEPEND}
+ >=virtual/jre-1.8:*
+"
+
+JAVACC_SLOT="7.0.13"
+BDEPEND="dev-java/javacc:${JAVACC_SLOT}"
+
+JAVA_CLASSPATH_EXTRA="commons-io-1"
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_EXTRA_ARGS="-Dtest.compare.dir=target/test-classes -Dtest.result.dir=results"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,hsqldb,slf4j-simple"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+ java-pkg-2_src_prepare
+
+ cp -r src/main/{,resources/org/apache/velocity/runtime}/parser || die
+
+ sed -e "s/\${project.version}/${PV}/" \
+ src/main/java-templates/org/apache/velocity/runtime/VelocityEngineVersion.java > \
+ src/main/java/org/apache/velocity/runtime/VelocityEngineVersion.java || die
+
+ sed -i \
+ -e 's/\${parser.basename}/Standard/g' \
+ -e 's/\${parser.package}/org.apache.velocity.runtime.parser/g' \
+ -e 's/\${parser.char.asterisk}/\*/g' \
+ -e 's/\${parser.char.at}/\@/g' \
+ -e 's/\${parser.char.dollar}/\$/g' \
+ -e 's/\${parser.char.hash}/\#/g' \
+ "${S}/src/main/parser/Parser.jjt" || die
+
+ # File "StandardParserTreeConstants.java" does not exist. Will create one.
+ # File "StandardParserVisitor.java" does not exist. Will create one.
+ # File "JJTStandardParserState.java" does not exist. Will create one.
+ "jjtree-${JAVACC_SLOT}" -GRAMMAR_ENCODING=UTF-8 \
+ -JDK_VERSION=1.8 \
+ -BUILD_NODE_FILES=false \
+ -MULTI=true \
+ -NODE_PACKAGE=org.apache.velocity.runtime.parser.node \
+ -NODE_USES_PARSER=true \
+ -STATIC=false \
+ -OUTPUT_DIRECTORY="${JAVA_SRC_DIR}/org/apache/velocity/runtime/parser/node" \
+ "${S}/src/main/parser/Parser.jjt" \
+ || die "Code generation via jjtree failed"
+
+ "javacc-${JAVACC_SLOT}" -GRAMMAR_ENCODING=UTF-8 \
+ -JDK_VERSION=1.8 \
+ -STATIC=false \
+ -DEBUG_PARSER=false \
+ -DEBUG_LOOKAHEAD=false \
+ -DEBUG_TOKEN_MANAGER=false \
+ -BUILD_PARSER=true \
+ -TOKEN_MANAGER_USES_PARSER=true \
+ -OUTPUT_DIRECTORY="${JAVA_SRC_DIR}" \
+ "${JAVA_SRC_DIR}/org/apache/velocity/runtime/parser/node/Parser.jj" \
+ || die "Parser.java code generation via javacc failed"
+
+ # Avoid "error: duplicate class: org.apache.velocity.runtime.parser...."
+ rm -v "${JAVA_SRC_DIR}/CharStream.java" || die "cannot remove 'CharStream.java'"
+ rm -v "${JAVA_SRC_DIR}/ParseException.java" || die "cannot remove 'ParseException.java'"
+}
+
+src_test() {
+ pushd src/test/java || die
+ # DataSourceResourceLoaderTestCase.java requires configured jdbc
+ local JAVA_TEST_RUN_ONLY=$(find * \
+ -name "*TestCase.java" \
+ ! -name "BaseTestCase.java" \
+ ! -name "DataSourceResourceLoaderTestCase.java" \
+ )
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+ popd
+ java-pkg-simple_src_test
+}
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/velocity/
@ 2024-10-12 17:12 Arthur Zamarin
0 siblings, 0 replies; 27+ messages in thread
From: Arthur Zamarin @ 2024-10-12 17:12 UTC (permalink / raw
To: gentoo-commits
commit: b95ddae2b59ced4f2c3410e6b5a095321e4d033a
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 11 12:54:59 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 12 17:09:05 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b95ddae2
dev-java/velocity: dekeyword arm
After a message to gentoo-dev ML, and no reply from any user on arm,
we decided to dekeyword most Java packages from arm.
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-java/velocity/velocity-2.3_p20240314.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/velocity/velocity-2.3_p20240314.ebuild b/dev-java/velocity/velocity-2.3_p20240314.ebuild
index 948e71a0394d..9c7827b2acdd 100644
--- a/dev-java/velocity/velocity-2.3_p20240314.ebuild
+++ b/dev-java/velocity/velocity-2.3_p20240314.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-engine-${MY_COMMIT}/${PN}-engine-core"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
CP_DEPEND="
>=dev-java/commons-io-2.8.0:1
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/velocity/
@ 2024-06-13 13:21 Miroslav Šulc
0 siblings, 0 replies; 27+ messages in thread
From: Miroslav Šulc @ 2024-06-13 13:21 UTC (permalink / raw
To: gentoo-commits
commit: fcb425fc9a8842911a07ad12d6ed7ce9bc94fea7
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Wed Jun 12 14:41:34 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Jun 13 13:21:09 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcb425fc
dev-java/velocity: drop 2.3
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/37127
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/velocity/Manifest | 1 -
dev-java/velocity/velocity-2.3.ebuild | 146 ----------------------------------
2 files changed, 147 deletions(-)
diff --git a/dev-java/velocity/Manifest b/dev-java/velocity/Manifest
index bafc24692cd9..7920653cd469 100644
--- a/dev-java/velocity/Manifest
+++ b/dev-java/velocity/Manifest
@@ -1,2 +1 @@
-DIST velocity-2.3.tar.gz 443754 BLAKE2B 16b7aaa87eb6be899f40d09ee8aa50b2ac24dd59c33f29b944d46ea84a77de07cd69f344632b4b829b92a92fe6ccd75cf79e021787b2ca59a79040aa08a53eed SHA512 987f2991a96fa8fae43ff2f72d6a57b25b1cb7d98b7def7a1a6e9a308c8b5b86e394444c47ee0eca8b70d41b341759c7309404dc4b952dbc65fc3a5b92d46cdb
DIST velocity-2.3_p20240314.tar.gz 440967 BLAKE2B c5fcea7af49d6c46d5c0943efe82f3c04d921afc2c53201b97842ae71714e7035d075c147b3bea71e959db12dd970b7879ade73bbc23bab09a1fd262e21f2fc6 SHA512 9055e780d2a3c798bfe30e5c7859a7311c4984b551d7b2ffa68c57c076549326d0ddae31eabff8009ea021c749331d34c71eee8cab55599dea5f3c8dba841a02
diff --git a/dev-java/velocity/velocity-2.3.ebuild b/dev-java/velocity/velocity-2.3.ebuild
deleted file mode 100644
index fd0fb1074e25..000000000000
--- a/dev-java/velocity/velocity-2.3.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2024 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://github.com/apache/velocity-engine/archive/refs/tags/2.3.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild velocity-2.3.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.velocity:velocity-engine-core:2.3"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Apache Velocity is a general purpose template engine"
-HOMEPAGE="https://velocity.apache.org"
-SRC_URI="https://github.com/apache/${PN}-engine/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# commons-io:commons-io:2.8.0 -> >=dev-java/commons-io-2.8.0:1
-# org.apache.commons:commons-lang3:3.11 -> >=dev-java/commons-lang-3.11:3.6
-# org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0
-
-CDEPEND="
- >=dev-java/commons-io-2.8.0:1
- >=dev-java/commons-lang-3.11:3.6
- >=dev-java/slf4j-api-1.7.30:0
-"
-
-# Compile dependencies
-# POM: pom.xml
-# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
-# test? org.hsqldb:hsqldb:2.5.1 -> !!!groupId-not-found!!!
-# test? org.slf4j:slf4j-simple:1.7.30 -> >=dev-java/slf4j-simple-1.7.30:0
-
-DEPEND="
- >=virtual/jdk-1.8:*
- ${CDEPEND}
- test? (
- dev-db/hsqldb:0
- >=dev-java/slf4j-simple-1.7.30:0
- )
-"
-
-RDEPEND="
- >=virtual/jre-1.8:*
- ${CDEPEND}
-"
-
-BDEPEND="
- dev-java/javacc:0
-"
-
-S="${WORKDIR}/${PN}-engine-${PV}/${PN}-engine-core"
-PATCHES=( "${FILESDIR}/velocity-2.3-skipSecurityManager.patch" )
-
-JAVA_GENTOO_CLASSPATH="commons-io-1,commons-lang-3.6,slf4j-api"
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4,hsqldb,slf4j-simple"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-JAVA_TEST_EXCLUDES=(
- # org.junit.runners.model.InvalidTestClassError: Invalid test class, No runnable methods
- "org.apache.velocity.test.RenderVelocityTemplateTest"
- "org.apache.velocity.test.provider.TestNumber"
- "org.apache.velocity.test.provider.TestProvider"
- "org.apache.velocity.test.sql.TestDataSource"
- "org.apache.velocity.test.misc.TestContext"
-
- # java.lang.IllegalArgumentException: Test class can only have one constructor
- "org.apache.velocity.test.misc.TestLogger"
-
- # junit.framework.AssertionFailedError: Class org.apache.velocity.test.sql.BaseSQLTest has no public constructor TestCase(String name) or TestCase()
- "org.apache.velocity.test.sql.BaseSQLTest"
-
- # requires configured jdbc
- # junit.framework.AssertionFailedError: Exception in constructor: testSimpleTemplate (java.lang.NullPointerException
- # junit.framework.AssertionFailedError: Exception in constructor: testNullTimestamp (java.lang.NullPointerException
- # junit.framework.AssertionFailedError: Exception in constructor: testMacroInvocation (java.lang.NullPointerException
- # junit.framework.AssertionFailedError: Exception in constructor: testRenderTool (java.lang.NullPointerException
- "org.apache.velocity.test.sql.DataSourceResourceLoaderTestCase"
-)
-
-src_prepare() {
- default #780585
- java-pkg-2_src_prepare
-
- cp -v "${JAVA_SRC_DIR}-templates/org/apache/velocity/runtime/VelocityEngineVersion.java" \
- "${JAVA_SRC_DIR}/org/apache/velocity/runtime/VelocityEngineVersion.java" || die
-
- sed -i "s/\${project.version}/${PV}/g" \
- "${JAVA_SRC_DIR}/org/apache/velocity/runtime/VelocityEngineVersion.java" || die
-
- # fix paths for tests
- sed -i \
- -e "s%System.getProperty(\"test.compare.dir\")%\"${S}/target/test-classes\"%g" \
- -e "s%System.getProperty(\"test.result.dir\")%\"${S}/results\"%g" \
- "${JAVA_TEST_SRC_DIR}/org/apache/velocity/test/TemplateTestBase.java" || die
-
- sed -i \
- -e 's/\${parser.basename}/Standard/g' \
- -e 's/\${parser.package}/org.apache.velocity.runtime.parser/g' \
- -e 's/\${parser.char.asterisk}/\*/g' \
- -e 's/\${parser.char.at}/\@/g' \
- -e 's/\${parser.char.dollar}/\$/g' \
- -e 's/\${parser.char.hash}/\#/g' \
- "${S}/src/main/parser/Parser.jjt" || die
-
- # File "StandardParserTreeConstants.java" does not exist. Will create one.
- # File "StandardParserVisitor.java" does not exist. Will create one.
- # File "JJTStandardParserState.java" does not exist. Will create one.
- jjtree -GRAMMAR_ENCODING=UTF-8 \
- -JDK_VERSION=1.8 \
- -BUILD_NODE_FILES=false \
- -MULTI=true \
- -NODE_PACKAGE=org.apache.velocity.runtime.parser.node \
- -NODE_USES_PARSER=true \
- -STATIC=false \
- -OUTPUT_DIRECTORY="${JAVA_SRC_DIR}/org/apache/velocity/runtime/parser/node" \
- "${S}/src/main/parser/Parser.jjt" \
- || die "Code generation via jjtree failed"
-
- javacc -GRAMMAR_ENCODING=UTF-8 \
- -JDK_VERSION=1.8 \
- -STATIC=false \
- -DEBUG_PARSER=false \
- -DEBUG_LOOKAHEAD=false \
- -DEBUG_TOKEN_MANAGER=false \
- -BUILD_PARSER=true \
- -TOKEN_MANAGER_USES_PARSER=true \
- -OUTPUT_DIRECTORY="${JAVA_SRC_DIR}" \
- "${JAVA_SRC_DIR}/org/apache/velocity/runtime/parser/node/Parser.jj" \
- || die "Parser.java code generation via javacc failed"
-
- # Avoid "error: duplicate class: org.apache.velocity.runtime.parser...."
- rm -v "${JAVA_SRC_DIR}/CharStream.java" || die "cannot remove 'CharStream.java'"
- rm -v "${JAVA_SRC_DIR}/ParseException.java" || die "cannot remove 'ParseException.java'"
-}
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/velocity/
@ 2024-06-12 14:30 Sam James
0 siblings, 0 replies; 27+ messages in thread
From: Sam James @ 2024-06-12 14:30 UTC (permalink / raw
To: gentoo-commits
commit: 53e4d198fb40ae07b5d6b90d28f686e28959d551
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 12 14:30:12 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 12 14:30:12 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53e4d198
dev-java/velocity: Stabilize 2.3_p20240314 x86, #931578
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/velocity/velocity-2.3_p20240314.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/velocity/velocity-2.3_p20240314.ebuild b/dev-java/velocity/velocity-2.3_p20240314.ebuild
index 610bcfa3c158..948e71a0394d 100644
--- a/dev-java/velocity/velocity-2.3_p20240314.ebuild
+++ b/dev-java/velocity/velocity-2.3_p20240314.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-engine-${MY_COMMIT}/${PN}-engine-core"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
CP_DEPEND="
>=dev-java/commons-io-2.8.0:1
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/velocity/
@ 2024-06-10 2:46 Ionen Wolkens
0 siblings, 0 replies; 27+ messages in thread
From: Ionen Wolkens @ 2024-06-10 2:46 UTC (permalink / raw
To: gentoo-commits
commit: bf853113520c180e56b458842eb902b210c3c614
Author: Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Mon Jun 10 02:42:27 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jun 10 02:45:34 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf853113
dev-java/velocity: Keyword 2.3_p20240314 x86, #929018
Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-java/velocity/velocity-2.3_p20240314.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/velocity/velocity-2.3_p20240314.ebuild b/dev-java/velocity/velocity-2.3_p20240314.ebuild
index 9587957bd84b..610bcfa3c158 100644
--- a/dev-java/velocity/velocity-2.3_p20240314.ebuild
+++ b/dev-java/velocity/velocity-2.3_p20240314.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-engine-${MY_COMMIT}/${PN}-engine-core"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
CP_DEPEND="
>=dev-java/commons-io-2.8.0:1
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/velocity/
@ 2024-05-08 11:34 Sam James
0 siblings, 0 replies; 27+ messages in thread
From: Sam James @ 2024-05-08 11:34 UTC (permalink / raw
To: gentoo-commits
commit: d65a66c755700b92b51523bb2d0f23af6c4c78de
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May 8 11:34:19 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 8 11:34:19 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d65a66c7
dev-java/velocity: Stabilize 2.3_p20240314 arm64, #931559
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/velocity/velocity-2.3_p20240314.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/velocity/velocity-2.3_p20240314.ebuild b/dev-java/velocity/velocity-2.3_p20240314.ebuild
index 095680cc29d1..dc250462a5ec 100644
--- a/dev-java/velocity/velocity-2.3_p20240314.ebuild
+++ b/dev-java/velocity/velocity-2.3_p20240314.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-engine-${MY_COMMIT}/${PN}-engine-core"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64"
CP_DEPEND="
>=dev-java/commons-io-2.8.0:1
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/velocity/
@ 2024-05-08 11:34 Sam James
0 siblings, 0 replies; 27+ messages in thread
From: Sam James @ 2024-05-08 11:34 UTC (permalink / raw
To: gentoo-commits
commit: de91c45546b05238803425c19d8ab32b954f0db6
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May 8 11:34:21 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 8 11:34:21 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de91c455
dev-java/velocity: Stabilize 2.3_p20240314 ppc64, #931559
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/velocity/velocity-2.3_p20240314.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/velocity/velocity-2.3_p20240314.ebuild b/dev-java/velocity/velocity-2.3_p20240314.ebuild
index dc250462a5ec..6c285d686790 100644
--- a/dev-java/velocity/velocity-2.3_p20240314.ebuild
+++ b/dev-java/velocity/velocity-2.3_p20240314.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-engine-${MY_COMMIT}/${PN}-engine-core"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm arm64 ppc64"
CP_DEPEND="
>=dev-java/commons-io-2.8.0:1
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/velocity/
@ 2024-05-08 11:34 Sam James
0 siblings, 0 replies; 27+ messages in thread
From: Sam James @ 2024-05-08 11:34 UTC (permalink / raw
To: gentoo-commits
commit: 0eb1a99d29775721f3f6d68d371502e91463dd3d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May 8 11:34:23 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 8 11:34:23 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0eb1a99d
dev-java/velocity: Stabilize 2.3_p20240314 amd64, #931559
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/velocity/velocity-2.3_p20240314.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/velocity/velocity-2.3_p20240314.ebuild b/dev-java/velocity/velocity-2.3_p20240314.ebuild
index 6c285d686790..9587957bd84b 100644
--- a/dev-java/velocity/velocity-2.3_p20240314.ebuild
+++ b/dev-java/velocity/velocity-2.3_p20240314.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-engine-${MY_COMMIT}/${PN}-engine-core"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64"
CP_DEPEND="
>=dev-java/commons-io-2.8.0:1
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/velocity/
@ 2024-05-01 5:28 Joonas Niilola
0 siblings, 0 replies; 27+ messages in thread
From: Joonas Niilola @ 2024-05-01 5:28 UTC (permalink / raw
To: gentoo-commits
commit: 16608de2fcddbe97556951bfecb882d00363def1
Author: Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Wed May 1 00:12:52 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed May 1 05:28:12 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16608de2
dev-java/velocity: Keyword 2.3_p20240314 ppc64, #929018
Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-java/velocity/velocity-2.3_p20240314.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/velocity/velocity-2.3_p20240314.ebuild b/dev-java/velocity/velocity-2.3_p20240314.ebuild
index 9fc3d0f5f420..095680cc29d1 100644
--- a/dev-java/velocity/velocity-2.3_p20240314.ebuild
+++ b/dev-java/velocity/velocity-2.3_p20240314.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-engine-${MY_COMMIT}/${PN}-engine-core"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
CP_DEPEND="
>=dev-java/commons-io-2.8.0:1
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/velocity/
@ 2024-04-09 7:05 Miroslav Šulc
0 siblings, 0 replies; 27+ messages in thread
From: Miroslav Šulc @ 2024-04-09 7:05 UTC (permalink / raw
To: gentoo-commits
commit: ebab671d34ce7045dde5447438a3f5353e1590da
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Apr 8 10:14:29 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Apr 9 07:02:01 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebab671d
dev-java/velocity: add 2.3_p20240314
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/36150/commits/bd4321f9c3a02c77ee49b80a8a703e7b761168f5
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/velocity/Manifest | 1 +
dev-java/velocity/velocity-2.3_p20240314.ebuild | 108 ++++++++++++++++++++++++
2 files changed, 109 insertions(+)
diff --git a/dev-java/velocity/Manifest b/dev-java/velocity/Manifest
index 7b243dc27a93..bafc24692cd9 100644
--- a/dev-java/velocity/Manifest
+++ b/dev-java/velocity/Manifest
@@ -1 +1,2 @@
DIST velocity-2.3.tar.gz 443754 BLAKE2B 16b7aaa87eb6be899f40d09ee8aa50b2ac24dd59c33f29b944d46ea84a77de07cd69f344632b4b829b92a92fe6ccd75cf79e021787b2ca59a79040aa08a53eed SHA512 987f2991a96fa8fae43ff2f72d6a57b25b1cb7d98b7def7a1a6e9a308c8b5b86e394444c47ee0eca8b70d41b341759c7309404dc4b952dbc65fc3a5b92d46cdb
+DIST velocity-2.3_p20240314.tar.gz 440967 BLAKE2B c5fcea7af49d6c46d5c0943efe82f3c04d921afc2c53201b97842ae71714e7035d075c147b3bea71e959db12dd970b7879ade73bbc23bab09a1fd262e21f2fc6 SHA512 9055e780d2a3c798bfe30e5c7859a7311c4984b551d7b2ffa68c57c076549326d0ddae31eabff8009ea021c749331d34c71eee8cab55599dea5f3c8dba841a02
diff --git a/dev-java/velocity/velocity-2.3_p20240314.ebuild b/dev-java/velocity/velocity-2.3_p20240314.ebuild
new file mode 100644
index 000000000000..9fc3d0f5f420
--- /dev/null
+++ b/dev-java/velocity/velocity-2.3_p20240314.ebuild
@@ -0,0 +1,108 @@
+# 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.apache.velocity:velocity-engine-core:2.3"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Apache Velocity is a general purpose template engine"
+HOMEPAGE="https://velocity.apache.org"
+MY_COMMIT="86cfcf41105f8a25db11ca6483e33c20fc0804d9"
+SRC_URI="https://github.com/apache/${PN}-engine/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-engine-${MY_COMMIT}/${PN}-engine-core"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+CP_DEPEND="
+ >=dev-java/commons-io-2.8.0:1
+ >=dev-java/commons-lang-3.11:3.6
+ >=dev-java/slf4j-api-1.7.30:0
+"
+DEPEND="
+ >=virtual/jdk-1.8:*
+ ${CP_DEPEND}
+ test? (
+ dev-db/hsqldb:0
+ >=dev-java/slf4j-simple-1.7.30:0
+ )
+"
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}
+"
+JAVACC_SLOT="7.0.13"
+BDEPEND="dev-java/javacc:${JAVACC_SLOT}"
+
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_EXTRA_ARGS="-Dtest.compare.dir=target/test-classes -Dtest.result.dir=results"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,hsqldb,slf4j-simple"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+ java-pkg-2_src_prepare
+
+ sed -e "s/\${project.version}/${PV}/" \
+ src/main/java-templates/org/apache/velocity/runtime/VelocityEngineVersion.java > \
+ src/main/java/org/apache/velocity/runtime/VelocityEngineVersion.java || die
+
+ sed -i \
+ -e 's/\${parser.basename}/Standard/g' \
+ -e 's/\${parser.package}/org.apache.velocity.runtime.parser/g' \
+ -e 's/\${parser.char.asterisk}/\*/g' \
+ -e 's/\${parser.char.at}/\@/g' \
+ -e 's/\${parser.char.dollar}/\$/g' \
+ -e 's/\${parser.char.hash}/\#/g' \
+ "${S}/src/main/parser/Parser.jjt" || die
+
+ # File "StandardParserTreeConstants.java" does not exist. Will create one.
+ # File "StandardParserVisitor.java" does not exist. Will create one.
+ # File "JJTStandardParserState.java" does not exist. Will create one.
+ "jjtree-${JAVACC_SLOT}" -GRAMMAR_ENCODING=UTF-8 \
+ -JDK_VERSION=1.8 \
+ -BUILD_NODE_FILES=false \
+ -MULTI=true \
+ -NODE_PACKAGE=org.apache.velocity.runtime.parser.node \
+ -NODE_USES_PARSER=true \
+ -STATIC=false \
+ -OUTPUT_DIRECTORY="${JAVA_SRC_DIR}/org/apache/velocity/runtime/parser/node" \
+ "${S}/src/main/parser/Parser.jjt" \
+ || die "Code generation via jjtree failed"
+
+ "javacc-${JAVACC_SLOT}" -GRAMMAR_ENCODING=UTF-8 \
+ -JDK_VERSION=1.8 \
+ -STATIC=false \
+ -DEBUG_PARSER=false \
+ -DEBUG_LOOKAHEAD=false \
+ -DEBUG_TOKEN_MANAGER=false \
+ -BUILD_PARSER=true \
+ -TOKEN_MANAGER_USES_PARSER=true \
+ -OUTPUT_DIRECTORY="${JAVA_SRC_DIR}" \
+ "${JAVA_SRC_DIR}/org/apache/velocity/runtime/parser/node/Parser.jj" \
+ || die "Parser.java code generation via javacc failed"
+
+ # Avoid "error: duplicate class: org.apache.velocity.runtime.parser...."
+ rm -v "${JAVA_SRC_DIR}/CharStream.java" || die "cannot remove 'CharStream.java'"
+ rm -v "${JAVA_SRC_DIR}/ParseException.java" || die "cannot remove 'ParseException.java'"
+}
+
+src_test() {
+ pushd src/test/java || die
+ # DataSourceResourceLoaderTestCase.java requires configured jdbc
+ local JAVA_TEST_RUN_ONLY=$(find * \
+ -name "*TestCase.java" \
+ ! -name "BaseTestCase.java" \
+ ! -name "DataSourceResourceLoaderTestCase.java" \
+ )
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+ JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+ popd
+ java-pkg-simple_src_test
+}
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/velocity/
@ 2024-03-31 8:35 Miroslav Šulc
0 siblings, 0 replies; 27+ messages in thread
From: Miroslav Šulc @ 2024-03-31 8:35 UTC (permalink / raw
To: gentoo-commits
commit: 5bb1c9c8d8e5cc73e1e4c3fe267b4f59cb5fe0e0
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Mar 30 13:34:21 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Mar 31 08:34:09 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bb1c9c8
dev-java/velocity: add github upstream metadata
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/35999
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/velocity/metadata.xml | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/dev-java/velocity/metadata.xml b/dev-java/velocity/metadata.xml
index 6021501589e0..8e49c08df5a1 100644
--- a/dev-java/velocity/metadata.xml
+++ b/dev-java/velocity/metadata.xml
@@ -1,8 +1,11 @@
<?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>
- <name>Java</name>
-</maintainer>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">apache/velocity-engine</remote-id>
+ </upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/velocity/
@ 2021-12-17 10:57 Arthur Zamarin
0 siblings, 0 replies; 27+ messages in thread
From: Arthur Zamarin @ 2021-12-17 10:57 UTC (permalink / raw
To: gentoo-commits
commit: 692053a1a6110dc0c43675b3b4b78ac39d01044f
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 17 10:56:47 2021 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 17 10:57:22 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=692053a1
dev-java/velocity: Keyword 2.3 arm, #829407
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-java/velocity/velocity-2.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/velocity/velocity-2.3.ebuild b/dev-java/velocity/velocity-2.3.ebuild
index 4ad7f61976e9..8f22d0cafb1a 100644
--- a/dev-java/velocity/velocity-2.3.ebuild
+++ b/dev-java/velocity/velocity-2.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/apache/${PN}-engine/archive/refs/tags/${PV}.tar.gz -
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
# Common dependencies
# POM: pom.xml
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/velocity/
@ 2021-11-24 23:31 Sam James
0 siblings, 0 replies; 27+ messages in thread
From: Sam James @ 2021-11-24 23:31 UTC (permalink / raw
To: gentoo-commits
commit: feb7395ebb19944efac1093eb021e1deae0abf1e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 24 23:31:30 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 24 23:31:41 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=feb7395e
dev-java/velocity: Stabilize 2.3 arm64, #822924
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/velocity/velocity-2.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/velocity/velocity-2.3.ebuild b/dev-java/velocity/velocity-2.3.ebuild
index 4bf40b921b6d..4ad7f61976e9 100644
--- a/dev-java/velocity/velocity-2.3.ebuild
+++ b/dev-java/velocity/velocity-2.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/apache/${PN}-engine/archive/refs/tags/${PV}.tar.gz -
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
# Common dependencies
# POM: pom.xml
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/velocity/
@ 2021-11-10 16:47 Sam James
0 siblings, 0 replies; 27+ messages in thread
From: Sam James @ 2021-11-10 16:47 UTC (permalink / raw
To: gentoo-commits
commit: a0e2af4e155495f6123ff1cf70038a14578352bb
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 10 16:47:13 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 10 16:47:44 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0e2af4e
dev-java/velocity: Stabilize 2.3 ppc64, #822924
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/velocity/velocity-2.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/velocity/velocity-2.3.ebuild b/dev-java/velocity/velocity-2.3.ebuild
index 0cdd182bf73..4bf40b921b6 100644
--- a/dev-java/velocity/velocity-2.3.ebuild
+++ b/dev-java/velocity/velocity-2.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/apache/${PN}-engine/archive/refs/tags/${PV}.tar.gz -
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
# Common dependencies
# POM: pom.xml
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/velocity/
@ 2021-10-19 0:15 Sam James
0 siblings, 0 replies; 27+ messages in thread
From: Sam James @ 2021-10-19 0:15 UTC (permalink / raw
To: gentoo-commits
commit: 5594a096031735b76c756504349a5e72bb788a18
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 19 00:14:26 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 19 00:14:26 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5594a096
dev-java/velocity: Keyword 2.3 arm64, #802609
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/velocity/velocity-2.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/velocity/velocity-2.3.ebuild b/dev-java/velocity/velocity-2.3.ebuild
index 894f53e4285..0cdd182bf73 100644
--- a/dev-java/velocity/velocity-2.3.ebuild
+++ b/dev-java/velocity/velocity-2.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/apache/${PN}-engine/archive/refs/tags/${PV}.tar.gz -
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
# Common dependencies
# POM: pom.xml
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/velocity/
@ 2021-07-24 15:22 Sam James
0 siblings, 0 replies; 27+ messages in thread
From: Sam James @ 2021-07-24 15:22 UTC (permalink / raw
To: gentoo-commits
commit: 12d780d7f28e7b3870d55c304a0a3af74d9cff1a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 24 15:21:49 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 24 15:21:49 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12d780d7
dev-java/velocity: Keyword 2.3 ppc64, #802609
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/velocity/velocity-2.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/velocity/velocity-2.3.ebuild b/dev-java/velocity/velocity-2.3.ebuild
index d26c79aa3f6..894f53e4285 100644
--- a/dev-java/velocity/velocity-2.3.ebuild
+++ b/dev-java/velocity/velocity-2.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/apache/${PN}-engine/archive/refs/tags/${PV}.tar.gz -
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
# Common dependencies
# POM: pom.xml
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/velocity/
@ 2021-05-18 17:24 Sam James
0 siblings, 0 replies; 27+ messages in thread
From: Sam James @ 2021-05-18 17:24 UTC (permalink / raw
To: gentoo-commits
commit: 1076979022d3d98ddcd99fb69b5c13427bc1148d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May 18 17:24:27 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 18 17:24:27 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10769790
dev-java/velocity: Stabilize 2.3 x86, #775248
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/velocity/velocity-2.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/velocity/velocity-2.3.ebuild b/dev-java/velocity/velocity-2.3.ebuild
index 2492e2b8bcc..d26c79aa3f6 100644
--- a/dev-java/velocity/velocity-2.3.ebuild
+++ b/dev-java/velocity/velocity-2.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/apache/${PN}-engine/archive/refs/tags/${PV}.tar.gz -
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
# Common dependencies
# POM: pom.xml
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/velocity/
@ 2021-05-18 17:24 Sam James
0 siblings, 0 replies; 27+ messages in thread
From: Sam James @ 2021-05-18 17:24 UTC (permalink / raw
To: gentoo-commits
commit: 18fb32dad2d4daa73382505418c517cbf9716e3e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May 18 17:23:33 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 18 17:23:33 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18fb32da
dev-java/velocity: Stabilize 2.3 amd64, #775248
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/velocity/velocity-2.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/velocity/velocity-2.3.ebuild b/dev-java/velocity/velocity-2.3.ebuild
index 495e3056411..2492e2b8bcc 100644
--- a/dev-java/velocity/velocity-2.3.ebuild
+++ b/dev-java/velocity/velocity-2.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/apache/${PN}-engine/archive/refs/tags/${PV}.tar.gz -
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
# Common dependencies
# POM: pom.xml
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/velocity/
@ 2021-04-25 15:23 Miroslav Šulc
0 siblings, 0 replies; 27+ messages in thread
From: Miroslav Šulc @ 2021-04-25 15:23 UTC (permalink / raw
To: gentoo-commits
commit: 71aa218c86852f9b6b3891ae33bb93445053dc8d
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Apr 17 20:23:16 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Apr 25 15:23:46 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71aa218c
dev-java/velocity: bump to 2.3
Bug: https://bugs.gentoo.org/775248
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/20429
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/velocity/Manifest | 1 +
dev-java/velocity/velocity-2.3.ebuild | 144 ++++++++++++++++++++++++++++++++++
2 files changed, 145 insertions(+)
diff --git a/dev-java/velocity/Manifest b/dev-java/velocity/Manifest
index bca2b1c20c0..2728c27d189 100644
--- a/dev-java/velocity/Manifest
+++ b/dev-java/velocity/Manifest
@@ -1 +1,2 @@
DIST velocity-1.7.tar.gz 5882643 BLAKE2B 4c1499bb015fe1c6b87257a60d247b1b0fb8558e6f879a3d04cf9ef0561ed69b89491c9ebba55cc54d14f6d377b300ee0f7e55ae4118236bba60dc632b5686b3 SHA512 542c9cc0efa118693bf1c952ac4b0c7c3d0229ef804afaa4f0f1c01ad40b0112055c21df7f800c302bf173d58461a864b29b9bc4b9174029d9748f88f2fcf9ab
+DIST velocity-2.3.tar.gz 443754 BLAKE2B 16b7aaa87eb6be899f40d09ee8aa50b2ac24dd59c33f29b944d46ea84a77de07cd69f344632b4b829b92a92fe6ccd75cf79e021787b2ca59a79040aa08a53eed SHA512 987f2991a96fa8fae43ff2f72d6a57b25b1cb7d98b7def7a1a6e9a308c8b5b86e394444c47ee0eca8b70d41b341759c7309404dc4b952dbc65fc3a5b92d46cdb
diff --git a/dev-java/velocity/velocity-2.3.ebuild b/dev-java/velocity/velocity-2.3.ebuild
new file mode 100644
index 00000000000..495e3056411
--- /dev/null
+++ b/dev-java/velocity/velocity-2.3.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2021 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://github.com/apache/velocity-engine/archive/refs/tags/2.3.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild velocity-2.3.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.velocity:velocity-engine-core:2.3"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Apache Velocity is a general purpose template engine."
+HOMEPAGE="https://velocity.apache.org"
+SRC_URI="https://github.com/apache/${PN}-engine/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Common dependencies
+# POM: pom.xml
+# commons-io:commons-io:2.8.0 -> >=dev-java/commons-io-2.8.0:1
+# org.apache.commons:commons-lang3:3.11 -> >=dev-java/commons-lang-3.11:3.6
+# org.slf4j:slf4j-api:1.7.30 -> >=dev-java/slf4j-api-1.7.30:0
+
+CDEPEND="
+ >=dev-java/commons-io-2.8.0:1
+ >=dev-java/commons-lang-3.11:3.6
+ >=dev-java/slf4j-api-1.7.30:0
+"
+
+# Compile dependencies
+# POM: pom.xml
+# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
+# test? org.hsqldb:hsqldb:2.5.1 -> !!!groupId-not-found!!!
+# test? org.slf4j:slf4j-simple:1.7.30 -> >=dev-java/slf4j-simple-1.7.30:0
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ ${CDEPEND}
+ test? (
+ dev-db/hsqldb:0
+ >=dev-java/slf4j-simple-1.7.30:0
+ )
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CDEPEND}
+"
+
+BDEPEND="
+ dev-java/javacc:0
+"
+
+S="${WORKDIR}/${PN}-engine-${PV}/${PN}-engine-core"
+
+JAVA_GENTOO_CLASSPATH="commons-io-1,commons-lang-3.6,slf4j-api"
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,hsqldb,slf4j-simple"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+
+JAVA_TEST_EXCLUDES=(
+ # org.junit.runners.model.InvalidTestClassError: Invalid test class, No runnable methods
+ "org.apache.velocity.test.RenderVelocityTemplateTest"
+ "org.apache.velocity.test.provider.TestNumber"
+ "org.apache.velocity.test.provider.TestProvider"
+ "org.apache.velocity.test.sql.TestDataSource"
+ "org.apache.velocity.test.misc.TestContext"
+
+ # java.lang.IllegalArgumentException: Test class can only have one constructor
+ "org.apache.velocity.test.misc.TestLogger"
+
+ # junit.framework.AssertionFailedError: Class org.apache.velocity.test.sql.BaseSQLTest has no public constructor TestCase(String name) or TestCase()
+ "org.apache.velocity.test.sql.BaseSQLTest"
+
+ # requires configured jdbc
+ # junit.framework.AssertionFailedError: Exception in constructor: testSimpleTemplate (java.lang.NullPointerException
+ # junit.framework.AssertionFailedError: Exception in constructor: testNullTimestamp (java.lang.NullPointerException
+ # junit.framework.AssertionFailedError: Exception in constructor: testMacroInvocation (java.lang.NullPointerException
+ # junit.framework.AssertionFailedError: Exception in constructor: testRenderTool (java.lang.NullPointerException
+ "org.apache.velocity.test.sql.DataSourceResourceLoaderTestCase"
+)
+
+src_prepare() {
+ default
+
+ cp -v "${JAVA_SRC_DIR}-templates/org/apache/velocity/runtime/VelocityEngineVersion.java" \
+ "${JAVA_SRC_DIR}/org/apache/velocity/runtime/VelocityEngineVersion.java" || die
+
+ sed -i "s/\${project.version}/${PV}/g" \
+ "${JAVA_SRC_DIR}/org/apache/velocity/runtime/VelocityEngineVersion.java" || die
+
+ # fix paths for tests
+ sed -i \
+ -e "s%System.getProperty(\"test.compare.dir\")%\"${S}/target/test-classes\"%g" \
+ -e "s%System.getProperty(\"test.result.dir\")%\"${S}/results\"%g" \
+ "${JAVA_TEST_SRC_DIR}/org/apache/velocity/test/TemplateTestBase.java" || die
+
+ sed -i \
+ -e 's/\${parser.basename}/Standard/g' \
+ -e 's/\${parser.package}/org.apache.velocity.runtime.parser/g' \
+ -e 's/\${parser.char.asterisk}/\*/g' \
+ -e 's/\${parser.char.at}/\@/g' \
+ -e 's/\${parser.char.dollar}/\$/g' \
+ -e 's/\${parser.char.hash}/\#/g' \
+ "${S}/src/main/parser/Parser.jjt" || die
+
+ # File "StandardParserTreeConstants.java" does not exist. Will create one.
+ # File "StandardParserVisitor.java" does not exist. Will create one.
+ # File "JJTStandardParserState.java" does not exist. Will create one.
+ jjtree -GRAMMAR_ENCODING=UTF-8 \
+ -JDK_VERSION=1.8 \
+ -BUILD_NODE_FILES=false \
+ -MULTI=true \
+ -NODE_PACKAGE=org.apache.velocity.runtime.parser.node \
+ -NODE_USES_PARSER=true \
+ -STATIC=false \
+ -OUTPUT_DIRECTORY="${JAVA_SRC_DIR}/org/apache/velocity/runtime/parser/node" \
+ "${S}/src/main/parser/Parser.jjt" \
+ || die "Code generation via jjtree failed"
+
+ javacc -GRAMMAR_ENCODING=UTF-8 \
+ -JDK_VERSION=1.8 \
+ -STATIC=false \
+ -DEBUG_PARSER=false \
+ -DEBUG_LOOKAHEAD=false \
+ -DEBUG_TOKEN_MANAGER=false \
+ -BUILD_PARSER=true \
+ -TOKEN_MANAGER_USES_PARSER=true \
+ -OUTPUT_DIRECTORY="${JAVA_SRC_DIR}" \
+ "${JAVA_SRC_DIR}/org/apache/velocity/runtime/parser/node/Parser.jj" \
+ || die "Parser.java code generation via javacc failed"
+
+ # Avoid "error: duplicate class: org.apache.velocity.runtime.parser...."
+ rm -v "${JAVA_SRC_DIR}/CharStream.java" || die "cannot remove 'CharStream.java'"
+ rm -v "${JAVA_SRC_DIR}/ParseException.java" || die "cannot remove 'ParseException.java'"
+}
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/velocity/
@ 2021-04-03 10:49 Miroslav Šulc
0 siblings, 0 replies; 27+ messages in thread
From: Miroslav Šulc @ 2021-04-03 10:49 UTC (permalink / raw
To: gentoo-commits
commit: eed2e99c6e90bbdebf91eb45bb198df607c72db9
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Apr 3 08:14:45 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Apr 3 10:49:54 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eed2e99c
dev-java/velocity: MAVEN_ID
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/20176/commits/317f0c210ed4b34f2bfaf905f14281597bcad29d
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/velocity/velocity-1.7-r2.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dev-java/velocity/velocity-1.7-r2.ebuild b/dev-java/velocity/velocity-1.7-r2.ebuild
index fd655d63ddb..facc1a8d7f5 100644
--- a/dev-java/velocity/velocity-1.7-r2.ebuild
+++ b/dev-java/velocity/velocity-1.7-r2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
JAVA_PKG_IUSE="examples doc source"
+MAVEN_ID="org.apache.velocity:velocity:1.7"
inherit java-pkg-2 java-pkg-simple
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/velocity/
@ 2016-07-16 13:51 Patrice Clement
0 siblings, 0 replies; 27+ messages in thread
From: Patrice Clement @ 2016-07-16 13:51 UTC (permalink / raw
To: gentoo-commits
commit: 3a4627b73f6b55d6e92660c85c75bd69a671bfbb
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 16 13:16:16 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Jul 16 13:50:11 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a4627b7
dev-java/velocity: Stable for amd64. Retroactively mark stable for the remaining arches using the ALLARCHES policy.
Package-Manager: portage-2.2.28
dev-java/velocity/velocity-1.7-r2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/velocity/velocity-1.7-r2.ebuild b/dev-java/velocity/velocity-1.7-r2.ebuild
index bd3f8f3..67dc9a5 100644
--- a/dev-java/velocity/velocity-1.7-r2.ebuild
+++ b/dev-java/velocity/velocity-1.7-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/${PN}/engine/${PV}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
CDEPEND="
@@ -58,7 +58,7 @@ S="${WORKDIR}/${P}"
java_prepare() {
java-pkg_clean
- rm -rf test src/test || die
+ rm -rv test src/test || die
}
src_install() {
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/velocity/
@ 2016-02-21 15:45 Patrice Clement
0 siblings, 0 replies; 27+ messages in thread
From: Patrice Clement @ 2016-02-21 15:45 UTC (permalink / raw
To: gentoo-commits
commit: 3fbae1e3a8a65b1615442b91dcac71cb28047c0d
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 21 15:32:22 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Feb 21 15:32:45 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fbae1e3
dev-java/velocity: Remove the cruft and convert to java-pkg-simple.
Package-Manager: portage-2.2.26
dev-java/velocity/velocity-1.7-r2.ebuild | 67 ++++++++++++++++++++++++++++++++
1 file changed, 67 insertions(+)
diff --git a/dev-java/velocity/velocity-1.7-r2.ebuild b/dev-java/velocity/velocity-1.7-r2.ebuild
new file mode 100644
index 0000000..bd3f8f3
--- /dev/null
+++ b/dev-java/velocity/velocity-1.7-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="examples doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java framework for easy creation/rendering of documents"
+HOMEPAGE="http://velocity.apache.org"
+SRC_URI="mirror://apache/${PN}/engine/${PV}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="
+ dev-java/jdom:0
+ dev-java/log4j:0
+ dev-java/ant-core:0
+ dev-java/werken-xpath:0
+ dev-java/jakarta-oro:2.0
+ dev-java/avalon-logkit:2.0
+ dev-java/commons-lang:2.1
+ dev-java/commons-logging:0
+ dev-java/commons-collections:0
+ java-virtuals/servlet-api:2.3
+"
+DEPEND="
+ ${CDEPEND}
+ >=virtual/jdk-1.6
+"
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.6"
+
+JAVA_GENTOO_CLASSPATH="
+ jdom
+ log4j
+ ant-core
+ werken-xpath
+ jakarta-oro-2.0
+ servlet-api-2.3
+ commons-logging
+ commons-lang-2.1
+ avalon-logkit-2.0
+ commons-collections
+"
+
+JAVA_SRC_DIR="src"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${P}"
+
+java_prepare() {
+ java-pkg_clean
+ rm -rf test src/test || die
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ use examples && java-pkg_doexamples examples
+}
^ permalink raw reply related [flat|nested] 27+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/velocity/
@ 2015-09-29 21:20 James Le Cuirot
0 siblings, 0 replies; 27+ messages in thread
From: James Le Cuirot @ 2015-09-29 21:20 UTC (permalink / raw
To: gentoo-commits
commit: 540e5ea11a42baa65e1b02003c5210ac20f93120
Author: William L. Thomson Jr <wlt <AT> o-sinc <DOT> com>
AuthorDate: Fri Sep 18 00:06:30 2015 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Sep 29 21:19:43 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=540e5ea1
dev-java/velocity: Updated dev-java/jdom slot from 1.0 -> 0 for v1
dev-java/velocity/velocity-1.7-r1.ebuild | 87 ++++++++++++++++++++++++++++++++
1 file changed, 87 insertions(+)
diff --git a/dev-java/velocity/velocity-1.7-r1.ebuild b/dev-java/velocity/velocity-1.7-r1.ebuild
new file mode 100644
index 0000000..56d72ea
--- /dev/null
+++ b/dev-java/velocity/velocity-1.7-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="examples doc source"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="A Java-based template engine for easy creation/rendering of documents that format and present data"
+HOMEPAGE="http://velocity.apache.org"
+SRC_URI="mirror://apache/${PN}/engine/${PV}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="test"
+
+CDEPEND="
+ dev-java/commons-collections:0
+ dev-java/commons-lang:2.1
+ dev-java/commons-logging:0
+ dev-java/jdom:0
+ dev-java/log4j:0
+ dev-java/avalon-logkit:2.0
+ dev-java/jakarta-oro:2.0
+ java-virtuals/servlet-api:2.3
+ dev-java/werken-xpath:0
+ dev-java/ant-core:0
+"
+DEPEND="${CDEPEND}
+ >=virtual/jdk-1.4
+ test? (
+ dev-java/ant-junit:0
+ dev-java/ant-antlr:0
+ dev-db/hsqldb:0
+ )
+"
+RDEPEND="${CDEPEND}
+ >=virtual/jre-1.4"
+
+JAVA_PKG_FILTER_COMPILER="jikes"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_GENTOO_CLASSPATH="
+ commons-collections
+ commons-lang-2.1
+ commons-logging
+ jdom
+ log4j
+ avalon-logkit-2.0
+ jakarta-oro-2.0
+ servlet-api-2.3
+ werken-xpath
+ ant-core
+"
+
+# One test fails. see #219668
+RESTRICT="test"
+
+java_prepare() {
+ rm -v *.jar lib/test/*.jar lib/*.jar || die
+}
+
+src_compile () {
+ cd "${S}"/build
+ eant jar -Dskip-download=true #prebuilt javadocs
+}
+
+src_test() {
+ mkdir -p bin/test-lib || die
+ cd bin/test-lib || die
+ java-pkg_jar-from junit,hsqldb
+ java-pkg_jar-from --virtual servlet-api-2.3
+ cd "${S}"/build
+ ANT_TASKS="ant-junit ant-antlr" eant test -Dskip-download=true
+}
+
+src_install () {
+ java-pkg_newjar bin/*.jar
+
+ dodoc NOTICE README.txt
+ # has other stuff besides api too
+ use doc && java-pkg_dohtml -r docs/*
+ use examples && java-pkg_doexamples examples
+ use source && java-pkg_dosrc src/java/*
+}
^ permalink raw reply related [flat|nested] 27+ messages in thread
end of thread, other threads:[~2024-11-05 10:47 UTC | newest]
Thread overview: 27+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-18 18:04 [gentoo-commits] repo/gentoo:master commit in: dev-java/velocity/ Miroslav Šulc
-- strict thread matches above, loose matches on Subject: below --
2024-11-05 10:47 Florian Schmaus
2024-11-05 10:47 Florian Schmaus
2024-10-20 10:23 Miroslav Šulc
2024-10-20 10:23 Miroslav Šulc
2024-10-12 17:12 Arthur Zamarin
2024-06-13 13:21 Miroslav Šulc
2024-06-12 14:30 Sam James
2024-06-10 2:46 Ionen Wolkens
2024-05-08 11:34 Sam James
2024-05-08 11:34 Sam James
2024-05-08 11:34 Sam James
2024-05-01 5:28 Joonas Niilola
2024-04-09 7:05 Miroslav Šulc
2024-03-31 8:35 Miroslav Šulc
2021-12-17 10:57 Arthur Zamarin
2021-11-24 23:31 Sam James
2021-11-10 16:47 Sam James
2021-10-19 0:15 Sam James
2021-07-24 15:22 Sam James
2021-05-18 17:24 Sam James
2021-05-18 17:24 Sam James
2021-04-25 15:23 Miroslav Šulc
2021-04-03 10:49 Miroslav Šulc
2016-07-16 13:51 Patrice Clement
2016-02-21 15:45 Patrice Clement
2015-09-29 21:20 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox