Commit Graph

6842 Commits

Author SHA1 Message Date
Benjamin Bentmann 5952595d24 o Formatted code
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@729501 13f79535-47bb-0310-9956-ffa450edef68
2008-12-26 15:33:38 +00:00
Benjamin Bentmann 2bb74899fe o Added license header
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@729500 13f79535-47bb-0310-9956-ffa450edef68
2008-12-26 15:30:58 +00:00
Benjamin Bentmann d186d9996c o Created UT from MNG-3906
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@729499 13f79535-47bb-0310-9956-ffa450edef68
2008-12-26 15:12:07 +00:00
Benjamin Bentmann ea3c2217af o Created UT from MNG-3924
o Created UT from MNG-3943
o Used trimmed down POMs for UT for MNG-3916

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@729496 13f79535-47bb-0310-9956-ffa450edef68
2008-12-26 14:01:42 +00:00
Benjamin Bentmann 35f57af76e o Used proper launcher class instead of legacy one
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@729303 13f79535-47bb-0310-9956-ffa450edef68
2008-12-24 11:57:34 +00:00
Benjamin Bentmann 3ec459f512 o Removed unreachable code (older JVMs will always bail out before the code is executed)
M:\apache-maven-3.0-SNAPSHOT\bin>mvn -v
Exception in thread "main" java.lang.UnsupportedClassVersionError: org/apache/maven/cli/MavenCli (Unsupported major.minor version 49.0)
        at java.lang.ClassLoader.defineClass0(Native Method)
        at java.lang.ClassLoader.defineClass(ClassLoader.java:539)
        at java.security.SecureClassLoader.defineClass(SecureClassLoader.java:123)
        at java.net.URLClassLoader.defineClass(URLClassLoader.java:251)
        at java.net.URLClassLoader.access$100(URLClassLoader.java:55)
        at java.net.URLClassLoader$1.run(URLClassLoader.java:194)
        at java.security.AccessController.doPrivileged(Native Method)
        at java.net.URLClassLoader.findClass(URLClassLoader.java:187)
        at java.lang.ClassLoader.loadClass(ClassLoader.java:289)
        at org.codehaus.plexus.classworlds.realm.ClassRealm.loadRealmClass(ClassRealm.java:174)
        at org.codehaus.plexus.classworlds.strategy.DefaultStrategy.loadClass(DefaultStrategy.java:67)
        at org.codehaus.plexus.classworlds.strategy.ForeignStrategy.loadClass(ForeignStrategy.java:39)
        at org.codehaus.plexus.classworlds.realm.ClassRealm.loadClass(ClassRealm.java:207)
        at org.codehaus.plexus.classworlds.realm.ClassRealm.loadClass(ClassRealm.java:201)
        at org.codehaus.plexus.classworlds.launcher.Launcher.getMainClass(Launcher.java:144)
        at org.codehaus.plexus.classworlds.launcher.Launcher.launchEnhanced(Launcher.java:266)
        at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:229)
        at org.codehaus.plexus.classworlds.launcher.Launcher.mainWithExitCode(Launcher.java:408)
        at org.codehaus.plexus.classworlds.launcher.Launcher.main(Launcher.java:351)
        at org.codehaus.classworlds.Launcher.main(Launcher.java:31)

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@729292 13f79535-47bb-0310-9956-ffa450edef68
2008-12-24 10:52:56 +00:00
Benjamin Bentmann 7f8675a19e [MNG-3940] Interpolation of environment variables is not case-insensitive on Windows
o Updated to plexus-utils:1.5.6 which includes PLXUTILS-82
o Merged from r729060

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@729066 13f79535-47bb-0310-9956-ffa450edef68
2008-12-23 19:02:30 +00:00
Vincent Siveton ce4bdb993c o merged r728997
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@728999 13f79535-47bb-0310-9956-ffa450edef68
2008-12-23 15:26:00 +00:00
Vincent Siveton 868094bd1a o using latest parent
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@728995 13f79535-47bb-0310-9956-ffa450edef68
2008-12-23 15:22:53 +00:00
Benjamin Bentmann c4e05f0830 [MNG-3867] Support MAVEN_OPTS in mvnDebug script
o Merged from r728940

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@728945 13f79535-47bb-0310-9956-ffa450edef68
2008-12-23 13:13:24 +00:00
Britton Isbell f39ec410da Reverted back changes for MNG-3821. Broke bootstrap.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@728871 13f79535-47bb-0310-9956-ffa450edef68
2008-12-23 04:57:42 +00:00
Herve Boutemy 222c25a73b [MNG-3224] toolchains XSD has wrong namespace
o specify unique namespace

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@728800 13f79535-47bb-0310-9956-ffa450edef68
2008-12-22 22:05:58 +00:00
Benjamin Bentmann 8211a14a65 o Enabled fixed test, disabled broken test
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@728744 13f79535-47bb-0310-9956-ffa450edef68
2008-12-22 19:14:37 +00:00
Benjamin Bentmann 6befed27b5 o Created UT from MNG-3938
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@728743 13f79535-47bb-0310-9956-ffa450edef68
2008-12-22 19:09:55 +00:00
Britton Isbell e253e09019 We are no longer using IdModelContainerFactory to create the Plugin Execution ID model containers.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@728742 13f79535-47bb-0310-9956-ffa450edef68
2008-12-22 19:00:10 +00:00
Britton Isbell b6d3fe1cde Fix: MNG-3821 - We can't feed containers of containers into the ModelTransformerContext. Merging of subcontainers needs to be handled in the ModelTransformer implementation.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@728739 13f79535-47bb-0310-9956-ffa450edef68
2008-12-22 18:32:56 +00:00
Benjamin Bentmann 52d13db42f o Created UT from MNG-3937
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@728725 13f79535-47bb-0310-9956-ffa450edef68
2008-12-22 16:59:19 +00:00
Benjamin Bentmann 50f8ed0dac o Splitted tests to ease understanding/debugging
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@728698 13f79535-47bb-0310-9956-ffa450edef68
2008-12-22 14:11:03 +00:00
Benjamin Bentmann f07fdb2032 o Created UT from MNG-3925
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@728694 13f79535-47bb-0310-9956-ffa450edef68
2008-12-22 13:55:17 +00:00
Benjamin Bentmann 7555ab36e1 o Created UT from MNG-3887
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@728675 13f79535-47bb-0310-9956-ffa450edef68
2008-12-22 13:09:02 +00:00
Benjamin Bentmann 8fdaaf6218 o Created UT from MNG-3886
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@728667 13f79535-47bb-0310-9956-ffa450edef68
2008-12-22 12:46:34 +00:00
Benjamin Bentmann cb1d2917fa o Synced UT with MNG-3838
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@728660 13f79535-47bb-0310-9956-ffa450edef68
2008-12-22 12:23:52 +00:00
Benjamin Bentmann 3ce9917532 o Created UT from MNG-3821
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@728654 13f79535-47bb-0310-9956-ffa450edef68
2008-12-22 11:48:10 +00:00
Benjamin Bentmann edb695cff5 o Fixed svn:keywords
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@728647 13f79535-47bb-0310-9956-ffa450edef68
2008-12-22 11:13:43 +00:00
Benjamin Bentmann c64d5b2bd5 o Set svn:eol-style=native
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@728644 13f79535-47bb-0310-9956-ffa450edef68
2008-12-22 11:08:33 +00:00
Benjamin Bentmann 922ace51f8 [MNG-3930] mvn.bat doesn't handle ampersand in Windows user name properly
o Merged from r728264

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@728267 13f79535-47bb-0310-9956-ffa450edef68
2008-12-20 11:08:27 +00:00
Benjamin Bentmann 088b7c6241 o Fixed typo
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@728100 13f79535-47bb-0310-9956-ffa450edef68
2008-12-19 18:30:34 +00:00
Britton Isbell 807bb6ddc7 Fix: Unable to resolve parent pom that is a snapshot. Added policies from config during build. Also fixed bug in ArtifactPolicySnapshots, allowed override of default policies with a null value.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@728090 13f79535-47bb-0310-9956-ffa450edef68
2008-12-19 18:21:37 +00:00
Jason van Zyl 30dbc6db99 o fix typo
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@728071 13f79535-47bb-0310-9956-ffa450edef68
2008-12-19 17:14:15 +00:00
Jason van Zyl 434431ec8d o restore the plugin registry cli option for compat with the verifier
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@728066 13f79535-47bb-0310-9956-ffa450edef68
2008-12-19 17:05:15 +00:00
Benjamin Bentmann 2bbb812470 [MNG-3451] [MNG-3790] German localization for maven-core
Submitted by: Christian Schulte

