sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1583874 - in /sis/branches/JDK7: application/sis-console/src/main/artifact/README core/sis-build-helper/src/main/ant/prepare-release.xml core/sis-utility/src/test/java/org/apache/sis/test/TestSuite.java
Date Wed, 02 Apr 2014 04:32:16 GMT
Author: desruisseaux
Date: Wed Apr  2 04:32:16 2014
New Revision: 1583874

URL: http://svn.apache.org/r1583874
Log:
Minor corrections related to the release process.

Modified:
    sis/branches/JDK7/application/sis-console/src/main/artifact/README
    sis/branches/JDK7/core/sis-build-helper/src/main/ant/prepare-release.xml
    sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/TestSuite.java

Modified: sis/branches/JDK7/application/sis-console/src/main/artifact/README
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-console/src/main/artifact/README?rev=1583874&r1=1583873&r2=1583874&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-console/src/main/artifact/README [UTF-8] (original)
+++ sis/branches/JDK7/application/sis-console/src/main/artifact/README [UTF-8] Wed Apr  2
04:32:16 2014
@@ -17,8 +17,8 @@ SIS is based on Java 6 and provided as a
 
 Unix
 ----
-1) Unzip 'apache-sis-0.3-bin.zip' in any directory.
-2) Add the 'apache-sis-0.3/bin' directory to the path.
+1) Unzip 'apache-sis-0.5-bin.zip' in any directory.
+2) Add the 'apache-sis-0.5/bin' directory to the path.
 3) Invoke 'sis' on the command line.
 
 Windows
@@ -26,8 +26,8 @@ Windows
 There is not yet 'sis.bat' file for Windows.
 The following steps need to be done manually:
 
-1) Unzip 'apache-sis-0.3-bin.zip' in any directory.
-2) In the 'apache-sis-0.3/lib' directory, execute:
+1) Unzip 'apache-sis-0.5-bin.zip' in any directory.
+2) In the 'apache-sis-0.5/lib' directory, execute:
 
      unpack200 --remove-pack-file sis.pack.gz sis.jar
 

Modified: sis/branches/JDK7/core/sis-build-helper/src/main/ant/prepare-release.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/ant/prepare-release.xml?rev=1583874&r1=1583873&r2=1583874&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/ant/prepare-release.xml (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/ant/prepare-release.xml Wed Apr  2 04:32:16
2014
@@ -37,7 +37,6 @@
     <!-- 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"/>
-      <include name="core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Module.java"/>
       <replacefilter token="&quot;${sis.version}-SNAPSHOT&quot;"
                      value="&quot;${sis.version}&quot;"/>
     </replace>

Modified: sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/TestSuite.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/TestSuite.java?rev=1583874&r1=1583873&r2=1583874&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/TestSuite.java [UTF-8]
(original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/TestSuite.java [UTF-8]
Wed Apr  2 04:32:16 2014
@@ -55,6 +55,13 @@ public abstract strictfp class TestSuite
     };
 
     /**
+     * {@code true} for disabling the search for missing tests. This is necessary
+     * when the test suites are executed from an external project, for example during a
+     * <a href="https://svn.apache.org/repos/asf/sis/release-test/maven">release test</a>.
+     */
+    static boolean skipCheckForMissingTests;
+
+    /**
      * Creates a new test suite.
      */
     protected TestSuite() {
@@ -64,9 +71,12 @@ public abstract strictfp class TestSuite
      * Verifies that we did not forgot to declare some test classes in the given suite.
      * This method scans the directory for {@code *Test.class} files.
      *
+     * <p>This check is disabled if {@link #skipCheckForMissingTests} is {@code true}.</p>
+     *
      * @param suite The suite for which to check for missing tests.
      */
     protected static void assertNoMissingTest(final Class<? extends TestSuite> suite)
{
+        if (skipCheckForMissingTests) return;
         final ClassLoader loader = suite.getClassLoader();
         final URL url = loader.getResource(suite.getName().replace('.', '/') + ".class");
         assertNotNull("Test suite class not found.", url);



Mime
View raw message