Commit Graph

7026 Commits

Author SHA1 Message Date
Britton Isbell f3c978e962 Fix: MNG-3938
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@732344 13f79535-47bb-0310-9956-ffa450edef68
2009-01-07 14:03:06 +00:00
Britton Isbell e52473272d Fix: MNG-3856 - Just needed to replace modelProperty.getValue with modelProperty.getResolvedValue.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@732286 13f79535-47bb-0310-9956-ffa450edef68
2009-01-07 09:40:40 +00:00
Britton Isbell 70583e8717 Build broken. Disabled mercury unit test, until issue is fixed.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@732235 13f79535-47bb-0310-9956-ffa450edef68
2009-01-07 06:01:48 +00:00
Oleg Gusakov 6b1e9b923d looks like I added a file by mistake. Don't know where it came from - contains a copy of maven POM, should it be ignored instead - as a build product?
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@732110 13f79535-47bb-0310-9956-ffa450edef68
2009-01-06 20:46:47 +00:00
Oleg Gusakov bea79ffe1d added a unit test for un-substituted variable
Issue id: MNG-3856


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@732103 13f79535-47bb-0310-9956-ffa450edef68
2009-01-06 20:35:12 +00:00
Britton Isbell fb1c3cc39a Updated spec. Includes the Model Container Operator definitions.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731613 13f79535-47bb-0310-9956-ffa450edef68
2009-01-05 16:35:05 +00:00
Jason van Zyl 481cde5756 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731333 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 18:59:28 +00:00
Jason van Zyl 6991c79e34 [maven-release-plugin] prepare release maven-3.0-alpha-1
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731331 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 18:59:05 +00:00
Jason van Zyl 96ad021c1d o notes about the RuntimeInfo class and the Settings object used in the release plugin
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731276 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 15:41:15 +00:00
Jason van Zyl 1b59d7556f o note in the settings.mdo file about the release plugin
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731275 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 15:36:11 +00:00
Jason van Zyl 80a6a03dd6 o get rid of debug output
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731274 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 15:32:55 +00:00
Jason van Zyl bfe3cbf4e9 o the release plugin manages to somehow get its own instance of a Settings so the SettingsAdapter which I use everywhere else gets used except in the release plugin so I have to jack back in the hardcoded RuntimeInfo until I figure out why. not a big deal, i'll list it in the compatibility notes. on another note if you start the release process using release:prepare and it fails, you make code changes, it will happily let you continue and not check the status again.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731273 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 15:32:19 +00:00
Jason van Zyl cc38a455f7 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731271 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 15:29:07 +00:00
Jason van Zyl bab3480d4b [maven-release-plugin] prepare release 3.0-alpha-1
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731269 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 15:28:42 +00:00
Jason van Zyl 59e207e530 o adding runtime info to the settings adapter
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731173 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 04:43:10 +00:00
Jason van Zyl ac091b558c o adding some capatibility for plugins and components that use settings directly.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731172 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 04:42:36 +00:00
Jason van Zyl f7c2d16ee6 o we'll just stick with tex
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@731163 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 03:37:40 +00:00
Jason van Zyl ab9347bc76 o there is a subtle realm problem with plexus and under certain conditions (release deploys) the wagon manager used to populate auth info is not the same as used by the wagon manager. this is fixed in subsequent releases of plexus but i'm not testing everything again so i'm using a static map as a work around. when alpha-1 is released i'll bump the version of plexus and test again.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@730868 13f79535-47bb-0310-9956-ffa450edef68
2009-01-02 23:35:29 +00:00
Benjamin Bentmann 6a3afa1c46 [MNG-1349] openssl checksums are not accepted by maven
o Merged from r730631

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@730635 13f79535-47bb-0310-9956-ffa450edef68
2009-01-01 23:14:07 +00:00
Benjamin Bentmann 970065b4bd [MNG-3424] Respect ordering of elements as given in POM
o Merged from r708871

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@730079 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 09:33:02 +00:00
Britton Isbell a64d505aa3 Fix: MNG-3927
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@730028 13f79535-47bb-0310-9956-ffa450edef68
2008-12-30 01:33:12 +00:00
Britton Isbell 269c07916e Removing final from class. Tycho has a case where it needs to extend.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@729996 13f79535-47bb-0310-9956-ffa450edef68
2008-12-29 21:04:50 +00:00
Benjamin Bentmann da66dd9fd4 [MNG-3933] Profiles.xml does not pickup OS family
Submitted by: Pawel Paprota

o Merged from r729785

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@729787 13f79535-47bb-0310-9956-ffa450edef68
2008-12-28 22:09:20 +00:00
Benjamin Bentmann 72a871c1b2 o Consequently used http://maven.apache.org/xsd/* for the schema locations (merged from r729738)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@729741 13f79535-47bb-0310-9956-ffa450edef68
2008-12-28 14:00:38 +00:00
Herve Boutemy 35472a49f5 o Consequently used http://maven.apache.org/xsd/* for the schema locations (see r729720) (merged from 2.0.10RC branch r729731)
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@729734 13f79535-47bb-0310-9956-ffa450edef68
2008-12-28 13:35:32 +00:00
Benjamin Bentmann d639132f0b o Fixed file checks
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@729517 13f79535-47bb-0310-9956-ffa450edef68
2008-12-26 17:55:13 +00:00
Benjamin Bentmann 4cc361f4ff o Created UT from MNG-3944
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@729514 13f79535-47bb-0310-9956-ffa450edef68
2008-12-26 17:22:22 +00:00
Benjamin Bentmann 8d845eaa55 o Created UT from MNG-3822
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@729511 13f79535-47bb-0310-9956-ffa450edef68
2008-12-26 16:56:31 +00:00
Benjamin Bentmann fd68f59250 o Created UT from MNG-3831
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@729508 13f79535-47bb-0310-9956-ffa450edef68
2008-12-26 16:48:36 +00:00
Benjamin Bentmann 85cf2d029e o Created UT from MNG-3833
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@729507 13f79535-47bb-0310-9956-ffa450edef68
2008-12-26 16:40:57 +00:00
Benjamin Bentmann be34e915c8 o Created UT from MNG-3839
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@729506 13f79535-47bb-0310-9956-ffa450edef68
2008-12-26 16:32:30 +00:00
Benjamin Bentmann abc85c68f4 o Created UT from MNG-3845
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@729505 13f79535-47bb-0310-9956-ffa450edef68
2008-12-26 16:24:20 +00:00
Benjamin Bentmann 3dd7dcecbc o Created UT from MNG-3846
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@729504 13f79535-47bb-0310-9956-ffa450edef68
2008-12-26 16:11:47 +00:00
Benjamin Bentmann cf3b5d2089 o Created UT from MNG-3904
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@729502 13f79535-47bb-0310-9956-ffa450edef68
2008-12-26 15:44:29 +00:00
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