Merge

foal · Dec 23, 2023 · b0ee0eb · b0ee0eb
2 parents 38e8331 + 0a5403e
commit b0ee0eb
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 6 deletions.
diff --git a/pom/pom.xml b/pom/pom.xml
@@ -118,7 +118,7 @@
   <!-- ==================================================================== -->
 	<licenses>
 		<license>
-			<name>BSD 3-clause</name>
+      <name>BSD-3-Clause</name>
       <url>https://raw.githubusercontent.com/ThreeTen/threetenbp/main/LICENSE.txt</url>
 			<distribution>repo</distribution>
 		</license>
@@ -378,7 +378,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<linkXRef>false</linkXRef>
-    <tz.database.version>2022egtz</tz.database.version>
+    <tz.database.version>2023cgtz</tz.database.version>
 	-->
 		<gwt28-typedarrays.ver>1.2</gwt28-typedarrays.ver>
 		<gwt28-nio.ver>1.1</gwt28-nio.ver>

diff --git a/time/src/changes/changes.xml b/time/src/changes/changes.xml
@@ -8,6 +8,31 @@
   <body>
 
     <!-- types are add, fix, remove, update -->
+    <release version="1.6.8" date="2023-03-30" description="v1.6.8">
+      <action dev="jodastephen" type="update" >
+        Update to time-zone data 2023cgtz.
+      </action>
+    </release>
+    <release version="1.6.7" date="2023-03-24" description="v1.6.7">
+      <action dev="jodastephen" type="update" >
+        Update to time-zone data 2023bgtz.
+      </action>
+    </release>
+    <release version="1.6.6" date="2023-03-23" description="v1.6.6">
+      <action dev="jodastephen" type="update" >
+        Update to time-zone data 2023agtz.
+      </action>
+    </release>
+    <release version="1.6.5" date="2022-12-06" description="v1.6.5">
+      <action dev="jodastephen" type="update" >
+        Update to time-zone data 2022ggtz.
+      </action>
+    </release>
+    <release version="1.6.4" date="2022-10-29" description="v1.6.4">
+      <action dev="jodastephen" type="update" >
+        Update to time-zone data 2022fgtz.
+      </action>
+    </release>
     <release version="1.6.3" date="2022-10-13" description="v1.6.3">
       <action dev="jodastephen" type="update" >
         Update to time-zone data 2022egtz.

diff --git a/time/src/site/markdown/index.md b/time/src/site/markdown/index.md
@@ -10,7 +10,7 @@ use the JSR-310 API on Java SE 6 and 7.
 The backport should be referred to using the "ThreeTen" name.
 The backport is curated by the primary author of the Java 8 date and time library, [Stephen Colebourne](https://www.joda.org/).
 
-ThreeTen-Backport is licensed under the business-friendly [BSD 3-clause license](license.html).
+ThreeTen-Backport is licensed under the business-friendly [BSD-3-Clause license](license.html).
 
 
 ## <i></i> Features
@@ -42,7 +42,7 @@ Various documentation is available:
 
 ## <i></i> Releases
 
-Release 1.6.3 is the latest release.
+Release 1.6.8 is the latest release.
 It is considered to be stable and usable in production.
 
 The project runs on Java SE 6 (or later) and has no [dependencies](dependencies.html).
@@ -58,7 +58,7 @@ Available in [Maven Central](https://search.maven.org/search?q=g:org.threeten%20
 <dependency>
   <groupId>org.threeten</groupId>
   <artifactId>threetenbp</artifactId>
-  <version>1.6.3</version>
+  <version>1.6.8</version>
 </dependency>
 ```
 

diff --git a/tzdb/src/main/resources/org/jresearch/threetenbp/gwt/tzdb/client/loader/TZDB.txt b/tzdb/src/main/resources/org/jresearch/threetenbp/gwt/tzdb/client/loader/TZDB.txt