summaryrefslogtreecommitdiff
path: root/dev-java/stringtemplate/files
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java/stringtemplate/files')
-rw-r--r--dev-java/stringtemplate/files/stringtemplate-3.2.1-TestStringTemplate.patch11
-rw-r--r--dev-java/stringtemplate/files/stringtemplate-4.3.4-BaseTest-javac-source-target.patch26
-rw-r--r--dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21+-TestRenderers.patch41
3 files changed, 0 insertions, 78 deletions
diff --git a/dev-java/stringtemplate/files/stringtemplate-3.2.1-TestStringTemplate.patch b/dev-java/stringtemplate/files/stringtemplate-3.2.1-TestStringTemplate.patch
deleted file mode 100644
index e12b3c63b26a..000000000000
--- a/dev-java/stringtemplate/files/stringtemplate-3.2.1-TestStringTemplate.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-https://bugs.gentoo.org/916571
---- a/test/org/antlr/stringtemplate/test/TestStringTemplate.java
-+++ b/test/org/antlr/stringtemplate/test/TestStringTemplate.java
-@@ -28,6 +28,7 @@
- package org.antlr.stringtemplate.test;
-
- import org.antlr.stringtemplate.*;
-+import org.antlr.stringtemplate.StringTemplate;
- import org.antlr.stringtemplate.language.AngleBracketTemplateLexer;
- import org.antlr.stringtemplate.language.DefaultTemplateLexer;
- import org.junit.Test;
diff --git a/dev-java/stringtemplate/files/stringtemplate-4.3.4-BaseTest-javac-source-target.patch b/dev-java/stringtemplate/files/stringtemplate-4.3.4-BaseTest-javac-source-target.patch
deleted file mode 100644
index 7c31d6b5a893..000000000000
--- a/dev-java/stringtemplate/files/stringtemplate-4.3.4-BaseTest-javac-source-target.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4e12a210f2b933c92ded6ee141f6399144a866f5 Mon Sep 17 00:00:00 2001
-From: Yuan Liao <liaoyuan@gmail.com>
-Date: Mon, 24 Jan 2022 06:17:03 -0800
-Subject: [PATCH] BaseTest.java: Change javac source/target to 1.8 for JDK 17
-
-JDK 17 no longer supports 1.6 as the source or target version.
-
-Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
----
- test/org/stringtemplate/v4/test/BaseTest.java | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/stringtemplate4-ST4-4.3.4/test/org/stringtemplate/v4/test/BaseTest.java
-+++ b/stringtemplate4-ST4-4.3.4/test/org/stringtemplate/v4/test/BaseTest.java
-@@ -258,7 +258,7 @@ public abstract class BaseTest {
- fileManager.getJavaFileObjectsFromFiles(files);
-
- Iterable<String> compileOptions =
-- Arrays.asList("-g", "-source", "1.6", "-target", "1.6", "-implicit:class", "-Xlint:-options", "-d", workingDirName, "-cp", workingDirName+pathSep+CLASSPATH);
-+ Arrays.asList("-g", "-source", "1.8", "-target", "1.8", "-implicit:class", "-Xlint:-options", "-d", workingDirName, "-cp", workingDirName+pathSep+CLASSPATH);
-
- JavaCompiler.CompilationTask task =
- compiler.getTask(null, fileManager, null, compileOptions, null,
---
-2.34.1
-
diff --git a/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21+-TestRenderers.patch b/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21+-TestRenderers.patch
deleted file mode 100644
index 22b271671b8d..000000000000
--- a/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21+-TestRenderers.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-there are different space characters used in java 21 (narrow space)
-
---- a/stringtemplate4-ST4-4.3.4/test/org/stringtemplate/v4/test/TestRenderers.java
-+++ b/stringtemplate4-ST4-4.3.4/test/org/stringtemplate/v4/test/TestRenderers.java
-@@ -77,6 +77,8 @@ public class TestRenderers extends BaseTest {
- String expecting = "datetime: 7/5/05, 12:00 AM";
- if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) {
- expecting = "datetime: 7/5/05 12:00 AM";
-+ } else if ( Integer.valueOf(javaVersion.replaceAll("^(\\d+).*", "$1")) >= 21 ) {
-+ expecting = "datetime: 7/5/05, 12:00 AM";
- }
- String result = st.render();
- assertEquals(expecting, result);
-@@ -106,6 +108,8 @@ public class TestRenderers extends BaseTest {
- String expecting = " datetime: 7/5/05, 12:00 AM ";
- if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) {
- expecting = " datetime: 7/5/05 12:00 AM ";
-+ } else if ( Integer.valueOf(javaVersion.replaceAll("^(\\d+).*", "$1")) >= 21 ) {
-+ expecting = " datetime: 7/5/05, 12:00 AM ";
- }
- String result = st.render();
- assertEquals(expecting, result);
-@@ -126,6 +130,8 @@ public class TestRenderers extends BaseTest {
- String expecting = " datetime: Tuesday, July 5, 2005 at 12:00:00 AM Pacific Daylight Time ";
- if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) {
- expecting = " datetime: Tuesday, July 5, 2005 12:00:00 AM PDT ";
-+ } else if ( Integer.valueOf(javaVersion.replaceAll("^(\\d+).*", "$1")) >= 21 ) {
-+ expecting = " datetime: Tuesday, July 5, 2005, 12:00:00 AM Pacific Daylight Time ";
- }
- String result = st.render();
- assertEquals(expecting, result);
-@@ -160,6 +166,9 @@ public class TestRenderers extends BaseTest {
- ST st = group.getInstanceOf("dateThing");
- st.add("created", new GregorianCalendar(2005, 7 - 1, 5));
- String expecting = " time: 12:00:00 AM ";
-+ if ( Integer.valueOf(javaVersion.replaceAll("^(\\d+).*", "$1")) >= 21 ) {
-+ expecting = " time: 12:00:00 AM ";
-+ }
- String result = st.render();
- assertEquals(expecting, result);
- }