You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2021/04/10 20:13:39 UTC
[lucene] branch main updated: LUCENE-9923: remove always-changing
timestamp from ASCIITLD.jflex generation (#76)
This is an automated email from the ASF dual-hosted git repository.
rmuir pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/lucene.git
The following commit(s) were added to refs/heads/main by this push:
new f333351 LUCENE-9923: remove always-changing timestamp from ASCIITLD.jflex generation (#76)
f333351 is described below
commit f33335157d0cdeb8c3600b3ef98683d12c4eaf03
Author: Robert Muir <rm...@apache.org>
AuthorDate: Sat Apr 10 16:13:29 2021 -0400
LUCENE-9923: remove always-changing timestamp from ASCIITLD.jflex generation (#76)
This makes regenerate idempotent by removing the new Date() from the
output.
We already have the root.zone's Last-Modified date, which is the one
that matters and only changes when the root.zone changes.
---
lucene/analysis/common/src/generated/checksums/generateTlds.json | 4 ++--
.../src/generated/checksums/generateUAX29URLEmailTokenizer.json | 4 ++--
.../common/src/java/org/apache/lucene/analysis/email/ASCIITLD.jflex | 3 +--
.../org/apache/lucene/analysis/standard/GenerateJflexTLDMacros.java | 6 +-----
4 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/lucene/analysis/common/src/generated/checksums/generateTlds.json b/lucene/analysis/common/src/generated/checksums/generateTlds.json
index 654973d..a361e36 100644
--- a/lucene/analysis/common/src/generated/checksums/generateTlds.json
+++ b/lucene/analysis/common/src/generated/checksums/generateTlds.json
@@ -1,4 +1,4 @@
{
- "lucene/analysis/common/src/java/org/apache/lucene/analysis/email/ASCIITLD.jflex": "b0a75dc29e472c7e8667c4972e897b2f9527793d",
+ "lucene/analysis/common/src/java/org/apache/lucene/analysis/email/ASCIITLD.jflex": "b1af8dc8532d853fcf1acde1f6c629750b296b40",
"lucene/analysis/common/src/test/org/apache/lucene/analysis/email/TLDs.txt": "b346a80f511b64a59d556eb3ef58cf396e98c631"
-}
\ No newline at end of file
+}
diff --git a/lucene/analysis/common/src/generated/checksums/generateUAX29URLEmailTokenizer.json b/lucene/analysis/common/src/generated/checksums/generateUAX29URLEmailTokenizer.json
index b96bc1b..269355c 100644
--- a/lucene/analysis/common/src/generated/checksums/generateUAX29URLEmailTokenizer.json
+++ b/lucene/analysis/common/src/generated/checksums/generateUAX29URLEmailTokenizer.json
@@ -1,6 +1,6 @@
{
"gradle/generation/jflex/skeleton.disable.buffer.expansion.txt": "68263ff0a014904c6e89b040d868d8f399408908",
- "lucene/analysis/common/src/java/org/apache/lucene/analysis/email/ASCIITLD.jflex": "b0a75dc29e472c7e8667c4972e897b2f9527793d",
+ "lucene/analysis/common/src/java/org/apache/lucene/analysis/email/ASCIITLD.jflex": "b1af8dc8532d853fcf1acde1f6c629750b296b40",
"lucene/analysis/common/src/java/org/apache/lucene/analysis/email/UAX29URLEmailTokenizerImpl.java": "e437900d9570ca007f9c02c9ea286222b644c329",
"lucene/analysis/common/src/java/org/apache/lucene/analysis/email/UAX29URLEmailTokenizerImpl.jflex": "56a751d27e481fb55388f91ebf34f5a0cb8cb1b2"
-}
\ No newline at end of file
+}
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/email/ASCIITLD.jflex b/lucene/analysis/common/src/java/org/apache/lucene/analysis/email/ASCIITLD.jflex
index cd657ad..1d9b4b3 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/email/ASCIITLD.jflex
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/email/ASCIITLD.jflex
@@ -16,8 +16,7 @@
*/
// Generated from IANA Root Zone Database <https://www.internic.net/zones/root.zone>
// file version from 2021 Apr 10, Sat 17:37:00 Coordinated Universal Time
-// generated on 2021 Apr 10, Sat 17:55:26 Coordinated Universal Time
-// by org.apache.lucene.analysis.standard.GenerateJflexTLDMacros
+// generated by org.apache.lucene.analysis.standard.GenerateJflexTLDMacros
// LUCENE-8278: None of the TLDs in {ASCIITLD} is a 1-character-shorter prefix of another TLD
ASCIITLD = "." (
diff --git a/lucene/analysis/common/src/tools/java/org/apache/lucene/analysis/standard/GenerateJflexTLDMacros.java b/lucene/analysis/common/src/tools/java/org/apache/lucene/analysis/standard/GenerateJflexTLDMacros.java
index 00a60b5..c8c2302 100644
--- a/lucene/analysis/common/src/tools/java/org/apache/lucene/analysis/standard/GenerateJflexTLDMacros.java
+++ b/lucene/analysis/common/src/tools/java/org/apache/lucene/analysis/standard/GenerateJflexTLDMacros.java
@@ -30,7 +30,6 @@ import java.nio.file.Paths;
import java.text.DateFormat;
import java.util.ArrayList;
import java.util.Comparator;
-import java.util.Date;
import java.util.List;
import java.util.Locale;
import java.util.SortedMap;
@@ -245,10 +244,7 @@ public class GenerateJflexTLDMacros {
writer.write(dateFormat.format(tldFileLastModified));
writer.write(NL);
}
- writer.write("// generated on ");
- writer.write(dateFormat.format(new Date()));
- writer.write(NL);
- writer.write("// by ");
+ writer.write("// generated by ");
writer.write(this.getClass().getName());
writer.write(NL);
writer.write(NL);