You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/12/24 12:09:11 UTC
svn commit: r729294 - in /maven/components/branches/maven-2.1.x: ./
maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
maven-core/src/test/java/org/apache/maven/cli/MavenCliTest.java
Author: bentmann
Date: Wed Dec 24 03:09:10 2008
New Revision: 729294
URL: http://svn.apache.org/viewvc?rev=729294&view=rev
Log:
o Removed unreachable code (older JVMs will always bail out before the code is executed)
o Merged from r729292
M:\am\2.1.0-M1\bin\mvn -v
Exception in thread "main" java.lang.UnsupportedClassVersionError: org/apache/maven/cli/MavenCli (Unsupported major.minor version 48.0)
at java.lang.ClassLoader.defineClass0(Native Method)
at java.lang.ClassLoader.defineClass(ClassLoader.java:488)
at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:106)
at java.net.URLClassLoader.defineClass(URLClassLoader.java:243)
at java.net.URLClassLoader.access$100(URLClassLoader.java:51)
at java.net.URLClassLoader$1.run(URLClassLoader.java:190)
at java.security.AccessController.doPrivileged(Native Method)
at java.net.URLClassLoader.findClass(URLClassLoader.java:183)
at java.lang.ClassLoader.loadClass(ClassLoader.java:294)
at org.codehaus.classworlds.RealmClassLoader.loadClassDirect(RealmClassLoader.java:195)
at org.codehaus.classworlds.DefaultClassRealm.loadClass(DefaultClassRealm.java:255)
at org.codehaus.classworlds.Launcher.getMainClass(Launcher.java:169)
at org.codehaus.classworlds.Launcher.launchEnhanced(Launcher.java:292)
at org.codehaus.classworlds.Launcher.launch(Launcher.java:255)
at org.codehaus.classworlds.Launcher.mainWithExitCode(Launcher.java:430)
at org.codehaus.classworlds.Launcher.main(Launcher.java:375)
Modified:
maven/components/branches/maven-2.1.x/ (props changed)
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
maven/components/branches/maven-2.1.x/maven-core/src/test/java/org/apache/maven/cli/MavenCliTest.java
Propchange: maven/components/branches/maven-2.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 24 03:09:10 2008
@@ -2,4 +2,4 @@
/maven/components/branches/maven-2.0.x:679552-679867,693956-728820,728836,728940,729060
/maven/components/branches/maven-2.1.0-M1-RC:690315,691793-694304
/maven/components/branches/maven-2.1.0-RC:688883,689695,689976,689990
-/maven/components/trunk:720001,721902,726845
+/maven/components/trunk:720001,721902,726845,729292
Modified: maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java?rev=729294&r1=729293&r2=729294&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java (original)
+++ maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java Wed Dec 24 03:09:10 2008
@@ -124,22 +124,6 @@
return 1;
}
- // TODO: maybe classworlds could handle this requirement...
- if ( "1.4".compareTo( System.getProperty( "java.specification.version" ) ) > 0 )
- {
- System.err.println( "Sorry, but JDK 1.4 or above is required to execute Maven. You appear to be using "
- + "Java:" );
- System.err.println( "java version \"" + System.getProperty( "java.version", "<unknown java version>" )
- + "\"" );
- System.err.println( System.getProperty( "java.runtime.name", "<unknown runtime name>" ) + " (build "
- + System.getProperty( "java.runtime.version", "<unknown runtime version>" ) + ")" );
- System.err.println( System.getProperty( "java.vm.name", "<unknown vm name>" ) + " (build "
- + System.getProperty( "java.vm.version", "<unknown vm version>" ) + ", "
- + System.getProperty( "java.vm.info", "<unknown vm info>" ) + ")" );
-
- return 1;
- }
-
boolean debug = commandLine.hasOption( CLIManager.DEBUG );
boolean showErrors = debug || commandLine.hasOption( CLIManager.ERRORS );
Modified: maven/components/branches/maven-2.1.x/maven-core/src/test/java/org/apache/maven/cli/MavenCliTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core/src/test/java/org/apache/maven/cli/MavenCliTest.java?rev=729294&r1=729293&r2=729294&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-core/src/test/java/org/apache/maven/cli/MavenCliTest.java (original)
+++ maven/components/branches/maven-2.1.x/maven-core/src/test/java/org/apache/maven/cli/MavenCliTest.java Wed Dec 24 03:09:10 2008
@@ -37,49 +37,6 @@
public class MavenCliTest
extends TestCase
{
- /**
- * Test that JDK 1.4 or above is required to execute MavenCli
- *
- * @throws Exception
- */
- public void testMain()
- throws Exception
- {
- ClassWorld classWorld = new ClassWorld();
-
- PrintStream oldErr = System.err;
- PrintStream oldOut = System.out;
-
- OutputStream errOS = new StringOutputStream();
- PrintStream err = new PrintStream( errOS );
- System.setErr( err );
- OutputStream outOS = new StringOutputStream();
- PrintStream out = new PrintStream( outOS );
- System.setOut( out );
-
- try
- {
- System.setProperty( "java.specification.version", "1.0" );
- assertEquals( 1, MavenCli.main( new String[] { "-h" }, classWorld ) );
- System.setProperty( "java.specification.version", "1.1" );
- assertEquals( 1, MavenCli.main( new String[] { "-h" }, classWorld ) );
- System.setProperty( "java.specification.version", "1.2" );
- assertEquals( 1, MavenCli.main( new String[] { "-h" }, classWorld ) );
- System.setProperty( "java.specification.version", "1.3" );
- assertEquals( 1, MavenCli.main( new String[] { "-h" }, classWorld ) );
- System.setProperty( "java.specification.version", "1.4" );
- assertEquals( 0, MavenCli.main( new String[] { "-h" }, classWorld ) );
- System.setProperty( "java.specification.version", "1.5" );
- assertEquals( 0, MavenCli.main( new String[] { "-h" }, classWorld ) );
- System.setProperty( "java.specification.version", "1.6" );
- assertEquals( 0, MavenCli.main( new String[] { "-h" }, classWorld ) );
- }
- finally
- {
- System.setErr( oldErr );
- System.setOut( oldOut );
- }
- }
public void testGetExecutionProperties()
throws Exception