Author: desruisseaux
Date: Fri Apr 4 00:41:12 2014
New Revision: 1584482
URL: http://svn.apache.org/r1584482
Log:
Merge from the JDK7 branch.
Added:
sis/branches/JDK6/application/sis-console/src/main/resources/org/apache/sis/console/Commands_en.properties
- copied unchanged from r1584481, sis/branches/JDK7/application/sis-console/src/main/resources/org/apache/sis/console/Commands_en.properties
sis/branches/JDK6/application/sis-console/src/main/resources/org/apache/sis/console/Options_en.properties
- copied unchanged from r1584481, sis/branches/JDK7/application/sis-console/src/main/resources/org/apache/sis/console/Options_en.properties
Modified:
sis/branches/JDK6/ (props changed)
sis/branches/JDK6/application/sis-console/src/main/artifact/README
sis/branches/JDK6/application/sis-console/src/main/java/org/apache/sis/console/HelpSC.java
sis/branches/JDK6/application/sis-console/src/test/java/org/apache/sis/console/HelpSCTest.java
sis/branches/JDK6/core/pom.xml
sis/branches/JDK6/core/sis-build-helper/pom.xml
sis/branches/JDK6/core/sis-build-helper/src/main/ant/prepare-release.xml
sis/branches/JDK6/core/sis-feature/pom.xml (contents, props changed)
sis/branches/JDK6/core/sis-metadata/pom.xml
sis/branches/JDK6/core/sis-referencing/pom.xml
sis/branches/JDK6/core/sis-utility/pom.xml
sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/TestSuite.java
sis/branches/JDK6/ide-project/NetBeans/nbproject/build-impl.xml
sis/branches/JDK6/ide-project/NetBeans/nbproject/genfiles.properties
sis/branches/JDK6/pom.xml
Propchange: sis/branches/JDK6/
------------------------------------------------------------------------------
Merged /sis/branches/JDK7:r1583789-1584481
Modified: sis/branches/JDK6/application/sis-console/src/main/artifact/README
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/application/sis-console/src/main/artifact/README?rev=1584482&r1=1584481&r2=1584482&view=diff
==============================================================================
--- sis/branches/JDK6/application/sis-console/src/main/artifact/README [UTF-8] (original)
+++ sis/branches/JDK6/application/sis-console/src/main/artifact/README [UTF-8] Fri Apr 4
00:41:12 2014
@@ -17,8 +17,8 @@ SIS is based on Java 6 and provided as a
Unix
----
-1) Unzip 'apache-sis-0.3-bin.zip' in any directory.
-2) Add the 'apache-sis-0.3/bin' directory to the path.
+1) Unzip 'apache-sis-0.5-bin.zip' in any directory.
+2) Add the 'apache-sis-0.5/bin' directory to the path.
3) Invoke 'sis' on the command line.
Windows
@@ -26,8 +26,8 @@ Windows
There is not yet 'sis.bat' file for Windows.
The following steps need to be done manually:
-1) Unzip 'apache-sis-0.3-bin.zip' in any directory.
-2) In the 'apache-sis-0.3/lib' directory, execute:
+1) Unzip 'apache-sis-0.5-bin.zip' in any directory.
+2) In the 'apache-sis-0.5/lib' directory, execute:
unpack200 --remove-pack-file sis.pack.gz sis.jar
Modified: sis/branches/JDK6/application/sis-console/src/main/java/org/apache/sis/console/HelpSC.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/application/sis-console/src/main/java/org/apache/sis/console/HelpSC.java?rev=1584482&r1=1584481&r2=1584482&view=diff
==============================================================================
--- sis/branches/JDK6/application/sis-console/src/main/java/org/apache/sis/console/HelpSC.java
[UTF-8] (original)
+++ sis/branches/JDK6/application/sis-console/src/main/java/org/apache/sis/console/HelpSC.java
[UTF-8] Fri Apr 4 00:41:12 2014
@@ -29,7 +29,7 @@ import org.apache.sis.util.resources.Voc
*
* @author Martin Desruisseaux (Geomatys)
* @since 0.3
- * @version 0.3
+ * @version 0.4
* @module
*/
final class HelpSC extends SubCommand {
@@ -40,7 +40,8 @@ final class HelpSC extends SubCommand {
"help",
"about",
"mime-type",
- "metadata"
+ "metadata",
+ "crs"
};
/**
Modified: sis/branches/JDK6/application/sis-console/src/test/java/org/apache/sis/console/HelpSCTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/application/sis-console/src/test/java/org/apache/sis/console/HelpSCTest.java?rev=1584482&r1=1584481&r2=1584482&view=diff
==============================================================================
--- sis/branches/JDK6/application/sis-console/src/test/java/org/apache/sis/console/HelpSCTest.java
[UTF-8] (original)
+++ sis/branches/JDK6/application/sis-console/src/test/java/org/apache/sis/console/HelpSCTest.java
[UTF-8] Fri Apr 4 00:41:12 2014
@@ -71,4 +71,32 @@ public final strictfp class HelpSCTest e
assertFalse("--verbose", result.contains("--verbose"));
assertTrue ("--help", result.contains("--help"));
}
+
+ /**
+ * Tests the sub-command with the {@code --locale en} option.
+ *
+ * @throws InvalidOptionException Should never happen.
+ */
+ @Test
+ public void testEnglishLocale() throws InvalidOptionException {
+ final HelpSC test = new HelpSC(0, SubCommand.TEST, "--help", "--locale", "en");
+ test.help("help");
+ final String result = test.outputBuffer.toString();
+ assertTrue(result, result.contains("Show a help overview."));
+ assertTrue(result, result.contains("The locale to use"));
+ }
+
+ /**
+ * Tests the sub-command with the {@code --locale fr} option.
+ *
+ * @throws InvalidOptionException Should never happen.
+ */
+ @Test
+ public void testFrenchLocale() throws InvalidOptionException {
+ final HelpSC test = new HelpSC(0, SubCommand.TEST, "--help", "--locale", "fr");
+ test.help("help");
+ final String result = test.outputBuffer.toString();
+ assertTrue(result, result.contains("Affiche un écran d’aide."));
+ assertTrue(result, result.contains("Les paramètres régionaux"));
+ }
}
Modified: sis/branches/JDK6/core/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/pom.xml?rev=1584482&r1=1584481&r2=1584482&view=diff
==============================================================================
--- sis/branches/JDK6/core/pom.xml (original)
+++ sis/branches/JDK6/core/pom.xml Fri Apr 4 00:41:12 2014
@@ -125,6 +125,29 @@
<!-- ===========================================================
+ Build configuration
+ =========================================================== -->
+ <build>
+ <plugins>
+
+ <!-- Collect JAR files in <root>/target/binaries directory. -->
+ <plugin>
+ <groupId>org.apache.sis.core</groupId>
+ <artifactId>sis-build-helper</artifactId>
+ <version>${sis.plugin.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>collect-jars</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+
+ <!-- ===========================================================
Sub-modules included in the build in dependency order
=========================================================== -->
<modules>
Modified: sis/branches/JDK6/core/sis-build-helper/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-build-helper/pom.xml?rev=1584482&r1=1584481&r2=1584482&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-build-helper/pom.xml (original)
+++ sis/branches/JDK6/core/sis-build-helper/pom.xml Fri Apr 4 00:41:12 2014
@@ -25,10 +25,12 @@
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <!-- Do not inherit from core/pom.xml because doing so would create a cyclic dependency.
-->
<parent>
<groupId>org.apache.sis</groupId>
- <artifactId>core</artifactId>
+ <artifactId>parent</artifactId>
<version>0.4-jdk6-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
Modified: sis/branches/JDK6/core/sis-build-helper/src/main/ant/prepare-release.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-build-helper/src/main/ant/prepare-release.xml?rev=1584482&r1=1584481&r2=1584482&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-build-helper/src/main/ant/prepare-release.xml (original)
+++ sis/branches/JDK6/core/sis-build-helper/src/main/ant/prepare-release.xml Fri Apr 4 00:41:12
2014
@@ -37,7 +37,6 @@
<!-- 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"/>
- <include name="core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Module.java"/>
<replacefilter token=""${sis.version}-SNAPSHOT""
value=""${sis.version}""/>
</replace>
Modified: sis/branches/JDK6/core/sis-feature/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-feature/pom.xml?rev=1584482&r1=1584481&r2=1584482&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-feature/pom.xml (original)
+++ sis/branches/JDK6/core/sis-feature/pom.xml Fri Apr 4 00:41:12 2014
@@ -67,20 +67,6 @@ Representations of geographic features.
<build>
<plugins>
- <!-- Collect JAR files in <root>/target/binaries directory. -->
- <plugin>
- <groupId>org.apache.sis.core</groupId>
- <artifactId>sis-build-helper</artifactId>
- <version>${sis.plugin.version}</version>
- <executions>
- <execution>
- <goals>
- <goal>collect-jars</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
<!-- Package as OSGi bundle -->
<plugin>
<groupId>org.apache.felix</groupId>
Propchange: sis/branches/JDK6/core/sis-feature/pom.xml
------------------------------------------------------------------------------
Merged /sis/branches/JDK7/core/sis-feature/pom.xml:r1515996-1584481
Modified: sis/branches/JDK6/core/sis-metadata/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/pom.xml?rev=1584482&r1=1584481&r2=1584482&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/pom.xml (original)
+++ sis/branches/JDK6/core/sis-metadata/pom.xml Fri Apr 4 00:41:12 2014
@@ -109,20 +109,6 @@ Implementations of metadata derived from
<build>
<plugins>
- <!-- Collect JAR files in <root>/target/binaries directory. -->
- <plugin>
- <groupId>org.apache.sis.core</groupId>
- <artifactId>sis-build-helper</artifactId>
- <version>${sis.plugin.version}</version>
- <executions>
- <execution>
- <goals>
- <goal>collect-jars</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
<!-- Package as OSGi bundle -->
<plugin>
<groupId>org.apache.felix</groupId>
Modified: sis/branches/JDK6/core/sis-referencing/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/pom.xml?rev=1584482&r1=1584481&r2=1584482&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/pom.xml (original)
+++ sis/branches/JDK6/core/sis-referencing/pom.xml Fri Apr 4 00:41:12 2014
@@ -79,20 +79,6 @@ Implementations of Coordinate Reference
<build>
<plugins>
- <!-- Collect JAR files in <root>/target/binaries directory. -->
- <plugin>
- <groupId>org.apache.sis.core</groupId>
- <artifactId>sis-build-helper</artifactId>
- <version>${sis.plugin.version}</version>
- <executions>
- <execution>
- <goals>
- <goal>collect-jars</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
<!-- Package as OSGi bundle -->
<plugin>
<groupId>org.apache.felix</groupId>
Modified: sis/branches/JDK6/core/sis-utility/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/pom.xml?rev=1584482&r1=1584481&r2=1584482&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/pom.xml (original)
+++ sis/branches/JDK6/core/sis-utility/pom.xml Fri Apr 4 00:41:12 2014
@@ -133,7 +133,7 @@ Miscellaneous utilities.
</executions>
</plugin>
- <!-- Compile properties files into resources UTF files and collect JAR files. -->
+ <!-- Compile properties files into resources UTF files. -->
<plugin>
<groupId>org.apache.sis.core</groupId>
<artifactId>sis-build-helper</artifactId>
@@ -142,7 +142,6 @@ Miscellaneous utilities.
<execution>
<goals>
<goal>compile-resources</goal>
- <goal>collect-jars</goal>
</goals>
</execution>
</executions>
Modified: sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/TestSuite.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/TestSuite.java?rev=1584482&r1=1584481&r2=1584482&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/TestSuite.java [UTF-8]
(original)
+++ sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/TestSuite.java [UTF-8]
Fri Apr 4 00:41:12 2014
@@ -55,6 +55,13 @@ public abstract strictfp class TestSuite
};
/**
+ * {@code true} for disabling the search for missing tests. This is necessary
+ * when the test suites are executed from an external project, for example during a
+ * <a href="https://svn.apache.org/repos/asf/sis/release-test/maven">release test</a>.
+ */
+ static boolean skipCheckForMissingTests;
+
+ /**
* Creates a new test suite.
*/
protected TestSuite() {
@@ -64,9 +71,12 @@ public abstract strictfp class TestSuite
* Verifies that we did not forgot to declare some test classes in the given suite.
* This method scans the directory for {@code *Test.class} files.
*
+ * <p>This check is disabled if {@link #skipCheckForMissingTests} is {@code true}.</p>
+ *
* @param suite The suite for which to check for missing tests.
*/
protected static void assertNoMissingTest(final Class<? extends TestSuite> suite)
{
+ if (skipCheckForMissingTests) return;
final ClassLoader loader = suite.getClassLoader();
final URL url = loader.getResource(suite.getName().replace('.', '/') + ".class");
assertNotNull("Test suite class not found.", url);
Modified: sis/branches/JDK6/ide-project/NetBeans/nbproject/build-impl.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/ide-project/NetBeans/nbproject/build-impl.xml?rev=1584482&r1=1584481&r2=1584482&view=diff
==============================================================================
--- sis/branches/JDK6/ide-project/NetBeans/nbproject/build-impl.xml (original)
+++ sis/branches/JDK6/ide-project/NetBeans/nbproject/build-impl.xml Fri Apr 4 00:41:12 2014
@@ -80,9 +80,12 @@ is divided into following sections:
</and>
</condition>
<condition property="do.archive">
- <not>
- <istrue value="${jar.archive.disabled}"/>
- </not>
+ <or>
+ <not>
+ <istrue value="${jar.archive.disabled}"/>
+ </not>
+ <istrue value="${not.archive.disabled}"/>
+ </or>
</condition>
<condition property="do.mkdist">
<and>
@@ -1007,6 +1010,7 @@ is divided into following sections:
<param location="${project.GeoAPI}/build.xml" name="call.script"/>
<param name="call.target" value="jar"/>
<param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
+ <param name="transfer.not.archive.disabled" value="true"/>
</antcall>
</target>
<target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
@@ -1324,41 +1328,44 @@ is divided into following sections:
</not>
</and>
</condition>
- <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}"
charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}"
failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}"
private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}"
useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
+ <condition else="" property="bug5101868workaround" value="*.java">
+ <matches pattern="1\.[56](\..*)?" string="${java.version}"/>
+ </condition>
+ <javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${javadoc.additionalparam}"
author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8"
encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}"
notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}"
use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
<classpath>
<path path="${javac.classpath}"/>
</classpath>
- <fileset dir="${src.local-src.dir}" excludes="*.java,${excludes}" includes="${includes}">
+ <fileset dir="${src.local-src.dir}" excludes="${bug5101868workaround},${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.webapp.dir}" excludes="*.java,${excludes}" includes="${includes}">
+ <fileset dir="${src.webapp.dir}" excludes="${bug5101868workaround},${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.console.dir}" excludes="*.java,${excludes}" includes="${includes}">
+ <fileset dir="${src.console.dir}" excludes="${bug5101868workaround},${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.netcdf.dir}" excludes="*.java,${excludes}" includes="${includes}">
+ <fileset dir="${src.netcdf.dir}" excludes="${bug5101868workaround},${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.shapefile.dir}" excludes="*.java,${excludes}" includes="${includes}">
+ <fileset dir="${src.shapefile.dir}" excludes="${bug5101868workaround},${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.storage.dir}" excludes="*.java,${excludes}" includes="${includes}">
+ <fileset dir="${src.storage.dir}" excludes="${bug5101868workaround},${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.feature.dir}" excludes="*.java,${excludes}" includes="${includes}">
+ <fileset dir="${src.feature.dir}" excludes="${bug5101868workaround},${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.referencing.dir}" excludes="*.java,${excludes}" includes="${includes}">
+ <fileset dir="${src.referencing.dir}" excludes="${bug5101868workaround},${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.metadata.dir}" excludes="*.java,${excludes}" includes="${includes}">
+ <fileset dir="${src.metadata.dir}" excludes="${bug5101868workaround},${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.utility.dir}" excludes="*.java,${excludes}" includes="${includes}">
+ <fileset dir="${src.utility.dir}" excludes="${bug5101868workaround},${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.fra-profile.dir}" excludes="*.java,${excludes}" includes="${includes}">
+ <fileset dir="${src.fra-profile.dir}" excludes="${bug5101868workaround},${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
<fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
@@ -1478,7 +1485,7 @@ is divided into following sections:
<mkdir dir="${build.test.results.dir}"/>
</target>
<target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
- <j2seproject3:test testincludes="**/*Test.java"/>
+ <j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/>
</target>
<target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
<fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see
details above.</fail>
@@ -1582,6 +1589,7 @@ is divided into following sections:
<param location="${project.GeoAPI}/build.xml" name="call.script"/>
<param name="call.target" value="clean"/>
<param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
+ <param name="transfer.not.archive.disabled" value="true"/>
</antcall>
</target>
<target depends="init" name="-do-clean">
Modified: sis/branches/JDK6/ide-project/NetBeans/nbproject/genfiles.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/ide-project/NetBeans/nbproject/genfiles.properties?rev=1584482&r1=1584481&r2=1584482&view=diff
==============================================================================
--- sis/branches/JDK6/ide-project/NetBeans/nbproject/genfiles.properties [ISO-8859-1] (original)
+++ sis/branches/JDK6/ide-project/NetBeans/nbproject/genfiles.properties [ISO-8859-1] Fri
Apr 4 00:41:12 2014
@@ -3,6 +3,6 @@
build.xml.data.CRC32=58e6b21c
build.xml.script.CRC32=462eaba0
build.xml.stylesheet.CRC32=28e38971@1.53.1.46
-nbproject/build-impl.xml.data.CRC32=69011695
-nbproject/build-impl.xml.script.CRC32=f1ff2859
-nbproject/build-impl.xml.stylesheet.CRC32=5a01deb7@1.68.1.46
+nbproject/build-impl.xml.data.CRC32=50432990
+nbproject/build-impl.xml.script.CRC32=d0759314
+nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.74.1.48
Modified: sis/branches/JDK6/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/pom.xml?rev=1584482&r1=1584481&r2=1584482&view=diff
==============================================================================
--- sis/branches/JDK6/pom.xml (original)
+++ sis/branches/JDK6/pom.xml Fri Apr 4 00:41:12 2014
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>13</version> <!-- See the "TODO" in this file. -->
+ <version>14</version> <!-- See the "TODO" in this file. -->
</parent>
@@ -431,7 +431,6 @@ Apache SIS is a free software, Java lang
<!-- Compile -->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version> <!-- TODO: Remove after parent pom.xml has
upgraded. -->
<configuration>
<source>${maven.compile.source}</source>
<target>${maven.compile.target}</target>
@@ -488,7 +487,6 @@ Apache SIS is a free software, Java lang
<!-- Set "*-source-release.zip" filename prefix to "sis-*" instead of "parent-*"
-->
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version> <!-- TODO: Remove after parent pom.xml has
upgraded. -->
<executions>
<execution>
<id>source-release-assembly</id>
@@ -558,7 +556,6 @@ Apache SIS is a free software, Java lang
we disable links relativization for avoiding confusing behavior. -->
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <version>3.3</version> <!-- TODO: Remove after parent pom.xml has
upgraded. -->
<configuration>
<locales>${website.locale}</locales>
<inputEncoding>${project.build.sourceEncoding}</inputEncoding>
|