Skip to content

LUCENE-9923: remove always-changing timestamp from ASCIITLD.jflex generation #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 10, 2021
Merged

LUCENE-9923: remove always-changing timestamp from ASCIITLD.jflex generation #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c104310
LUCENE-9922: checksum files should use a deterministic sort order
rmuir Apr 10, 2021
877d6f2
LUCENE-9923: remove always-changing timestamp from ASCIITLD.jflex gen…
rmuir Apr 10, 2021
8077956
Merge branch 'main' into LUCENE-9923
rmuir Apr 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lucene/analysis/common/src/generated/checksums/generateTlds.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
}
4 changes: 2 additions & 2 deletions lucene/analysis/common/src/generated/checksums/generateUAX29URLEmailTokenizer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
}
3 changes: 1 addition & 2 deletions lucene/analysis/common/src/java/org/apache/lucene/analysis/email/ASCIITLD.jflex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "." (
Expand Down
6 changes: 1 addition & 5 deletions ...sis/common/src/tools/java/org/apache/lucene/analysis/standard/GenerateJflexTLDMacros.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
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;
Expand Down Expand Up @@ -245,10 +244,7 @@ private void writeOutput() throws IOException {
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);
Expand Down