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 2022/12/09 18:27:08 UTC
[sis] 06/07: Set version number to 1.3.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch 1.3-RC
in repository https://gitbox.apache.org/repos/asf/sis.git
commit a00d579fe712203655d3436bad54e7612f7b0784
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Thu Dec 8 15:48:55 2022 +0100
Set version number to 1.3.
---
application/pom.xml | 2 +-
application/sis-console/pom.xml | 2 +-
application/sis-javafx/pom.xml | 2 +-
application/sis-javafx/src/main/artifact/bin/sis | 2 +-
.../sis-javafx/src/main/artifact/bin/sis.bat | 2 +-
application/sis-javafx/src/main/artifact/bin/sisfx | 2 +-
.../sis-javafx/src/main/artifact/bin/sisfx.bat | 2 +-
application/sis-openoffice/pom.xml | 2 +-
.../src/main/unopkg/build-instruction.html | 2 +-
cloud/pom.xml | 2 +-
cloud/sis-cloud-aws/pom.xml | 2 +-
core/pom.xml | 2 +-
core/sis-build-helper/pom.xml | 2 +-
.../src/main/ant/prepare-release.xml | 44 ----------------------
core/sis-feature/pom.xml | 2 +-
core/sis-metadata/pom.xml | 2 +-
core/sis-portrayal/pom.xml | 2 +-
core/sis-referencing-by-identifiers/pom.xml | 2 +-
core/sis-referencing/pom.xml | 2 +-
.../sis/referencing/factory/sql/epsg/package.html | 2 +-
core/sis-utility/pom.xml | 2 +-
.../src/main/java/org/apache/sis/util/Version.java | 2 +-
pom.xml | 22 +----------
profiles/pom.xml | 2 +-
profiles/sis-french-profile/pom.xml | 2 +-
profiles/sis-japan-profile/pom.xml | 2 +-
storage/pom.xml | 2 +-
storage/sis-earth-observation/pom.xml | 2 +-
storage/sis-geotiff/pom.xml | 2 +-
storage/sis-netcdf/pom.xml | 2 +-
storage/sis-sqlstore/pom.xml | 2 +-
storage/sis-storage/pom.xml | 2 +-
storage/sis-xmlstore/pom.xml | 2 +-
33 files changed, 32 insertions(+), 96 deletions(-)
diff --git a/application/pom.xml b/application/pom.xml
index 7ec1784c0f..ff5b7ece5b 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>parent</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.3</version>
</parent>
diff --git a/application/sis-console/pom.xml b/application/sis-console/pom.xml
index 08c59b2948..45a86d2bf9 100644
--- a/application/sis-console/pom.xml
+++ b/application/sis-console/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>application</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.3</version>
</parent>
diff --git a/application/sis-javafx/pom.xml b/application/sis-javafx/pom.xml
index 958ea24381..0008496786 100644
--- a/application/sis-javafx/pom.xml
+++ b/application/sis-javafx/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>application</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.3</version>
</parent>
diff --git a/application/sis-javafx/src/main/artifact/bin/sis b/application/sis-javafx/src/main/artifact/bin/sis
index db782c2b47..c061382cbc 100755
--- a/application/sis-javafx/src/main/artifact/bin/sis
+++ b/application/sis-javafx/src/main/artifact/bin/sis
@@ -23,7 +23,7 @@ SIS_DATA="${SIS_DATA:-$BASE_DIR/data}"
export SIS_DATA
# Execute SIS with any optional JAR that the user may put in the 'lib' directory.
-java -classpath "$BASE_DIR/lib/sis-console-1.3-SNAPSHOT.jar" \
+java -classpath "$BASE_DIR/lib/sis-console-1.3.jar" \
-Djava.util.logging.config.class="org.apache.sis.util.logging.Initializer" \
-Djava.util.logging.config.file="$BASE_DIR/conf/logging.properties" \
-Dderby.stream.error.file="$BASE_DIR/log/derby.log" \
diff --git a/application/sis-javafx/src/main/artifact/bin/sis.bat b/application/sis-javafx/src/main/artifact/bin/sis.bat
index 7f46cdc8c0..230c077bb0 100644
--- a/application/sis-javafx/src/main/artifact/bin/sis.bat
+++ b/application/sis-javafx/src/main/artifact/bin/sis.bat
@@ -20,7 +20,7 @@ SET BASE_DIR=%~dp0\..
SET SIS_DATA=%BASE_DIR%\data
REM Execute SIS with any optional JAR that the user may put in the 'lib' directory.
-java -classpath "%BASE_DIR%\lib\sis-console-1.3-SNAPSHOT.jar"^
+java -classpath "%BASE_DIR%\lib\sis-console-1.3.jar"^
-Djava.util.logging.config.class=org.apache.sis.util.logging.Initializer^
-Djava.util.logging.config.file="%BASE_DIR%\conf\logging.properties"^
-Dderby.stream.error.file="%BASE_DIR%\log\derby.log"^
diff --git a/application/sis-javafx/src/main/artifact/bin/sisfx b/application/sis-javafx/src/main/artifact/bin/sisfx
index 3d8af4eaa9..26652baaca 100755
--- a/application/sis-javafx/src/main/artifact/bin/sisfx
+++ b/application/sis-javafx/src/main/artifact/bin/sisfx
@@ -38,7 +38,7 @@ fi
java -splash:"$BASE_DIR/lib/logo.jpg" \
--add-modules javafx.graphics,javafx.controls,javafx.web \
--module-path "$PATH_TO_FX" \
- --class-path "$BASE_DIR/lib/sis-javafx-1.3-SNAPSHOT.jar" \
+ --class-path "$BASE_DIR/lib/sis-javafx-1.3.jar" \
-Djava.util.logging.config.class="org.apache.sis.util.logging.Initializer" \
-Djava.util.logging.config.file="$BASE_DIR/conf/logging.properties" \
-Dderby.stream.error.file="$BASE_DIR/log/derby.log" \
diff --git a/application/sis-javafx/src/main/artifact/bin/sisfx.bat b/application/sis-javafx/src/main/artifact/bin/sisfx.bat
index 73b13abb1d..2acb76a6b0 100644
--- a/application/sis-javafx/src/main/artifact/bin/sisfx.bat
+++ b/application/sis-javafx/src/main/artifact/bin/sisfx.bat
@@ -29,7 +29,7 @@ IF "%PATH_TO_FX%"=="" (
java -splash:"%BASE_DIR%\lib\logo.jpg"^
--add-modules javafx.graphics,javafx.controls,javafx.web^
--module-path "%PATH_TO_FX%"^
- --class-path "%BASE_DIR%\lib\sis-javafx-1.3-SNAPSHOT.jar"^
+ --class-path "%BASE_DIR%\lib\sis-javafx-1.3.jar"^
-Djava.util.logging.config.class=org.apache.sis.util.logging.Initializer^
-Djava.util.logging.config.file="%BASE_DIR%\conf\logging.properties"^
-Dderby.stream.error.file="%BASE_DIR%\log\derby.log"^
diff --git a/application/sis-openoffice/pom.xml b/application/sis-openoffice/pom.xml
index 6b581920e7..bbd6d058a8 100644
--- a/application/sis-openoffice/pom.xml
+++ b/application/sis-openoffice/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>application</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.3</version>
</parent>
diff --git a/application/sis-openoffice/src/main/unopkg/build-instruction.html b/application/sis-openoffice/src/main/unopkg/build-instruction.html
index 1a4d8b2867..a3df78cd96 100644
--- a/application/sis-openoffice/src/main/unopkg/build-instruction.html
+++ b/application/sis-openoffice/src/main/unopkg/build-instruction.html
@@ -100,7 +100,7 @@ mvn install</pre></blockquote>
<h2>Test in Apache OpenOffice:</h2>
<p>Launch:</p>
<blockquote><pre>cd target
-unopkg add apache-sis-1.3-SNAPSHOT.oxt --log-file log.txt
+unopkg add apache-sis-1.3.oxt --log-file log.txt
scalc -env:RTL_LOGFILE=log.txt</pre></blockquote>
<p>If not already done, configure Java runtime with
diff --git a/cloud/pom.xml b/cloud/pom.xml
index 7a3234664d..78959ab626 100644
--- a/cloud/pom.xml
+++ b/cloud/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>parent</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.3</version>
</parent>
diff --git a/cloud/sis-cloud-aws/pom.xml b/cloud/sis-cloud-aws/pom.xml
index eb0368fec0..c22b2cc711 100644
--- a/cloud/sis-cloud-aws/pom.xml
+++ b/cloud/sis-cloud-aws/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>cloud</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.3</version>
</parent>
diff --git a/core/pom.xml b/core/pom.xml
index ed07f43721..044650cd3e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>parent</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.3</version>
</parent>
diff --git a/core/sis-build-helper/pom.xml b/core/sis-build-helper/pom.xml
index 3f338409c8..8c62325bd8 100644
--- a/core/sis-build-helper/pom.xml
+++ b/core/sis-build-helper/pom.xml
@@ -32,7 +32,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>parent</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.3</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/core/sis-build-helper/src/main/ant/prepare-release.xml b/core/sis-build-helper/src/main/ant/prepare-release.xml
deleted file mode 100644
index 6fffb54fdf..0000000000
--- a/core/sis-build-helper/src/main/ant/prepare-release.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-
-<!--
- Invoked after a branch or a tag has been created in order to update version numbers.
- See http://sis.apache.org/release-management.html
--->
-<project name="prepare-release">
-
- <!-- Invoked after a branch has been created from the trunk. -->
- <target name="branch">
-
- <!-- Replace the version number in Java code. -->
- <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 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>${sis.version}-SNAPSHOT</version>"
- value="<version>${sis.version}</version>"/>
- </replace>
- </target>
-</project>
diff --git a/core/sis-feature/pom.xml b/core/sis-feature/pom.xml
index 0f4a24e404..efd8f5af18 100644
--- a/core/sis-feature/pom.xml
+++ b/core/sis-feature/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>core</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.3</version>
</parent>
diff --git a/core/sis-metadata/pom.xml b/core/sis-metadata/pom.xml
index 95631f3e94..70f0334ef8 100644
--- a/core/sis-metadata/pom.xml
+++ b/core/sis-metadata/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>core</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.3</version>
</parent>
diff --git a/core/sis-portrayal/pom.xml b/core/sis-portrayal/pom.xml
index 63ae284bed..52dd003577 100644
--- a/core/sis-portrayal/pom.xml
+++ b/core/sis-portrayal/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>core</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.3</version>
</parent>
diff --git a/core/sis-referencing-by-identifiers/pom.xml b/core/sis-referencing-by-identifiers/pom.xml
index 7770851e63..90ceabb279 100644
--- a/core/sis-referencing-by-identifiers/pom.xml
+++ b/core/sis-referencing-by-identifiers/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>core</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.3</version>
</parent>
<groupId>org.apache.sis.core</groupId>
diff --git a/core/sis-referencing/pom.xml b/core/sis-referencing/pom.xml
index abc463a23f..8a519f055a 100644
--- a/core/sis-referencing/pom.xml
+++ b/core/sis-referencing/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>core</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.3</version>
</parent>
<groupId>org.apache.sis.core</groupId>
diff --git a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/epsg/package.html b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/epsg/package.html
index fea4bf4a39..2fa183f227 100644
--- a/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/epsg/package.html
+++ b/core/sis-referencing/src/test/java/org/apache/sis/referencing/factory/sql/epsg/package.html
@@ -131,7 +131,7 @@ cp $EPSG_SCRIPTS/PostgreSQL_FKey_Script.sql FKeys.sql</pre>
mvn clean install
export CLASSPATH=~/.m2/repository/org/apache/derby/derby/10.14.2.0/derby-10.14.2.0.jar
export CLASSPATH=$PWD/core/sis-metadata/target/test-classes:$CLASSPATH
-export CLASSPATH=$PWD/target/binaries/sis-referencing-1.3-SNAPSHOT.jar:$CLASSPATH
+export CLASSPATH=$PWD/target/binaries/sis-referencing-1.3.jar:$CLASSPATH
export CLASSPATH=$PWD/core/sis-metadata/target/test-classes:$CLASSPATH
export CLASSPATH=$PWD/core/sis-referencing/target/test-classes:$CLASSPATH
cd <i><path to local copy of <a href="http://svn.apache.org/repos/asf/sis/data/non-free/">http://svn.apache.org/repos/asf/sis/data/non-free/</a>></i>
diff --git a/core/sis-utility/pom.xml b/core/sis-utility/pom.xml
index 01cd8e162f..0a0679ae73 100644
--- a/core/sis-utility/pom.xml
+++ b/core/sis-utility/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>core</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.3</version>
</parent>
diff --git a/core/sis-utility/src/main/java/org/apache/sis/util/Version.java b/core/sis-utility/src/main/java/org/apache/sis/util/Version.java
index 9c6980380d..e836a8005d 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/util/Version.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/util/Version.java
@@ -59,7 +59,7 @@ public class Version implements CharSequence, Comparable<Version>, Serializable
/**
* The version of this Apache SIS distribution.
*/
- public static final Version SIS = new Version(MAJOR_VERSION + "." + MINOR_VERSION + "-SNAPSHOT");
+ public static final Version SIS = new Version(MAJOR_VERSION + "." + MINOR_VERSION);
/**
* A few commonly used version numbers. This list is based on SIS needs, e.g. in {@code DataStore} implementations.
diff --git a/pom.xml b/pom.xml
index 1f46aee825..a2b7f968d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
============================================================== -->
<groupId>org.apache.sis</groupId>
<artifactId>parent</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.3</version>
<packaging>pom</packaging>
<name>Apache SIS</name>
@@ -975,26 +975,6 @@
</build>
-
- <!-- ==============================================================
- Additional repositories from which to download artifacts.
- The parent pom.xml already declares the apache.snapshots
- repository for library artifacts. But we also need it for
- Maven plugins in order to download sis-build-helper when
- the user did not built it himself.
- ============================================================== -->
- <pluginRepositories>
- <pluginRepository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>https://repository.apache.org/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </pluginRepository>
- </pluginRepositories>
-
-
<!-- ==============================================================
Group of modules to build in approximate dependency order.
============================================================== -->
diff --git a/profiles/pom.xml b/profiles/pom.xml
index debee21baa..55716b0b2c 100644
--- a/profiles/pom.xml
+++ b/profiles/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>parent</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.3</version>
</parent>
diff --git a/profiles/sis-french-profile/pom.xml b/profiles/sis-french-profile/pom.xml
index f9d369cb16..0801263469 100644
--- a/profiles/sis-french-profile/pom.xml
+++ b/profiles/sis-french-profile/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>profiles</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.3</version>
</parent>
diff --git a/profiles/sis-japan-profile/pom.xml b/profiles/sis-japan-profile/pom.xml
index 635ba9f4bc..e45baeee40 100644
--- a/profiles/sis-japan-profile/pom.xml
+++ b/profiles/sis-japan-profile/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>profiles</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.3</version>
</parent>
diff --git a/storage/pom.xml b/storage/pom.xml
index 6a4231b649..fecfe90792 100644
--- a/storage/pom.xml
+++ b/storage/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>parent</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.3</version>
</parent>
diff --git a/storage/sis-earth-observation/pom.xml b/storage/sis-earth-observation/pom.xml
index 71e7e10f53..6f9ae55fdf 100644
--- a/storage/sis-earth-observation/pom.xml
+++ b/storage/sis-earth-observation/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>storage</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.3</version>
</parent>
diff --git a/storage/sis-geotiff/pom.xml b/storage/sis-geotiff/pom.xml
index 1754cc40ac..9e0dc6c46c 100644
--- a/storage/sis-geotiff/pom.xml
+++ b/storage/sis-geotiff/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>storage</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.3</version>
</parent>
diff --git a/storage/sis-netcdf/pom.xml b/storage/sis-netcdf/pom.xml
index 399f87e07d..ea8a0709d8 100644
--- a/storage/sis-netcdf/pom.xml
+++ b/storage/sis-netcdf/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>storage</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.3</version>
</parent>
diff --git a/storage/sis-sqlstore/pom.xml b/storage/sis-sqlstore/pom.xml
index 23748d9bca..8426f0fa91 100644
--- a/storage/sis-sqlstore/pom.xml
+++ b/storage/sis-sqlstore/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>storage</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.3</version>
</parent>
diff --git a/storage/sis-storage/pom.xml b/storage/sis-storage/pom.xml
index a4ccfe249a..a726668fd1 100644
--- a/storage/sis-storage/pom.xml
+++ b/storage/sis-storage/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>storage</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.3</version>
</parent>
diff --git a/storage/sis-xmlstore/pom.xml b/storage/sis-xmlstore/pom.xml
index 9916044b21..99fd81fb1f 100644
--- a/storage/sis-xmlstore/pom.xml
+++ b/storage/sis-xmlstore/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>storage</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.3</version>
</parent>