Commit Graph

4298 Commits

Author SHA1 Message Date
Carlos Sanchez Gonzalez 7458db31f5 Remove again the update poms
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@354588 13f79535-47bb-0310-9956-ffa450edef68
2005-12-06 22:08:24 +00:00
John Dennis Casey 5b427cf076 PR: MNG-1630
Submitted By: Edwin Punzalan
Reviewed By: John Casey

Applied patches, with minor changes.

These patches will ensure that the optional flag is passed on and inherited correctly when dealing with managed dependencies.

I changed the patches, in that I added a new createDependencyArtifact(..) method on ArtifactFactory, which will eliminate the need to call an older variant of the method by passing in a null value for the inheritedScope parameter.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@354544 13f79535-47bb-0310-9956-ffa450edef68
2005-12-06 20:50:41 +00:00
Carlos Sanchez Gonzalez 662331c8de Added blacklisted patterns and changed some names
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@354531 13f79535-47bb-0310-9956-ffa450edef68
2005-12-06 20:06:49 +00:00
John Dennis Casey 8737086036 Adding install step.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@354505 13f79535-47bb-0310-9956-ffa450edef68
2005-12-06 19:19:35 +00:00
Carlos Sanchez Gonzalez 5a51ac576b Revert last change as it seems not to work right in all cases
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@354499 13f79535-47bb-0310-9956-ffa450edef68
2005-12-06 19:03:23 +00:00
John Dennis Casey 8e85652193 PR: MNG-1355
Submitted By: Edwin Punzalan
Reviewed By: John Casey

Applied patch, with small logical fix (used getArtifactId() where getGroupId() was the intention).

This patch will guard against overwriting cached models in the project builder (check for pre-existing model in cache before adding), and will validate that a POM's parent has a different groupId:artifactId than the current POM.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@354473 13f79535-47bb-0310-9956-ffa450edef68
2005-12-06 16:50:22 +00:00
John Dennis Casey eeb14425c6 PR: MNG-1352
Submitted By: Edwin Punzalan
Reviewed By: John Casey

Applied this patch, which will ensure that alias != param.getName() before adding a duplicate diagnostic message for configuration.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@354464 13f79535-47bb-0310-9956-ffa450edef68
2005-12-06 16:34:09 +00:00
John Dennis Casey a321da38d6 PR: MNG-1525
Submitted By: Edwin Punzalan
Reviewed By: John Casey

NOT applying this patch. I found a better solution that will factor the interpolation of the POM into a flexible utility in plexus-utils, and will allow introduction of envar resolution to the POM. It will also make interpolating the settings.xml and profiles.xml using any of a number of expression resolvers (using envar resolution only for now).

BTW, I tried using System.getenv(..) in JDK1.4, and it fails with java.lang.Error and a deprecation message. So, I'm using Edwin's code to extract the envars into a Properties object. We can improve this later.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@354462 13f79535-47bb-0310-9956-ffa450edef68
2005-12-06 16:28:07 +00:00
Brett Leslie Porter 601181f4c2 update plugins too as long as we are still building them
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@353955 13f79535-47bb-0310-9956-ffa450edef68
2005-12-05 01:43:27 +00:00
John Dennis Casey 77249c67de Backing out changes from MNG-1650, since this was already implemented in the archiver.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@351505 13f79535-47bb-0310-9956-ffa450edef68
2005-12-01 22:20:31 +00:00
John Dennis Casey b0b047eff9 PR: MNG-1650
Submitted By: Allan Ramirez
Reviewed By: John Casey

Applied patch, with modifications. First, refactored to avoid the use of a member variable for turning POM inclusion on/off. Second, please remember to follow the code formatting rules for Maven, available on the project website.

