Author: desruisseaux
Date: Tue Feb 3 23:29:58 2015
New Revision: 1656950
URL: http://svn.apache.org/r1656950
Log:
Prepare the branch for the 0.5 release.
Modified:
sis/branches/0.5/core/sis-build-helper/src/main/ant/prepare-release.xml
sis/branches/0.5/core/sis-utility/src/main/java/org/apache/sis/internal/system/Supervisor.java
sis/branches/0.5/core/sis-utility/src/main/java/org/apache/sis/util/Version.java
sis/branches/0.5/pom.xml
Modified:
sis/branches/0.5/core/sis-build-helper/src/main/ant/prepare-release.xml
URL:
http://svn.apache.org/viewvc/sis/branches/0.5/core/sis-build-helper/src/main/ant/prepare-release.xml?rev=1656950&r1=1656949&r2=1656950&view=diff
==============================================================================
--- sis/branches/0.5/core/sis-build-helper/src/main/ant/prepare-release.xml
(original)
+++ sis/branches/0.5/core/sis-build-helper/src/main/ant/prepare-release.xml Tue
Feb 3 23:29:58 2015
@@ -35,11 +35,9 @@
replace =
"<sis.plugin.version>${sis.version}-SNAPSHOT</sis.plugin.version>"/>
<!-- Replace the version number in Java code. -->
- <replace dir="${user.dir}" failOnNoReplacements="true">
- <include
name="core/sis-utility/src/main/java/org/apache/sis/util/Version.java"/>
- <replacefilter token=""${sis.version}-SNAPSHOT""
- value=""${sis.version}""/>
- </replace>
+ <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 URL to trunk by URL to the branch on Subversion. -->
<replace dir="${user.dir}" failOnNoReplacements="true">
Modified:
sis/branches/0.5/core/sis-utility/src/main/java/org/apache/sis/internal/system/Supervisor.java
URL:
http://svn.apache.org/viewvc/sis/branches/0.5/core/sis-utility/src/main/java/org/apache/sis/internal/system/Supervisor.java?rev=1656950&r1=1656949&r2=1656950&view=diff
==============================================================================
---
sis/branches/0.5/core/sis-utility/src/main/java/org/apache/sis/internal/system/Supervisor.java
[UTF-8] (original)
+++
sis/branches/0.5/core/sis-utility/src/main/java/org/apache/sis/internal/system/Supervisor.java
[UTF-8] Tue Feb 3 23:29:58 2015
@@ -60,7 +60,7 @@ public final class Supervisor extends St
* Whatever JMX agent is enabled. Setting this variable to {@code false}
allows the
* Java compiler to omit any dependency to this {@code Supervisor} class.
*/
- static final boolean ENABLED = true;
+ static final boolean ENABLED = false;
/**
* The JMX object name for the {@code Supervisor} service.
Modified:
sis/branches/0.5/core/sis-utility/src/main/java/org/apache/sis/util/Version.java
URL:
http://svn.apache.org/viewvc/sis/branches/0.5/core/sis-utility/src/main/java/org/apache/sis/util/Version.java?rev=1656950&r1=1656949&r2=1656950&view=diff
==============================================================================
---
sis/branches/0.5/core/sis-utility/src/main/java/org/apache/sis/util/Version.java
[UTF-8] (original)
+++
sis/branches/0.5/core/sis-utility/src/main/java/org/apache/sis/util/Version.java
[UTF-8] Tue Feb 3 23:29:58 2015
@@ -60,7 +60,7 @@ public class Version implements CharSequ
/**
* 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}
Modified: sis/branches/0.5/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/0.5/pom.xml?rev=1656950&r1=1656949&r2=1656950&view=diff
==============================================================================
--- sis/branches/0.5/pom.xml (original)
+++ sis/branches/0.5/pom.xml Tue Feb 3 23:29:58 2015
@@ -68,12 +68,12 @@ Apache SIS is a free software, Java lang
============================================================== -->
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/sis/trunk
+ scm:svn:http://svn.apache.org/repos/asf/sis/branches/0.5
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/sis/trunk
+ scm:svn:https://svn.apache.org/repos/asf/sis/branches/0.5
</developerConnection>
- <url>http://svn.apache.org/viewvc/sis/trunk</url>
+ <url>http://svn.apache.org/viewvc/sis/branches/0.5</url>
</scm>
<ciManagement>
@@ -411,7 +411,7 @@ Apache SIS is a free software, Java lang
<!-- Following properties are branch-specific -->
<maven.compile.source>1.6</maven.compile.source>
<maven.compile.target>1.6</maven.compile.target>
- <sis.plugin.version>${project.version}</sis.plugin.version>
+ <sis.plugin.version>0.5-SNAPSHOT</sis.plugin.version>
<geoapi.version>3.0.0</geoapi.version>
</properties>
@@ -709,26 +709,6 @@ Apache SIS is a free software, Java lang
</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.
============================================================== -->
