You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2018/06/20 13:47:58 UTC
[sis] 03/35: Replace reference to trunk by reference to master,
and avoid reference to JDK8 branch.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 3e7278cedf780e7a18f802643950bfde4f9fa0d3
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Wed Jun 20 14:38:30 2018 +0200
Replace reference to trunk by reference to master, and avoid reference to JDK8 branch.
---
.../src/main/java/org/apache/sis/console/package-info.java | 2 +-
.../main/java/org/apache/sis/internal/simple/SimpleCitation.java | 2 +-
.../src/test/java/org/apache/sis/metadata/iso/APIVerifier.java | 4 ++--
.../resources/org/apache/sis/metadata/iso/api-changes.properties | 2 +-
.../src/main/java/org/apache/sis/internal/system/Supervisor.java | 2 +-
.../java/org/apache/sis/internal/util/StandardDateFormat.java | 8 --------
.../main/java/org/apache/sis/internal/util/TemporalUtilities.java | 2 +-
.../src/main/java/org/apache/sis/util/CharSequences.java | 2 +-
.../org/apache/sis/util/collection/BackingStoreException.java | 5 ++---
.../java/org/apache/sis/internal/util/StandardDateFormatTest.java | 2 --
pom.xml | 8 ++++----
11 files changed, 14 insertions(+), 25 deletions(-)
diff --git a/application/sis-console/src/main/java/org/apache/sis/console/package-info.java b/application/sis-console/src/main/java/org/apache/sis/console/package-info.java
index 5b597a5..37efd23 100644
--- a/application/sis-console/src/main/java/org/apache/sis/console/package-info.java
+++ b/application/sis-console/src/main/java/org/apache/sis/console/package-info.java
@@ -21,7 +21,7 @@
*
* <div class="section">SIS installation on remote machines</div>
* Some sub-commands can operate on SIS installation on remote machines, provided that Apache SIS
- * has been <a href="http://sis.apache.org/branches.html#trunk">compiled with MBeans enabled</a>
+ * has been <a href="http://sis.apache.org/branches.html#master">compiled with MBeans enabled</a>
* and that the remote Java Virtual Machine has been started with the following options:
*
* {@preformat shell
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/internal/simple/SimpleCitation.java b/core/sis-metadata/src/main/java/org/apache/sis/internal/simple/SimpleCitation.java
index 266a03f..7d49311 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/simple/SimpleCitation.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/simple/SimpleCitation.java
@@ -80,7 +80,7 @@ public class SimpleCitation implements Citation, Serializable {
/**
* Methods inherited from the {@link Citation} interface which are not of interest to this
- * {@code SimpleCitation} implementation. Those methods may be removed in the JDK8 branch.
+ * {@code SimpleCitation} implementation.
*
* @return an empty list.
*/
diff --git a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/APIVerifier.java b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/APIVerifier.java
index b053755..cf61d90 100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/APIVerifier.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/APIVerifier.java
@@ -45,8 +45,8 @@ import static org.junit.Assert.*;
*
* <p>The content of the {@code api-changes.properties} files is typically empty on Apache SIS
* branches that use a snapshot version of GeoAPI, thus making this test a no-op. However the
- * {@code api-changes.properties} file content is non-empty on trunk if the GeoAPI release used
- * by the trunk is behind the snapshot developments.</p>
+ * {@code api-changes.properties} file content is non-empty on master if the GeoAPI release used
+ * by the master branch is behind the snapshot developments.</p>
*
* @author Martin Desruisseaux (Geomatys)
* @version 0.5
diff --git a/core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/api-changes.properties b/core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/api-changes.properties
index 6a9e5cc..8476d40 100644
--- a/core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/api-changes.properties
+++ b/core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/api-changes.properties
@@ -6,7 +6,7 @@
# This properties file is automatically generated by a comparison between the GeoAPI
# 3.0 and 3.1 JAR files, with minor manual editions. This file is used for checking
# annotation validity in Apache SIS implementation. This file should be empty in SIS
-# branches implementing latest GeoAPI snapshots, and may be non-empty on the trunk
+# branches implementing latest GeoAPI snapshots, and may be non-empty on the master
# when the changes are not yet incorporated in a standard release.
#
# Legend:
diff --git a/core/sis-utility/src/main/java/org/apache/sis/internal/system/Supervisor.java b/core/sis-utility/src/main/java/org/apache/sis/internal/system/Supervisor.java
index b541d93..f605c96 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/internal/system/Supervisor.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/internal/system/Supervisor.java
@@ -60,7 +60,7 @@ public final class Supervisor extends StandardMBean implements SupervisorMBean {
* Whatever JMX agent is enabled. Setting this variable to {@code false} allows the
* Java compiler to omit any dependency to this {@code Supervisor} class.
*
- * @see <a href="http://sis.apache.org/branches.html#trunk">Differences between SIS trunk and branches</a>
+ * @see <a href="http://sis.apache.org/branches.html#master">Differences between SIS master and branches</a>
*/
static final boolean ENABLED = true;
diff --git a/core/sis-utility/src/main/java/org/apache/sis/internal/util/StandardDateFormat.java b/core/sis-utility/src/main/java/org/apache/sis/internal/util/StandardDateFormat.java
index 8422aed..a0f7abe 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/internal/util/StandardDateFormat.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/internal/util/StandardDateFormat.java
@@ -49,13 +49,6 @@ import java.time.format.SignStyle;
* the time is optional. For this class, "Standard" is interpreted as "close to ISO 19162 requirements",
* which is not necessarily identical to other ISO standards.
*
- * <p>This class is implemented in two different way depending on the Apache SIS branch:</p>
- * <ul>
- * <li>Branches for JDK8 and more use {@link java.time.format.DateTimeFormatter}.</li>
- * <li>Branches for older JDKs use {@link java.text.SimpleDateFormat} together with some hacks
- * for allowing some fields to be optional (for example adding ":00" is seconds are missing).</li>
- * </ul>
- *
* External users should use nothing else than the parsing and formating methods.
* The methods for configuring the {@code DateFormat} instances may or may not work
* depending on the branch.
@@ -74,7 +67,6 @@ import java.time.format.SignStyle;
public final class StandardDateFormat extends DateFormat {
/**
* For cross-version compatibility.
- * This number must be different between the JDK8 branch and pre-JDK8 branches.
*/
private static final long serialVersionUID = 2764313272939921664L;
diff --git a/core/sis-utility/src/main/java/org/apache/sis/internal/util/TemporalUtilities.java b/core/sis-utility/src/main/java/org/apache/sis/internal/util/TemporalUtilities.java
index 3bf2801..c72e1cd 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/internal/util/TemporalUtilities.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/internal/util/TemporalUtilities.java
@@ -44,7 +44,7 @@ public final class TemporalUtilities extends Static {
*
* This constant will be removed after SIS release a sis-temporal module.
*
- * @see <a href="http://sis.apache.org/branches.html#trunk">Differences between SIS trunk and branches</a>
+ * @see <a href="http://sis.apache.org/branches.html#master">Differences between SIS master and branches</a>
*/
public static final boolean REPORT_MISSING_MODULE = true;
diff --git a/core/sis-utility/src/main/java/org/apache/sis/util/CharSequences.java b/core/sis-utility/src/main/java/org/apache/sis/util/CharSequences.java
index ea9a334..a2431e4 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/util/CharSequences.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/util/CharSequences.java
@@ -699,7 +699,7 @@ search: for (; fromIndex <= toIndex; fromIndex++) {
* </ul>
*
* <div class="note"><b>Performance note:</b>
- * Prior JDK8 this method was relatively cheap because all string instances created by
+ * Prior JDK8 this method was usually cheap because all string instances created by
* {@link String#substring(int,int)} shared the same {@code char[]} internal array.
* However since JDK8, the new {@code String} implementation copies the data in new arrays.
* Consequently it is better to use index rather than this method for splitting large {@code String}s.
diff --git a/core/sis-utility/src/main/java/org/apache/sis/util/collection/BackingStoreException.java b/core/sis-utility/src/main/java/org/apache/sis/util/collection/BackingStoreException.java
index 2273cca..297c4f5 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/util/collection/BackingStoreException.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/util/collection/BackingStoreException.java
@@ -44,9 +44,8 @@ import java.sql.SQLException;
* <div class="section">Relationship with {@code java.io.UncheckedIOException}</div>
* JDK8 provides a {@link java.io.UncheckedIOException} which partially overlaps
* the purpose of this {@code BackingStoreException}. While Apache SIS still uses
- * {@code BackingStoreException} as a general mechanism for any kind of checked
- * exceptions, client code targeting JDK8 would be well advised to catch both kind
- * of exceptions for robustness.
+ * {@code BackingStoreException} as a general mechanism for any kind of checked exceptions,
+ * client code would be well advised to catch both kind of exceptions for robustness.
*
* @author Martin Desruisseaux (IRD, Geomatys)
* @version 0.3
diff --git a/core/sis-utility/src/test/java/org/apache/sis/internal/util/StandardDateFormatTest.java b/core/sis-utility/src/test/java/org/apache/sis/internal/util/StandardDateFormatTest.java
index 7b2f93d..cb55e8a 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/internal/util/StandardDateFormatTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/internal/util/StandardDateFormatTest.java
@@ -51,8 +51,6 @@ public final strictfp class StandardDateFormatTest extends TestCase {
/**
* Tests parsing a date.
- * Since the implementation is completely different in JDK8 branch than in previous branch,
- * a key purpose of this test is to ensure that the parsing is consistent between the branches.
*
* @throws ParseException if an error occurred while parsing the date.
*/
diff --git a/pom.xml b/pom.xml
index 63e8687..e8558c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,12 +65,12 @@
============================================================== -->
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/sis/trunk
+ scm:git:https://gitbox.apache.org/repos/asf/sis.git
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/sis/trunk
+ scm:git:https://gitbox.apache.org/repos/asf/sis.git
</developerConnection>
- <url>http://svn.apache.org/viewvc/sis/trunk</url>
+ <url>https://gitbox.apache.org/repos/asf?p=sis.git</url>
</scm>
<ciManagement>
@@ -935,7 +935,7 @@
</pluginRepositories>
<!-- Used for GeoAPI snapshots only.
- Shall be removed on SIS trunk. -->
+ Shall be removed on SIS master. -->
<repositories>
<repository>
<id>geotoolkit</id>