This patch provides a new method for createArchive(..) which includes a flag for turning off POM inclusion from the resulting archive. The default mode used by the original createArchive(..) method is still to include POM information.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@351476 13f79535-47bb-0310-9956-ffa450edef68
2005-12-01 21:32:42 +00:00
John Dennis Casey 3230df32bf PR: MNG-1721
Fixing NPE when error parameter is null.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@350275 13f79535-47bb-0310-9956-ffa450edef68
2005-12-01 17:04:09 +00:00
Carlos Sanchez Gonzalez 2177e3763e Use mvn command instead of deprecated m2
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@350201 13f79535-47bb-0310-9956-ffa450edef68
2005-12-01 07:48:50 +00:00
Carlos Sanchez Gonzalez d5f6646670 Use com.sun for jdk tools groupId
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@350040 13f79535-47bb-0310-9956-ffa450edef68
2005-11-30 20:34:10 +00:00
Brett Leslie Porter d837a7caad rely on managed versions
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@350033 13f79535-47bb-0310-9956-ffa450edef68
2005-11-30 20:03:30 +00:00
John Dennis Casey a0db0c3347 Adding dep on p-u to fix the build.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@349968 13f79535-47bb-0310-9956-ffa450edef68
2005-11-30 15:50:02 +00:00
Brett Leslie Porter dd9cbdcd14 switch Apache snapshots to Apache repo
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@349708 13f79535-47bb-0310-9956-ffa450edef68
2005-11-29 11:25:04 +00:00
Brett Leslie Porter b392f199fb prevent NPE in equals()
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@349699 13f79535-47bb-0310-9956-ffa450edef68
2005-11-29 10:36:47 +00:00
Brett Leslie Porter 1bd7f792fc fix classifier for java sources and javadoc dependencies
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@349652 13f79535-47bb-0310-9956-ffa450edef68
2005-11-29 05:14:20 +00:00
John Dennis Casey 6dcceeaaa5 Bumping p-c-d version to 1.0-alpha-9-SNAPSHOT for fix of MNG-1559. This is probably not sufficient reason to bump this version by itself, but we can make that decision later.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@349612 13f79535-47bb-0310-9956-ffa450edef68
2005-11-29 04:07:19 +00:00
Brett Leslie Porter 54039076f9 fix website refs
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@349349 13f79535-47bb-0310-9956-ffa450edef68
2005-11-28 03:11:40 +00:00
Brett Leslie Porter 1b54300da4 couple of minor fixes
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@349347 13f79535-47bb-0310-9956-ffa450edef68
2005-11-28 02:45:33 +00:00
Brett Leslie Porter 5ef9888de1 add model converted from repoclean
PR: MRM-29


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@349340 13f79535-47bb-0310-9956-ffa450edef68
2005-11-28 01:34:44 +00:00
Brett Leslie Porter 2d277b04a0 fix command
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@349043 13f79535-47bb-0310-9956-ffa450edef68
2005-11-26 00:17:33 +00:00
Brett Leslie Porter b4d9f55274 remove // in a URL
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@348904 13f79535-47bb-0310-9956-ffa450edef68
2005-11-25 07:04:39 +00:00
Brett Leslie Porter d32f5f9835 allow, eg, dom4j
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@348897 13f79535-47bb-0310-9956-ffa450edef68
2005-11-25 06:48:28 +00:00
Brett Leslie Porter 2ad3a3d8f3 update rules
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@348890 13f79535-47bb-0310-9956-ffa450edef68
2005-11-25 06:31:44 +00:00
Brett Leslie Porter 62e8e280d5 fix location
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@348876 13f79535-47bb-0310-9956-ffa450edef68
2005-11-25 04:50:31 +00:00
Brett Leslie Porter b866f19ccb add rewrite config
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@348871 13f79535-47bb-0310-9956-ffa450edef68
2005-11-25 04:36:33 +00:00
Carlos Sanchez Gonzalez 052a96d05b Changed test from file to dir
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@348852 13f79535-47bb-0310-9956-ffa450edef68
2005-11-25 01:59:34 +00:00
Carlos Sanchez Gonzalez 40bfc6eb06 Add info about new groupIds
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@348850 13f79535-47bb-0310-9956-ffa450edef68
2005-11-25 01:45:23 +00:00
Brett Leslie Porter d978342687 script fixes
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@348720 13f79535-47bb-0310-9956-ffa450edef68
2005-11-24 12:11:33 +00:00
Brett Leslie Porter 374776dd40 mkdir
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@348714 13f79535-47bb-0310-9956-ffa450edef68
2005-11-24 11:46:56 +00:00
Brett Leslie Porter 7928a66ef5 add post commit script
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@348705 13f79535-47bb-0310-9956-ffa450edef68
2005-11-24 10:59:18 +00:00
Brett Leslie Porter a1f894839b do not update poms in sync script, it is already run concurrently from cron
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@348702 13f79535-47bb-0310-9956-ffa450edef68
2005-11-24 10:45:55 +00:00
Brett Leslie Porter 1ccd3c75b0 ignore
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@348586 13f79535-47bb-0310-9956-ffa450edef68
2005-11-23 22:32:27 +00:00
John Dennis Casey 57e7d0acdb Adding more detailed comment for optional artifact inclusion.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@348584 13f79535-47bb-0310-9956-ffa450edef68
2005-11-23 22:27:41 +00:00
Carlos Sanchez Gonzalez 854e81579c Added option to upload sources
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@348569 13f79535-47bb-0310-9956-ffa450edef68
2005-11-23 21:40:18 +00:00
John Dennis Casey 0e5015360b PR: MNG-1666
Submitted By: John Casey

