This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch 1.1-RC
in repository https://gitbox.apache.org/repos/asf/sis.git
commit c7abe0fc21070a7687087e3003804286f05b5027
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Wed Sep 29 18:44:43 2021 +0200
Set version number to 1.1.
---
application/pom.xml | 2 +-
application/sis-console/pom.xml | 2 +-
application/sis-javafx/pom.xml | 2 +-
application/sis-openoffice/pom.xml | 2 +-
.../src/main/unopkg/build-instruction.html | 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 +-
27 files changed, 26 insertions(+), 90 deletions(-)
diff --git a/application/pom.xml b/application/pom.xml
index 21ec518..6b693c3 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>parent</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.1</version>
</parent>
diff --git a/application/sis-console/pom.xml b/application/sis-console/pom.xml
index c935169..730d17f 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.1-SNAPSHOT</version>
+ <version>1.1</version>
</parent>
diff --git a/application/sis-javafx/pom.xml b/application/sis-javafx/pom.xml
index 5f353f2..023a78d 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.1-SNAPSHOT</version>
+ <version>1.1</version>
</parent>
diff --git a/application/sis-openoffice/pom.xml
b/application/sis-openoffice/pom.xml
index d511ea0..a7ef793 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.1-SNAPSHOT</version>
+ <version>1.1</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 1bfbd75..4abfbf0 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.1-SNAPSHOT.oxt --log-file log.txt
+unopkg add apache-sis-1.1.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/core/pom.xml b/core/pom.xml
index 24fd84d..b0c3e8b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>parent</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.1</version>
</parent>
diff --git a/core/sis-build-helper/pom.xml b/core/sis-build-helper/pom.xml
index 53fd270..a0e8fbd 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.1-SNAPSHOT</version>
+ <version>1.1</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 6fffb54..0000000
--- 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 7ad734a..721d31f 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.1-SNAPSHOT</version>
+ <version>1.1</version>
</parent>
diff --git a/core/sis-metadata/pom.xml b/core/sis-metadata/pom.xml
index 4197baf..1728a17 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.1-SNAPSHOT</version>
+ <version>1.1</version>
</parent>
diff --git a/core/sis-portrayal/pom.xml b/core/sis-portrayal/pom.xml
index 6d5723f..3e15ec3 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.1-SNAPSHOT</version>
+ <version>1.1</version>
</parent>
diff --git a/core/sis-referencing-by-identifiers/pom.xml
b/core/sis-referencing-by-identifiers/pom.xml
index 7c5c90c..6e5f03d 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.1-SNAPSHOT</version>
+ <version>1.1</version>
</parent>
<groupId>org.apache.sis.core</groupId>
diff --git a/core/sis-referencing/pom.xml b/core/sis-referencing/pom.xml
index 3d02dad..6f59d1e 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.1-SNAPSHOT</version>
+ <version>1.1</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 23115ff..4f57948 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.1-SNAPSHOT.jar:$CLASSPATH
+export CLASSPATH=$PWD/target/binaries/sis-referencing-1.1.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 1a9f052..a9bc5af 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.1-SNAPSHOT</version>
+ <version>1.1</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 500417b..7439cf3 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 e4cc962..135f76b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
============================================================== -->
<groupId>org.apache.sis</groupId>
<artifactId>parent</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.1</version>
<packaging>pom</packaging>
<name>Apache SIS</name>
@@ -971,26 +971,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 ca67127..53c6e4f 100644
--- a/profiles/pom.xml
+++ b/profiles/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>parent</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.1</version>
</parent>
diff --git a/profiles/sis-french-profile/pom.xml
b/profiles/sis-french-profile/pom.xml
index aec737c..4b034bd 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.1-SNAPSHOT</version>
+ <version>1.1</version>
</parent>
diff --git a/profiles/sis-japan-profile/pom.xml
b/profiles/sis-japan-profile/pom.xml
index 8f7b439..5e895cc 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.1-SNAPSHOT</version>
+ <version>1.1</version>
</parent>
diff --git a/storage/pom.xml b/storage/pom.xml
index 4d292dd..51d4ff9 100644
--- a/storage/pom.xml
+++ b/storage/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.sis</groupId>
<artifactId>parent</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.1</version>
</parent>
diff --git a/storage/sis-earth-observation/pom.xml
b/storage/sis-earth-observation/pom.xml
index 5178211..70a31b7 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.1-SNAPSHOT</version>
+ <version>1.1</version>
</parent>
diff --git a/storage/sis-geotiff/pom.xml b/storage/sis-geotiff/pom.xml
index 67bea96..c71b440 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.1-SNAPSHOT</version>
+ <version>1.1</version>
</parent>
diff --git a/storage/sis-netcdf/pom.xml b/storage/sis-netcdf/pom.xml
index d8e1666..ceb74ac 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.1-SNAPSHOT</version>
+ <version>1.1</version>
</parent>
diff --git a/storage/sis-sqlstore/pom.xml b/storage/sis-sqlstore/pom.xml
index 3ece881..0bfead0 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.1-SNAPSHOT</version>
+ <version>1.1</version>
</parent>
diff --git a/storage/sis-storage/pom.xml b/storage/sis-storage/pom.xml
index bf79f56..aaf3bae 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.1-SNAPSHOT</version>
+ <version>1.1</version>
</parent>
diff --git a/storage/sis-xmlstore/pom.xml b/storage/sis-xmlstore/pom.xml
index 423407f..c83681c 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.1-SNAPSHOT</version>
+ <version>1.1</version>
</parent>
