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 2019/09/18 17:37:50 UTC
[sis] 02/02: Adjustement to the build for Apache SIS 1.0 release: -
Add explicitly a transitive dependency required for javadoc generation. -
Add a public class (empty for now) in Japanese profile for preventing empty
javadoc. - Remove Ant tasks that were specifics to Subversion branches and
tags. - Adjust version numbers.
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 1c2643b290724b66f405c48e57d077c24ad8d483
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Wed Sep 18 14:47:08 2019 +0200
Adjustement to the build for Apache SIS 1.0 release:
- Add explicitly a transitive dependency required for javadoc generation.
- Add a public class (empty for now) in Japanese profile for preventing empty javadoc.
- Remove Ant tasks that were specifics to Subversion branches and tags.
- Adjust version numbers.
---
application/sis-console/pom.xml | 4 ++++
.../src/main/ant/prepare-release.xml | 26 +-------------------
core/sis-referencing-by-identifiers/pom.xml | 4 ++++
.../sis/referencing/report/package-info.java | 2 +-
pom.xml | 2 +-
.../apache/sis/profile/japan/JapaneseProfile.java | 28 ++++++++++++++++------
6 files changed, 32 insertions(+), 34 deletions(-)
diff --git a/application/sis-console/pom.xml b/application/sis-console/pom.xml
index af69cb1..100e180 100644
--- a/application/sis-console/pom.xml
+++ b/application/sis-console/pom.xml
@@ -145,6 +145,10 @@
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </dependency>
<!-- Test dependencies -->
<dependency>
diff --git a/core/sis-build-helper/src/main/ant/prepare-release.xml b/core/sis-build-helper/src/main/ant/prepare-release.xml
index a821354..6fffb54 100644
--- a/core/sis-build-helper/src/main/ant/prepare-release.xml
+++ b/core/sis-build-helper/src/main/ant/prepare-release.xml
@@ -34,34 +34,10 @@
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">
- <include name="**/pom.xml"/>
- <replacefilter token="svn.apache.org/repos/asf/sis/trunk"
- value="svn.apache.org/repos/asf/sis/branches/${branch.version}"/>
- <replacefilter token="svn.apache.org/viewvc/sis/trunk"
- value="svn.apache.org/viewvc/sis/branches/${branch.version}"/>
- </replace>
- </target>
-
-
-
- <!-- Invoked after a tag has been created from the branch. -->
- <target name="tag">
-
- <!-- Replace URL to branch by URL to the branch on Subversion. -->
- <replace dir="${user.dir}" failOnNoReplacements="true">
- <include name="**/pom.xml"/>
- <replacefilter token="svn.apache.org/repos/asf/sis/branches/${branch.version}"
- value="svn.apache.org/repos/asf/sis/tags/${sis.version}"/>
- <replacefilter token="svn.apache.org/viewvc/sis/branches/${branch.version}"
- value="svn.apache.org/viewvc/sis/tags/${sis.version}"/>
- </replace>
-
<!-- Replace version numbers. Note that no snapshot other than SIS can exist at this point. -->
<replace dir="${user.dir}" failOnNoReplacements="true">
<include name="**/pom.xml"/>
- <replacefilter token="<version>${branch.version}-SNAPSHOT</version>"
+ <replacefilter token="<version>${sis.version}-SNAPSHOT</version>"
value="<version>${sis.version}</version>"/>
</replace>
</target>
diff --git a/core/sis-referencing-by-identifiers/pom.xml b/core/sis-referencing-by-identifiers/pom.xml
index 83b7143..b18d79f 100644
--- a/core/sis-referencing-by-identifiers/pom.xml
+++ b/core/sis-referencing-by-identifiers/pom.xml
@@ -112,6 +112,10 @@
<artifactId>sis-referencing</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </dependency>
<!-- Test dependencies -->
<dependency>
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/package-info.java b/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/package-info.java
index 12ecd02..1ba2b7e 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/package-info.java
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/package-info.java
@@ -22,7 +22,7 @@
* The reports are for example the list of all supported EPSG codes.
*
* @author Martin Desruisseaux (Geomatys)
- * @version 0.8
+ * @version 1.0
* @since 0.7
* @module
*/
diff --git a/pom.xml b/pom.xml
index 3c80bc9..18b9d27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -560,7 +560,7 @@
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<sis.plugin.version>${project.version}</sis.plugin.version>
- <sis.non-free.version>1.0-M1</sis.non-free.version> <!-- Used only if "non-free" profile is enabled. -->
+ <sis.non-free.version>1.0</sis.non-free.version> <!-- Used only if "non-free" profile is enabled. -->
<geoapi.version>4.0-SNAPSHOT</geoapi.version>
<jaxb.version>2.3.2</jaxb.version>
</properties>
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/package-info.java b/profiles/sis-japan-profile/src/main/java/org/apache/sis/profile/japan/JapaneseProfile.java
similarity index 56%
copy from core/sis-referencing/src/test/java/org/apache/sis/referencing/report/package-info.java
copy to profiles/sis-japan-profile/src/main/java/org/apache/sis/profile/japan/JapaneseProfile.java
index 12ecd02..84b6c05 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/package-info.java
+++ b/profiles/sis-japan-profile/src/main/java/org/apache/sis/profile/japan/JapaneseProfile.java
@@ -14,16 +14,30 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package org.apache.sis.profile.japan;
+
+import org.apache.sis.util.Static;
+
/**
- * Generates some HTML reports for the Apache SIS library. The classes in this package iterate
- * over some kind of services declared by theSIS library (for example the list of map projections)
- * and produce HTML reports to be copied on the web server.
- * The reports are for example the list of all supported EPSG codes.
+ * Provides implementations of Japanese extensions.
+ * There is not yet public methods provided in this class.
+ * Just having this module presents on the classpath is sufficient for enabling the reading of following data:
+ *
+ * <ul>
+ * <li>Global Change Observation Mission - Climate (GCOM-C), a.k.a. "Shikisai".</li>
+ * <li>Global Change Observation Mission - Water (GCOM-W), a.k.a. "Shizuku".</li>
+ * </ul>
*
* @author Martin Desruisseaux (Geomatys)
- * @version 0.8
- * @since 0.7
+ * @version 1.0
+ * @since 1.0
* @module
*/
-package org.apache.sis.referencing.report;
+public final class JapaneseProfile extends Static {
+ /**
+ * Do not allow instantiation of this class.
+ */
+ private JapaneseProfile() {
+ }
+}