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:42:06 UTC

[sis] 01/03: Remove build configuration not relevant to the release.

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch 1.0-RC
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 78b6d72fbb4f072406581d5438fe8cfa4e838178
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Wed Sep 18 14:18:43 2019 +0200

    Remove build configuration not relevant to the release.
---
 .../src/main/ant/prepare-release.xml               | 68 ----------------------
 pom.xml                                            | 20 -------
 2 files changed, 88 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
deleted file mode 100644
index a821354..0000000
--- a/core/sis-build-helper/src/main/ant/prepare-release.xml
+++ /dev/null
@@ -1,68 +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*&quot;-SNAPSHOT&quot;"
-                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="&lt;version&gt;${branch.version}-SNAPSHOT&lt;/version&gt;"
-                     value="&lt;version&gt;${sis.version}&lt;/version&gt;"/>
-    </replace>
-  </target>
-</project>
diff --git a/pom.xml b/pom.xml
index 6ee3f4c..66bf4c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -970,26 +970,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.
        ============================================================== -->