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/05/09 15:26:54 UTC
[sis] 02/02: Set version number to 1.2.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch 1.2-RC
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 8491f5f027bb8a64ea01e5e83699d4055dc0a976
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Mon May 9 17:26:15 2022 +0200
Set version number to 1.2.
---
application/pom.xml | 2 +-
application/sis-console/pom.xml | 2 +-
application/sis-console/src/main/artifact/bin/sis | 2 +-
application/sis-javafx/pom.xml | 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 +-
application/sis-webapp/pom.xml | 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 8c89a03858..fe551b2d5d 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>parent</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.2</version>
</parent>
diff --git a/application/sis-console/pom.xml b/application/sis-console/pom.xml
index fa0b9d2229..bb4c49ea9d 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.2-SNAPSHOT</version>
+ <version>1.2</version>
</parent>
diff --git a/application/sis-console/src/main/artifact/bin/sis b/application/sis-console/src/main/artifact/bin/sis
index 8185731384..de625073b9 100755
--- a/application/sis-console/src/main/artifact/bin/sis
+++ b/application/sis-console/src/main/artifact/bin/sis
@@ -24,7 +24,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.2-SNAPSHOT.jar" \
+java -classpath "$BASE_DIR/lib/sis-console-1.2.jar" \
-Djava.util.logging.config.file="$BASE_DIR/conf/logging.properties" \
-Dderby.stream.error.file="$BASE_DIR/log/derby.log" \
org.apache.sis.console.Command $SIS_OPTS "$@"
diff --git a/application/sis-javafx/pom.xml b/application/sis-javafx/pom.xml
index 6b05851f58..f8a25309ac 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.2-SNAPSHOT</version>
+ <version>1.2</version>
</parent>
diff --git a/application/sis-javafx/src/main/artifact/bin/sisfx b/application/sis-javafx/src/main/artifact/bin/sisfx
index a6070b8bac..54328b7d45 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.2-SNAPSHOT.jar" \
+ --class-path "$BASE_DIR/lib/sis-javafx-1.2.jar" \
-Djava.util.logging.config.class="org.apache.sis.internal.setup.LoggingConfiguration" \
-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 28ce060e7a..bf4b77862d 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.2-SNAPSHOT.jar"^
+ --class-path "%BASE_DIR%\lib\sis-javafx-1.2.jar"^
-Djava.util.logging.config.class=org.apache.sis.internal.setup.LoggingConfiguration^
-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 59a1c5487e..75c5649db7 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.2-SNAPSHOT</version>
+ <version>1.2</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 a9e05382c0..3c3fdbfb43 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.2-SNAPSHOT.oxt --log-file log.txt
+unopkg add apache-sis-1.2.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/application/sis-webapp/pom.xml b/application/sis-webapp/pom.xml
index aac4a08bc8..3e6f5389a6 100644
--- a/application/sis-webapp/pom.xml
+++ b/application/sis-webapp/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>application</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.2</version>
</parent>
<groupId>org.apache.sis.application</groupId>
diff --git a/cloud/pom.xml b/cloud/pom.xml
index b16082f9de..8c3a2e0c00 100644
--- a/cloud/pom.xml
+++ b/cloud/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>parent</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.2</version>
</parent>
diff --git a/cloud/sis-cloud-aws/pom.xml b/cloud/sis-cloud-aws/pom.xml
index be8228b179..73231b8892 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.2-SNAPSHOT</version>
+ <version>1.2</version>
</parent>
diff --git a/core/pom.xml b/core/pom.xml
index 7b562a5cd4..92daf663be 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>parent</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.2</version>
</parent>
diff --git a/core/sis-build-helper/pom.xml b/core/sis-build-helper/pom.xml
index c6c819feb0..128297a992 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.2-SNAPSHOT</version>
+ <version>1.2</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 7a63e937f4..561020c236 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.2-SNAPSHOT</version>
+ <version>1.2</version>
</parent>
diff --git a/core/sis-metadata/pom.xml b/core/sis-metadata/pom.xml
index b64e0cbd5f..23f2f1afc5 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.2-SNAPSHOT</version>
+ <version>1.2</version>
</parent>
diff --git a/core/sis-portrayal/pom.xml b/core/sis-portrayal/pom.xml
index f0baa902c6..8653d71946 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.2-SNAPSHOT</version>
+ <version>1.2</version>
</parent>
diff --git a/core/sis-referencing-by-identifiers/pom.xml b/core/sis-referencing-by-identifiers/pom.xml
index 02ed41049f..5943f29e40 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.2-SNAPSHOT</version>
+ <version>1.2</version>
</parent>
<groupId>org.apache.sis.core</groupId>
diff --git a/core/sis-referencing/pom.xml b/core/sis-referencing/pom.xml
index 992fb68803..8f77f95e1b 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.2-SNAPSHOT</version>
+ <version>1.2</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 2989413319..30a37911e8 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.2-SNAPSHOT.jar:$CLASSPATH
+export CLASSPATH=$PWD/target/binaries/sis-referencing-1.2.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 5ee0af329f..dec340928a 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.2-SNAPSHOT</version>
+ <version>1.2</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 500417b114..7439cf3537 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 930831261d..047a3b9f2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
============================================================== -->
<groupId>org.apache.sis</groupId>
<artifactId>parent</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.2</version>
<packaging>pom</packaging>
<name>Apache SIS</name>
@@ -976,26 +976,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>http://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 e0a146fbf1..c0c76d7022 100644
--- a/profiles/pom.xml
+++ b/profiles/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>parent</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.2</version>
</parent>
diff --git a/profiles/sis-french-profile/pom.xml b/profiles/sis-french-profile/pom.xml
index 8596e559c1..2cc59a741f 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.2-SNAPSHOT</version>
+ <version>1.2</version>
</parent>
diff --git a/profiles/sis-japan-profile/pom.xml b/profiles/sis-japan-profile/pom.xml
index dbe0fe6702..c5c60035eb 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.2-SNAPSHOT</version>
+ <version>1.2</version>
</parent>
diff --git a/storage/pom.xml b/storage/pom.xml
index a69678d033..0ca5b6066f 100644
--- a/storage/pom.xml
+++ b/storage/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>parent</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.2</version>
</parent>
diff --git a/storage/sis-earth-observation/pom.xml b/storage/sis-earth-observation/pom.xml
index b73b394bb6..3ea0de2400 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.2-SNAPSHOT</version>
+ <version>1.2</version>
</parent>
diff --git a/storage/sis-geotiff/pom.xml b/storage/sis-geotiff/pom.xml
index 81ab5f17be..fc8567f34b 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.2-SNAPSHOT</version>
+ <version>1.2</version>
</parent>
diff --git a/storage/sis-netcdf/pom.xml b/storage/sis-netcdf/pom.xml
index 5aefcd6994..30b83d4821 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.2-SNAPSHOT</version>
+ <version>1.2</version>
</parent>
diff --git a/storage/sis-sqlstore/pom.xml b/storage/sis-sqlstore/pom.xml
index 7585713515..a4788eb97f 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.2-SNAPSHOT</version>
+ <version>1.2</version>
</parent>
diff --git a/storage/sis-storage/pom.xml b/storage/sis-storage/pom.xml
index 28c09737c6..925584461b 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.2-SNAPSHOT</version>
+ <version>1.2</version>
</parent>
diff --git a/storage/sis-xmlstore/pom.xml b/storage/sis-xmlstore/pom.xml
index 2ac3576ac5..63d7c6340c 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.2-SNAPSHOT</version>
+ <version>1.2</version>
</parent>