sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject [sis] 12/15: Prepare the branch for the 0.8 release.
Date Thu, 21 Jun 2018 09:19:52 GMT
This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to tag 0.8
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 9e3be6e2178ee6f1064371fe9ccd84883d1a00c7
Author: Martin Desruisseaux <desruisseaux@apache.org>
AuthorDate: Fri Nov 10 14:58:47 2017 +0000

    Prepare the branch for the 0.8 release.
    
    git-svn-id: https://svn.apache.org/repos/asf/sis/branches/0.8@1814867 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/ant/prepare-release.xml               |  8 -------
 .../src/main/java/org/apache/sis/util/Version.java |  2 +-
 pom.xml                                            | 26 +++-------------------
 3 files changed, 4 insertions(+), 32 deletions(-)

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 221cb78..a821354 100644
--- a/core/sis-build-helper/src/main/ant/prepare-release.xml
+++ b/core/sis-build-helper/src/main/ant/prepare-release.xml
@@ -29,12 +29,6 @@
   <!-- Invoked after a branch has been created from the trunk. -->
   <target name="branch">
 
-    <!-- Ensure that the "sis-build-helper" plugin used by the build is the released version.
-->
-    <replaceregexp file = "${user.dir}/pom.xml"
-                  match = "&lt;sis\.plugin\.version&gt;.+&lt;/sis\.plugin\.version&gt;"
-                replace = "&lt;sis.plugin.version&gt;${branch.version}-SNAPSHOT&lt;/sis.plugin.version&gt;"/>
-                <!-- The -SNAPSHOT part will be removed later, at tag creation. -->
-
     <!-- 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*&quot;-SNAPSHOT&quot;"
@@ -69,8 +63,6 @@
       <include name="**/pom.xml"/>
       <replacefilter token="&lt;version&gt;${branch.version}-SNAPSHOT&lt;/version&gt;"
                      value="&lt;version&gt;${sis.version}&lt;/version&gt;"/>
-      <replacefilter token="&lt;sis.plugin.version&gt;${branch.version}-SNAPSHOT&lt;/sis.plugin.version&gt;"
-                     value="&lt;sis.plugin.version&gt;${sis.version}&lt;/sis.plugin.version&gt;"/>
     </replace>
   </target>
 </project>
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 ddbe487..884819a 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
@@ -60,7 +60,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 3f14c69..9883f88 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,12 +67,12 @@ Apache SIS is a free software, Java language library for developing geospatial
a
        ============================================================== -->
   <scm>
     <connection>
-      scm:svn:http://svn.apache.org/repos/asf/sis/trunk
+      scm:svn:http://svn.apache.org/repos/asf/sis/branches/0.8
     </connection>
     <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/sis/trunk
+      scm:svn:https://svn.apache.org/repos/asf/sis/branches/0.8
     </developerConnection>
-    <url>http://svn.apache.org/viewvc/sis/trunk</url>
+    <url>http://svn.apache.org/viewvc/sis/branches/0.8</url>
   </scm>
 
   <ciManagement>
@@ -928,26 +928,6 @@ Apache SIS is a free software, Java language library for developing geospatial
a
   </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.
        ============================================================== -->


Mime
View raw message