Skip to content

Commits on Source 4

echo "## setup..."
git config --global user.name "Stephen Colebourne (CI)"
git config --global user.email "scolebourne@joda.org"
cd target
echo "## clone..."
git clone https://${GITHUB_TOKEN}@github.com/JodaOrg/jodaorg.github.io.git
cd jodaorg.github.io
git status
echo "## copy..."
rm -rf joda-time/
cp -R ../site joda-time/
echo "## update..."
git add -A
git status
git commit --message "Update joda-time from Travis: Build $TRAVIS_BUILD_NUMBER"
echo "## push..."
git push origin master
echo "## done"
......@@ -16,7 +16,8 @@ install:
script:
- mvn install site -e -B
after_success:
- if [[ $TRAVIS_TAG =~ ^v.*$ ]] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ]; then travis_wait 40 mvn clean install site-deploy -e -B --settings .github/maven-settings.xml; fi
- if [[ $TRAVIS_TAG =~ ^website.*$ ]] && [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ]; then chmod +x ./.github/website.sh; .github/website.sh; fi
- if [[ $TRAVIS_TAG =~ ^v.*$ ]] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ]; then chmod +x ./.github/website.sh; .github/website.sh; fi
# secure keys for GITHUB_TOKEN
env:
global:
......
......@@ -2,4 +2,4 @@
= NOTICE file corresponding to section 4d of the Apache License Version 2.0 =
=============================================================================
This product includes software developed by
Joda.org (http://www.joda.org/).
Joda.org (https://www.joda.org/).
......@@ -4,9 +4,14 @@ Joda-Time
Joda-Time provides a quality replacement for the Java date and time classes.
The design allows for multiple calendar systems, while still providing a simple API.
The 'default' calendar is the ISO8601 standard which is used by XML.
The Gregorian, Julian, Buddhist, Coptic, Ethiopic and Islamic systems are also included, and we welcome further additions.
The Gregorian, Julian, Buddhist, Coptic, Ethiopic and Islamic systems are also included.
Supporting classes include time zone, duration, format and parsing.
**Joda-time is no longer in active development except to keep timezone data up to date.**
From Java SE 8 onwards, users are asked to migrate to `java.time` (JSR-310) - a core part of the JDK which replaces this project.
For Android users, `java.time` is [added in API 26+](https://developer.android.com/reference/java/time/package-summary).
Projects needing to support lower API levels can use [the ThreeTenABP library](https://github.com/JakeWharton/ThreeTenABP).
As a flavour of Joda-Time, here's some example code:
```java
......@@ -32,38 +37,38 @@ public String getBirthMonthText(LocalDate dateOfBirth) {
}
```
Joda-Time is licensed under the business-friendly [Apache 2.0 licence](http://www.joda.org/joda-time/license.html).
Joda-Time is licensed under the business-friendly [Apache 2.0 licence](https://www.joda.org/joda-time/licenses.html).
### Documentation
Various documentation is available:
* The [home page](http://www.joda.org/joda-time/)
* Two user guides - [quick](http://www.joda.org/joda-time/quickstart.html) and [full](http://www.joda.org/joda-time/userguide.html)
* The [Javadoc](http://www.joda.org/joda-time/apidocs/index.html)
* The [FAQ](http://www.joda.org/joda-time/faq.html) list
* Information on [downloading and installing](http://www.joda.org/joda-time/installation.html) Joda-Time including release notes
* The [home page](https://www.joda.org/joda-time/)
* Two user guides - [quick](https://www.joda.org/joda-time/quickstart.html) and [full](https://www.joda.org/joda-time/userguide.html)
* The [Javadoc](https://www.joda.org/joda-time/apidocs/index.html)
* The [FAQ](https://www.joda.org/joda-time/faq.html) list
* Information on [downloading and installing](https://www.joda.org/joda-time/installation.html) Joda-Time including release notes
### Releases
[Release 2.10](http://www.joda.org/joda-time/download.html) is the current latest release.
[Release 2.10.1](https://www.joda.org/joda-time/download.html) is the current latest release.
This release is considered stable and worthy of the 2.x tag.
It depends on JDK 1.5 or later.
Available in the [Maven Central repository](http://search.maven.org/#artifactdetails|joda-time|joda-time|2.10|jar)
Available in the [Maven Central repository](https://search.maven.org/search?q=g:joda-time%20AND%20a:joda-time&core=gav)
**Maven configuration:**
```xml
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.10</version>
<version>2.10.1</version>
</dependency>
```
**Gradle configuration:**
```groovy
compile 'joda-time:joda-time:2.10'
compile 'joda-time:joda-time:2.10.1'
```
### Related projects
......@@ -73,7 +78,7 @@ Related projects at GitHub:
- https://github.com/JodaOrg/joda-time-i18n
Other related projects:
- http://www.joda.org/joda-time/related.html
- https://www.joda.org/joda-time/related.html
### Support
......
......@@ -10,13 +10,13 @@ Joda-Time is licensed under the business-friendly Apache License Version 2.
This is the same license as all of Apache, plus other open source projects such as Spring.
** Please also check out our related projects **
** http://www.joda.org/joda-time/related.html **
** https://www.joda.org/joda-time/related.html **
Release notes
-------------
From v2.9.7, Joda-Time release notes are found here:
http://www.joda.org/joda-time/changes-report.html
https://www.joda.org/joda-time/changes-report.html
Scala
......@@ -32,4 +32,4 @@ Feedback is best received using GitHub issues and Pull Requests.
https://github.com/JodaOrg/joda-time/
The Joda team
http://www.joda.org/joda-time/
https://www.joda.org/joda-time/
libjoda-time-java (2.10.1-1) unstable; urgency=medium
* New upstream release
* Standards-Version updated to 4.3.0
-- Emmanuel Bourg <ebourg@apache.org> Fri, 11 Jan 2019 13:35:30 +0100
libjoda-time-java (2.10-1) unstable; urgency=medium
* New upstream release
......
......@@ -17,7 +17,7 @@ Build-Depends:
libmaven-exec-plugin-java,
libmaven-javadoc-plugin-java,
maven-debian-helper (>= 2.0)
Standards-Version: 4.1.4
Standards-Version: 4.3.0
Vcs-Git: https://salsa.debian.org/java-team/libjoda-time-java.git
Vcs-Browser: https://salsa.debian.org/java-team/libjoda-time-java
Homepage: http://www.joda.org/joda-time
......
......@@ -8,9 +8,9 @@
<artifactId>joda-time</artifactId>
<packaging>jar</packaging>
<name>Joda-Time</name>
<version>2.10</version>
<version>2.10.1</version>
<description>Date and time library to replace JDK date handling</description>
<url>http://www.joda.org/joda-time/</url>
<url>https://www.joda.org/joda-time/</url>
<!-- ==================================================================== -->
<issueManagement>
......@@ -303,7 +303,7 @@
<licenses>
<license>
<name>Apache 2</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
......@@ -315,7 +315,7 @@
</scm>
<organization>
<name>Joda.org</name>
<url>http://www.joda.org</url>
<url>https://www.joda.org</url>
</organization>
<!-- ==================================================================== -->
......@@ -519,50 +519,6 @@
</excludes>
</configuration>
</plugin>
<!-- Setup site with reflow maven skin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<configuration>
<skipDeploy>true</skipDeploy>
</configuration>
<dependencies>
<dependency>
<groupId>lt.velykis.maven.skins</groupId>
<artifactId>reflow-velocity-tools</artifactId>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>1.7</version>
</dependency>
</dependencies>
</plugin>
<!-- Setup to deploy site to GitHub, invoked with mvn site-deploy -->
<plugin>
<groupId>com.github.github</groupId>
<artifactId>site-maven-plugin</artifactId>
<version>0.12</version>
<executions>
<execution>
<id>github-site</id>
<goals>
<goal>site</goal>
</goals>
<phase>site-deploy</phase>
</execution>
</executions>
<configuration>
<message>Create website for ${project.artifactId} v${project.version}</message>
<path>${project.artifactId}</path>
<merge>true</merge>
<server>github</server>
<repositoryOwner>JodaOrg</repositoryOwner>
<repositoryName>jodaorg.github.io</repositoryName>
<branch>refs/heads/master</branch>
</configuration>
</plugin>
<!-- Compatibility check -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
......@@ -669,11 +625,6 @@
<artifactId>maven-resources-plugin</artifactId>
<version>${maven-resources-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>${maven-site-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
......@@ -711,6 +662,22 @@
<artifactId>build-helper-maven-plugin</artifactId>
<version>${build-helper-maven-plugin.version}</version>
</plugin>
<!-- Setup site with reflow maven skin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>${maven-site-plugin.version}</version>
<configuration>
<skipDeploy>true</skipDeploy>
</configuration>
<dependencies>
<dependency>
<groupId>org.joda.external</groupId>
<artifactId>reflow-velocity-tools</artifactId>
<version>1.2</version>
</dependency>
</dependencies>
</plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
......@@ -766,15 +733,16 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>${maven-project-info-plugin.version}</version>
<version>${maven-project-info-reports-plugin.version}</version>
<reportSets>
<reportSet>
<reports>
<report>ci-management</report>
<report>dependencies</report>
<report>dependency-info</report>
<report>issue-tracking</report>
<report>license</report>
<report>project-team</report>
<report>issue-management</report>
<report>licenses</report>
<report>team</report>
<report>scm</report>
<report>summary</report>
</reports>
......@@ -824,17 +792,17 @@
<repository>
<id>sonatype-joda-staging</id>
<name>Sonatype OSS staging repository</name>
<url>http://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
<layout>default</layout>
</repository>
<snapshotRepository>
<uniqueVersion>false</uniqueVersion>
<id>sonatype-joda-snapshot</id>
<name>Sonatype OSS snapshot repository</name>
<url>http://oss.sonatype.org/content/repositories/joda-snapshots</url>
<url>https://oss.sonatype.org/content/repositories/joda-snapshots</url>
<layout>default</layout>
</snapshotRepository>
<downloadUrl>http://oss.sonatype.org/content/repositories/joda-releases</downloadUrl>
<downloadUrl>https://oss.sonatype.org/content/repositories/joda-releases</downloadUrl>
</distributionManagement>
<!-- ==================================================================== -->
......@@ -913,7 +881,7 @@
<version>1.1.1</version>
<configuration>
<releaseName>Release v${project.version}</releaseName>
<description>See the [change notes](http://www.joda.org/joda-time/changes-report.html) for more information.</description>
<description>See the [change notes](https://www.joda.org/joda-time/changes-report.html) for more information.</description>
<tag>v${project.version}</tag>
<overwriteArtifact>true</overwriteArtifact>
<fileSets>
......@@ -995,29 +963,29 @@
<!-- ==================================================================== -->
<properties>
<!-- Plugin version numbers -->
<build-helper-maven-plugin.version>1.12</build-helper-maven-plugin.version>
<build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version>
<maven-assembly-plugin.version>3.1.0</maven-assembly-plugin.version>
<maven-changes-plugin.version>2.12.1</maven-changes-plugin.version>
<maven-checkstyle-plugin.version>2.17</maven-checkstyle-plugin.version>
<maven-clean-plugin.version>3.0.0</maven-clean-plugin.version>
<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
<maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
<maven-dependency-plugin.version>3.0.2</maven-dependency-plugin.version>
<maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
<maven-enforcer-plugin.version>3.0.0-M1</maven-enforcer-plugin.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
<maven-install-plugin.version>2.5.2</maven-install-plugin.version>
<maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
<maven-jar-plugin.version>3.1.0</maven-jar-plugin.version>
<maven-javadoc-plugin.version>3.0.0-M1</maven-javadoc-plugin.version>
<maven-jxr-plugin.version>2.5</maven-jxr-plugin.version>
<maven-plugin-plugin.version>3.5.1</maven-plugin-plugin.version>
<maven-pmd-plugin.version>3.9.0</maven-pmd-plugin.version>
<maven-project-info-reports-plugin.version>2.9</maven-project-info-reports-plugin.version>
<maven-plugin-plugin.version>3.5.2</maven-plugin-plugin.version>
<maven-pmd-plugin.version>3.10.0</maven-pmd-plugin.version>
<maven-project-info-reports-plugin.version>3.0.0</maven-project-info-reports-plugin.version>
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
<maven-repository-plugin.version>2.4</maven-repository-plugin.version>
<maven-resources-plugin.version>3.0.2</maven-resources-plugin.version>
<!-- v3.6 doesn't work with theme -->
<maven-site-plugin.version>3.4</maven-site-plugin.version>
<maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
<maven-site-plugin.version>3.7.1</maven-site-plugin.version>
<maven-source-plugin.version>3.0.1</maven-source-plugin.version>
<!-- Stick with this version of surefire, see Java 5 comments above -->
<maven-surefire-report-plugin.version>2.21.0</maven-surefire-report-plugin.version>
<maven-toolchains-plugin.version>1.1</maven-toolchains-plugin.version>
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
......@@ -1039,6 +1007,6 @@
<!-- Other properties -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<tz.database.version>2018e</tz.database.version>
<tz.database.version>2018g</tz.database.version>
</properties>
</project>
......@@ -8,6 +8,18 @@
<body>
<!-- types are add, fix, remove, update -->
<release version="2.10.1" date="2018-10-27" description="v2.10.1">
<action dev="jodastephen" type="update">
DateTimeZone data updated to version 2018g.
</action>
<action dev="jodastephen" type="fix">
Fix time-zone compiler for Namibia. Oh I do love tzdb.
Fixes #485.
</action>
<action dev="jodastephen" type="fix">
Fix time-zone compiler for Tokyo. Oh I do love tzdb.
</action>
</release>
<release version="2.10" date="2018-05-30" description="v2.10">
<action dev="jodastephen" type="update">
DateTimeZone data updated to version 2018e.
......
......@@ -5,19 +5,19 @@ Specification-Vendor: Joda.org
Specification-Version: 2.10
Implementation-Vendor: Joda.org
Implementation-Title: org.joda.time
Implementation-Version: 2.10
Implementation-Version: 2.10.1
Implementation-Vendor-Id: org.joda
Bundle-ManifestVersion: 2
Bundle-Vendor: Joda.org
Bundle-Name: Joda-Time
Bundle-SymbolicName: joda-time
Bundle-Version: 2.10
Export-Package: org.joda.time;version=2.10,
org.joda.time.base;version=2.10,
org.joda.time.chrono;version=2.10,
org.joda.time.convert;version=2.10,
org.joda.time.field;version=2.10,
org.joda.time.format;version=2.10,
org.joda.time.tz;version=2.10
Bundle-Version: 2.10.1
Export-Package: org.joda.time;version=2.10.1,
org.joda.time.base;version=2.10.1,
org.joda.time.chrono;version=2.10.1,
org.joda.time.convert;version=2.10.1,
org.joda.time.field;version=2.10.1,
org.joda.time.format;version=2.10.1,
org.joda.time.tz;version=2.10.1
Bundle-License: Apache 2.0
Bundle-DocURL: http://www.joda.org/joda-time/
Bundle-DocURL: https://www.joda.org/joda-time/
......@@ -460,7 +460,7 @@ public class DateTimeUtils {
/**
* Calculates the astronomical Julian Day for an instant.
* <p>
* The <a href="http://en.wikipedia.org/wiki/Julian_day">Julian day</a> is a well-known
* The <a href="https://en.wikipedia.org/wiki/Julian_day">Julian day</a> is a well-known
* system of time measurement for scientific use by the astronomy community.
* It expresses the interval of time in days and fractions of a day since
* January 1, 4713 BC (Julian) Greenwich noon.
......@@ -476,7 +476,7 @@ public class DateTimeUtils {
*/
public static final double toJulianDay(long epochMillis) {
// useful links
// http://en.wikipedia.org/wiki/Julian_day#cite_note-13 - Wikipedia
// https://en.wikipedia.org/wiki/Julian_day#cite_note-13 - Wikipedia
// http://aa.usno.navy.mil/data/docs/JulianDate.php" - USNO
// http://users.zoominternet.net/~matto/Java/Julian%20Date%20Converter.htm - Julian Date Converter by Matt Oltersdorf
// http://ssd.jpl.nasa.gov/tc.cgi#top - CalTech
......
......@@ -75,7 +75,7 @@ import org.joda.time.tz.ZoneInfoProvider;
* </ul>
* <p>
* Unlike the Java TimeZone class, DateTimeZone is immutable. It also only
* supports long format time zone ids. Thus EST and ECT are not accepted.
* supports long format time zone ids. Thus PST and ECT are not accepted.
* However, the factory that accepts a TimeZone will attempt to convert from
* the old short id to a suitable long id.
* <p>
......
......@@ -41,7 +41,7 @@ import org.joda.time.field.SkipDateTimeField;
* <p>
* CopticChronology is thread-safe and immutable.
*
* @see <a href="http://en.wikipedia.org/wiki/Coptic_calendar">Wikipedia</a>
* @see <a href="https://en.wikipedia.org/wiki/Coptic_calendar">Wikipedia</a>
* @see JulianChronology
*
* @author Brian S O'Neill
......
......@@ -41,7 +41,7 @@ import org.joda.time.field.SkipDateTimeField;
* <p>
* EthiopicChronology is thread-safe and immutable.
*
* @see <a href="http://en.wikipedia.org/wiki/Ethiopian_calendar">Wikipedia</a>
* @see <a href="https://en.wikipedia.org/wiki/Ethiopian_calendar">Wikipedia</a>
*
* @author Brian S O'Neill
* @author Stephen Colebourne
......
......@@ -32,7 +32,7 @@ import org.joda.time.DateTimeZone;
* <p>
* GregorianChronology is thread-safe and immutable.
*
* @see <a href="http://en.wikipedia.org/wiki/Gregorian_calendar">Wikipedia</a>
* @see <a href="https://en.wikipedia.org/wiki/Gregorian_calendar">Wikipedia</a>
* @see JulianChronology
* @see GJChronology
*
......
......@@ -57,7 +57,7 @@ import org.joda.time.DateTimeZone;
* <p>
* IslamicChronology is thread-safe and immutable.
*
* @see <a href="http://en.wikipedia.org/wiki/Islamic_calendar">Wikipedia</a>
* @see <a href="https://en.wikipedia.org/wiki/Islamic_calendar">Wikipedia</a>
*
* @author Stephen Colebourne
* @since 1.2
......
......@@ -37,7 +37,7 @@ import org.joda.time.field.SkipDateTimeField;
* <p>
* JulianChronology is thread-safe and immutable.
*
* @see <a href="http://en.wikipedia.org/wiki/Julian_calendar">Wikipedia</a>
* @see <a href="https://en.wikipedia.org/wiki/Julian_calendar">Wikipedia</a>
* @see GregorianChronology
* @see GJChronology
*
......
......@@ -32,6 +32,7 @@ import java.util.Set;
import org.joda.time.Chronology;
import org.joda.time.DateTime;
import org.joda.time.DateTimeConstants;
import org.joda.time.DateTimeUtils;
import org.joda.time.DateTimeZone;
import org.joda.time.Period;
......@@ -584,6 +585,8 @@ public class DateTimeZoneBuilder {
next = setDayOfWeek(chrono, next);
}
}
next = chrono.millisOfDay().set(next, 0);
next = chrono.millisOfDay().add(next, iMillisOfDay);
// Convert from local time to UTC.
return next - offset;
......@@ -626,6 +629,8 @@ public class DateTimeZoneBuilder {
prev = setDayOfWeek(chrono, prev);
}
}
prev = chrono.millisOfDay().set(prev, 0);
prev = chrono.millisOfDay().add(prev, iMillisOfDay);
// Convert from local time to UTC.
return prev - offset;
......
......@@ -52,7 +52,7 @@ import org.joda.time.format.ISODateTimeFormat;
* <p>
* Although this tool is similar to zic, the binary formats are not
* compatible. The latest IANA time zone database files may be obtained
* <a href="http://www.iana.org/time-zones">here</a>.
* <a href="https://www.iana.org/time-zones">here</a>.
* <p>
* ZoneInfoCompiler is mutable and not thread-safe, although the main method
* may be safely invoked by multiple threads.
......@@ -722,6 +722,17 @@ public class ZoneInfoCompiler {
iLetterS = parseOptional(st.nextToken());
}
// creates a rule to go before the specified rule
Rule(Rule after) {
iName = after.iName;
iFromYear = 1800;
iToYear = after.iFromYear;
iType = null;
iDateTimeOfYear = after.iDateTimeOfYear; // does not matter
iSaveMillis = 0;
iLetterS = after.iLetterS;
}
/**
* Adds a recurring savings rule to the builder.
*/
......@@ -803,6 +814,7 @@ public class ZoneInfoCompiler {
// if negative SAVE values, then patch standard millis and name format
if (negativeSave < 0) {
System.out.println("Fixed negative save values for rule '" + iRules.get(0).iName + "'");
standardMillis += negativeSave;
int slashPos = nameFormat.indexOf("/");
if (slashPos > 0) {
......@@ -811,6 +823,12 @@ public class ZoneInfoCompiler {
}
builder.setStandardOffset(standardMillis);
// add a fake rule that predates all other rules to ensure standard=summer (see Namibia)
if (negativeSave < 0) {
Rule rule = new Rule(iRules.get(0));
rule.addRecurring(builder, negativeSave, nameFormat);
}
// add each rule, passing through the negative save to alter the actual iSaveMillis value that is used
for (int i = 0; i < iRules.size(); i++) {
Rule rule = iRules.get(i);
......@@ -892,6 +910,7 @@ public class ZoneInfoCompiler {
builder.setFixedSavings(zone.iFormat, saveMillis);
}
catch (Exception e) {
// Zone is using a RuleSet for this segment of the timeline
RuleSet rs = ruleSets.get(zone.iRules);
if (rs == null) {
throw new IllegalArgumentException
......
The data files in this directory were obtained from the public IANA time zone database,
http://www.iana.org/time-zones, version 2018e.
https://www.iana.org/time-zones, version 2018g.