Author: desruisseaux
Date: Thu Feb 5 17:47:55 2015
New Revision: 1657641
URL: http://svn.apache.org/r1657641
Log:
Merge from the JDK6 branch.
Modified:
sis/trunk/ (props changed)
sis/trunk/core/sis-build-helper/src/main/ant/prepare-release.xml
sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LocalisedCharacterString.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/TextGroup.java
sis/trunk/pom.xml
Propchange: sis/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 5 17:47:55 2015
@@ -1,4 +1,4 @@
/sis/branches/Android:1430670-1480699
-/sis/branches/JDK6:1394364-1656740
-/sis/branches/JDK7:1394913-1656738
-/sis/branches/JDK8:1584960-1656731
+/sis/branches/JDK6:1394364-1657639
+/sis/branches/JDK7:1394913-1657637
+/sis/branches/JDK8:1584960-1657634
Modified: sis/trunk/core/sis-build-helper/src/main/ant/prepare-release.xml
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-build-helper/src/main/ant/prepare-release.xml?rev=1657641&r1=1657640&r2=1657641&view=diff
==============================================================================
--- sis/trunk/core/sis-build-helper/src/main/ant/prepare-release.xml (original)
+++ sis/trunk/core/sis-build-helper/src/main/ant/prepare-release.xml Thu Feb 5
17:47:55 2015
@@ -35,11 +35,9 @@
replace =
"<sis.plugin.version>${sis.version}-SNAPSHOT</sis.plugin.version>"/>
<!-- Replace the version number in Java code. -->
- <replace dir="${user.dir}" failOnNoReplacements="true">
- <include
name="core/sis-utility/src/main/java/org/apache/sis/util/Version.java"/>
- <replacefilter token=""${sis.version}-SNAPSHOT""
- value=""${sis.version}""/>
- </replace>
+ <replaceregexp file =
"${user.dir}/core/sis-utility/src/main/java/org/apache/sis/util/Version.java"
+ match = "MINOR_VERSION\s*\+\s*"-SNAPSHOT""
+ replace = "MINOR_VERSION"/>
<!-- Replace URL to trunk by URL to the branch on Subversion. -->
<replace dir="${user.dir}" failOnNoReplacements="true">
Modified:
sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java?rev=1657641&r1=1657640&r2=1657641&view=diff
==============================================================================
---
sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java
[UTF-8] (original)
+++
sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java
[UTF-8] Thu Feb 5 17:47:55 2015
@@ -89,10 +89,10 @@ public final class Doclet extends HtmlDo
}
}
}
- final boolean status = HtmlDoclet.start(root);
- if (outputDirectory != null) try {
+ final boolean success = HtmlDoclet.start(root);
+ if (success && outputDirectory != null) try {
final File output = new File(outputDirectory);
- final File customCSS = customCSS(output);
+ final File customCSS = customCSS(output);
copyStylesheet(customCSS, output);
copyResources(customCSS.getParentFile(), output);
} catch (IOException e) {
@@ -102,7 +102,7 @@ public final class Doclet extends HtmlDo
root.printError(buffer.toString());
return false;
}
- return status;
+ return success;
}
/**
Modified:
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java?rev=1657641&r1=1657640&r2=1657641&view=diff
==============================================================================
---
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java
[UTF-8] (original)
+++
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java
[UTF-8] Thu Feb 5 17:47:55 2015
@@ -148,7 +148,7 @@ public final class MetadataUtilities ext
}
/**
- * Formats an error message and logs it is we are (un)marshalling a
document, or return the message otherwise.
+ * Formats an error message and logs it if we are (un)marshalling a
document, or return the message otherwise.
* In the later case, it is caller's responsibility to use the message for
throwing an exception.
*
* @param classe The caller class, used only in case of warning
message to log.
Modified:
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java?rev=1657641&r1=1657640&r2=1657641&view=diff
==============================================================================
---
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java
[UTF-8] (original)
+++
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java
[UTF-8] Thu Feb 5 17:47:55 2015
@@ -1258,7 +1258,7 @@ public class Formatter implements Locali
* Invoking this method is equivalent to first verifying the {@code other}
class,
* then delegating as below:
*
- * {@preformat
+ * {@preformat java
* return other.formatTo(this);
* }
*
Modified:
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LocalisedCharacterString.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LocalisedCharacterString.java?rev=1657641&r1=1657640&r2=1657641&view=diff
==============================================================================
---
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LocalisedCharacterString.java
[UTF-8] (original)
+++
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LocalisedCharacterString.java
[UTF-8] Thu Feb 5 17:47:55 2015
@@ -130,7 +130,7 @@ final class LocalisedCharacterString {
* Returns a string representation of this object for debugging purpose.
* Example:
*
- * {@preformat
+ * {@preformat text
* LocalisedCharacterString[#locale-fra, “Un texte”]
* }
*
Modified:
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/TextGroup.java
URL:
http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/TextGroup.java?rev=1657641&r1=1657640&r2=1657641&view=diff
==============================================================================
---
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/TextGroup.java
[UTF-8] (original)
+++
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/TextGroup.java
[UTF-8] Thu Feb 5 17:47:55 2015
@@ -116,7 +116,7 @@ final class TextGroup {
* Returns a string representation of this text group for debugging
purpose.
* Example:
*
- * {@preformat
+ * {@preformat text
* TextGroup
* ├─ LocalisedCharacterString[#locale-eng, “A text”]
* └─ LocalisedCharacterString[#locale-fra, “Un texte”]
Modified: sis/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/sis/trunk/pom.xml?rev=1657641&r1=1657640&r2=1657641&view=diff
==============================================================================
--- sis/trunk/pom.xml (original)
+++ sis/trunk/pom.xml Thu Feb 5 17:47:55 2015
@@ -403,7 +403,6 @@ Apache SIS is a free software, Java lang
=================================================================== -->
<properties>
<netcdf.version>4.4.2</netcdf.version> <!-- Last version compatible with
JDK6. -->
- <findbugs.version>2.5.3</findbugs.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<website.encoding>UTF-8</website.encoding>
<website.locale>en</website.locale>
@@ -424,6 +423,24 @@ Apache SIS is a free software, Java lang
</properties>
</profile>
<profile>
+ <id>jdk8</id>
+ <activation>
+ <jdk>1.8</jdk>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <additionalparam>
+ -Xdoclint:syntax -Xdoclint:html -Xdoclint:missing
-Xdoclint:accessibility
+ </additionalparam>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
<activation>
<property>
<name>bootclasspath</name>
@@ -440,6 +457,12 @@ Apache SIS is a free software, Java lang
</compilerArgs>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <bootclasspath>${bootclasspath}</bootclasspath>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>
@@ -672,15 +695,11 @@ Apache SIS is a free software, Java lang
</configuration>
</plugin>
- <!-- Dependencies requires for the SIS FindBugs configuration file.
- This dependency should be declared in the <reporting> section,
- but Maven 3.0.4 does not support dependency declaration there.
- Note that the version number is duplicated in the <reporting>
- section, because <reporting> ignores <pluginManagement>. -->
+ <!-- Dependencies requires for the SIS FindBugs configuration file. -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>${findbugs.version}</version>
+ <version>2.5.3</version>
<dependencies>
<dependency>
<groupId>org.apache.sis.core</groupId>
