sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1657637 - in /sis/branches/JDK7: ./ core/sis-build-helper/src/main/ant/ core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/ core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ core/sis-metadata/src/main/java/o...
Date Thu, 05 Feb 2015 17:39:11 GMT
Author: desruisseaux
Date: Thu Feb  5 17:39:11 2015
New Revision: 1657637

URL: http://svn.apache.org/r1657637
Log:
Merge from the JDK8 branch.

Removed:
    sis/branches/JDK7/src/main/rdf/
Modified:
    sis/branches/JDK7/   (props changed)
    sis/branches/JDK7/core/sis-build-helper/src/main/ant/prepare-release.xml
    sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LocalisedCharacterString.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/TextGroup.java
    sis/branches/JDK7/pom.xml

Propchange: sis/branches/JDK7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb  5 17:39:11 2015
@@ -1,4 +1,4 @@
 /sis/branches/Android:1430670-1480699
 /sis/branches/JDK6:1394913-1508480
-/sis/branches/JDK8:1584960-1656731
+/sis/branches/JDK8:1584960-1657634
 /sis/trunk:1394364-1508466,1519089-1519674

Modified: sis/branches/JDK7/core/sis-build-helper/src/main/ant/prepare-release.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/ant/prepare-release.xml?rev=1657637&r1=1657636&r2=1657637&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/ant/prepare-release.xml (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/ant/prepare-release.xml Thu Feb  5 17:39:11
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="&quot;${sis.version}-SNAPSHOT&quot;"
-                     value="&quot;${sis.version}&quot;"/>
-    </replace>
+    <replaceregexp file = "${user.dir}/core/sis-utility/src/main/java/org/apache/sis/util/Version.java"
+                  match = "MINOR_VERSION\s*\+\s*&quot;-SNAPSHOT&quot;"
+                replace = "MINOR_VERSION"/>
 
     <!-- Replace URL to trunk by URL to the branch on Subversion. -->
     <replace dir="${user.dir}" failOnNoReplacements="true">

Modified: sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java?rev=1657637&r1=1657636&r2=1657637&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java
[UTF-8] Thu Feb  5 17:39:11 2015
@@ -91,10 +91,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) {
@@ -104,7 +104,7 @@ public final class Doclet extends HtmlDo
             root.printError(buffer.toString());
             return false;
         }
-        return status;
+        return success;
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java?rev=1657637&r1=1657636&r2=1657637&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java
[UTF-8] Thu Feb  5 17:39:11 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/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java?rev=1657637&r1=1657636&r2=1657637&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/io/wkt/Formatter.java
[UTF-8] Thu Feb  5 17:39:11 2015
@@ -1257,7 +1257,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/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LocalisedCharacterString.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LocalisedCharacterString.java?rev=1657637&r1=1657636&r2=1657637&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LocalisedCharacterString.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LocalisedCharacterString.java
[UTF-8] Thu Feb  5 17:39:11 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/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/TextGroup.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/TextGroup.java?rev=1657637&r1=1657636&r2=1657637&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/TextGroup.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/TextGroup.java
[UTF-8] Thu Feb  5 17:39:11 2015
@@ -113,7 +113,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/branches/JDK7/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/pom.xml?rev=1657637&r1=1657636&r2=1657637&view=diff
==============================================================================
--- sis/branches/JDK7/pom.xml (original)
+++ sis/branches/JDK7/pom.xml Thu Feb  5 17:39:11 2015
@@ -403,7 +403,6 @@ Apache SIS is a free software, Java lang
        =================================================================== -->
   <properties>
     <netcdf.version>4.5.3</netcdf.version>
-    <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>
@@ -458,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>
@@ -693,15 +698,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>



Mime
View raw message