o Applied with minor modifications
o Merged from r727998

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@728001 13f79535-47bb-0310-9956-ffa450edef68
2008-12-19 10:57:30 +00:00
Jason van Zyl 0ab54cf0c7 o imports
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727857 13f79535-47bb-0310-9956-ffa450edef68
2008-12-18 23:49:48 +00:00
Britton Isbell e24f7564f7 Fix: there was a problem with pom construction if there were two or more plugins with dependencies elements.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727855 13f79535-47bb-0310-9956-ffa450edef68
2008-12-18 23:35:31 +00:00
Brett Leslie Porter 77c278e5d1 [MNG-3795] Add example <pluginGroups> snippet to conf/settings.xml in distribution
Submitted by: Benjamin Bentmann


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727688 13f79535-47bb-0310-9956-ffa450edef68
2008-12-18 10:36:02 +00:00
Brett Leslie Porter 385888d545 [MNG-3757] avoid deleting M2_HOME if it is empty
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727671 13f79535-47bb-0310-9956-ffa450edef68
2008-12-18 07:59:58 +00:00
Jason van Zyl e0cdbdc475 o notes on how to improve the test so that it's easy to get others involved in adding/correcting the spec and accompanying tests.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727638 13f79535-47bb-0310-9956-ffa450edef68
2008-12-18 04:29:15 +00:00
Jason van Zyl cce3456998 o get rid of debug information
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727637 13f79535-47bb-0310-9956-ffa450edef68
2008-12-18 04:24:27 +00:00
Jason van Zyl 854a44adf0 o testing ThatExecutionsWithoutIdsAreMergedAndTheChildWins
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727635 13f79535-47bb-0310-9956-ffa450edef68
2008-12-18 04:23:35 +00:00
Jason van Zyl 4dcf7797bb o another concrete example of executions inheritance
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727627 13f79535-47bb-0310-9956-ffa450edef68
2008-12-18 03:27:17 +00:00
Jason van Zyl 2560c1e0bb o don't let inherited executions from plugin management containers be appended, they need to be overridden if there is no execution id
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727623 13f79535-47bb-0310-9956-ffa450edef68
2008-12-18 03:16:52 +00:00
Britton Isbell 61a5d19c4e Artifacts containers now will inherit versions. This will occur before management rules are applied.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727614 13f79535-47bb-0310-9956-ffa450edef68
2008-12-18 01:45:13 +00:00
Jason van Zyl f67099266e o adding a way to get a value from an xpath expression
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727585 13f79535-47bb-0310-9956-ffa450edef68
2008-12-17 23:48:07 +00:00
Jason van Zyl 730b56bb9c o using jxpath to simplify the queries for testing the spec.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727584 13f79535-47bb-0310-9956-ffa450edef68
2008-12-17 23:47:30 +00:00
Britton Isbell 1ab2db1205 Test Wrapper for domain model.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727574 13f79535-47bb-0310-9956-ffa450edef68
2008-12-17 23:17:47 +00:00
Benjamin Bentmann 04b358629c [MNG-3921] Extensions are subject to NPEs in their hashCode() impl
o Merged from r727548

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727561 13f79535-47bb-0310-9956-ffa450edef68
2008-12-17 22:45:30 +00:00
Jason van Zyl 9002e05de5 MNG-3916: fixing the joining of executions in plugin containers.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727516 13f79535-47bb-0310-9956-ffa450edef68
2008-12-17 21:25:46 +00:00
Jason van Zyl 1ba8aa4479 o need to set the lineage count on the transformed model
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727463 13f79535-47bb-0310-9956-ffa450edef68
2008-12-17 18:38:45 +00:00
Jason van Zyl 306d70f8f5 o adding some test code to share with shane
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727460 13f79535-47bb-0310-9956-ffa450edef68
2008-12-17 18:32:01 +00:00
Jason van Zyl 699640f2ec o notes about the testing
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727330 13f79535-47bb-0310-9956-ffa450edef68
2008-12-17 09:53:09 +00:00
Jason van Zyl 2b808a15d1 o start of harness for validating the spec, i have my first error expressed in a test where plugin executions are
not joined properly. and the journey begins ...


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@727322 13f79535-47bb-0310-9956-ffa450edef68
2008-12-17 09:34:16 +00:00