Fixed escaped expression handling in the plugin parameter expression evaluator. '$$' was not being replaced by '$' correctly.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@348489 13f79535-47bb-0310-9956-ffa450edef68
2005-11-23 17:01:09 +00:00
John Dennis Casey ffb7f270ab PR: MNG-1417
Submitted By: John Casey

Prevent the artifact collector from firing an inclusion event when the node is disabled. In this case, the node will not be included in any subsequent classpath, so firing an inclusion/selection event is incorrect.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@348473 13f79535-47bb-0310-9956-ffa450edef68
2005-11-23 16:11:42 +00:00
John Dennis Casey 07c2c719a4 setting the artifact versionRange instead of the version itself for artifacts created as a result of relocation.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@348467 13f79535-47bb-0310-9956-ffa450edef68
2005-11-23 15:49:36 +00:00
Carlos Sanchez Gonzalez bb5c7568d4 PR: MRM-28
Revert last change as it makes a lot of files to be resynced again

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@348227 13f79535-47bb-0310-9956-ffa450edef68
2005-11-22 19:51:25 +00:00
Carlos Sanchez Gonzalez 38b29edec2 PR: MRM-28
Remove size-only parameter

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@348041 13f79535-47bb-0310-9956-ffa450edef68
2005-11-22 00:13:14 +00:00
Brett Leslie Porter 271c4a2f36 always call $JAVA_HOME/bin/java
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@348004 13f79535-47bb-0310-9956-ffa450edef68
2005-11-21 22:42:41 +00:00
Brett Leslie Porter 7bef1723ce remove old docs
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345839 13f79535-47bb-0310-9956-ffa450edef68
2005-11-21 05:21:17 +00:00
Brett Leslie Porter 88091f6d63 so long mboot2, you were a good friend
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345826 13f79535-47bb-0310-9956-ffa450edef68
2005-11-21 04:29:15 +00:00
Brett Leslie Porter d69207adea fix bootstrap on linux
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345692 13f79535-47bb-0310-9956-ffa450edef68
2005-11-20 00:14:46 +00:00
Brett Leslie Porter ab24e2805c PR: MNG-1620
Submitted by: Bruno Aranda
add .par and .ejb3 to the classpath.
also set the language to java


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345645 13f79535-47bb-0310-9956-ffa450edef68
2005-11-19 10:15:21 +00:00
Jason van Zyl 02902d53a2 --------------------------------------------------------------
Issue: MNG-1470
     URL: http://jira.codehaus.org/browse/MNG-1470
 Summary: mvn can't calculate M2_HOME when mvn is a relative symlink
Reporter: Nicolás Lichtmaier (niqueco)
--------------------------------------------------------------

o patch applied
 


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345559 13f79535-47bb-0310-9956-ffa450edef68
2005-11-18 20:12:21 +00:00
Jason van Zyl 4350da7547 Issue: MNG-1416
URL: http://jira.codehaus.org/browse/MNG-1416
 Summary: Patch:  Small addition to Settings.xml documentation
Reporter: K.C. Baltz (kcbaltz)

o apply patch to mdo file to doco on properties 


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@345485 13f79535-47bb-0310-9956-ffa450edef68
2005-11-18 14:05:06 +00:00