Commit Graph

51 Commits

Author SHA1 Message Date
Jason van Zyl 3979ed47d3 o removing jdom from the core for the embedder and we will soon have a different tool for writing out POMs, trying to slim
down the core


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@586044 13f79535-47bb-0310-9956-ffa450edef68
2007-10-18 18:05:59 +00:00
John Dennis Casey b3c99db34a Fixing it0022
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@585699 13f79535-47bb-0310-9956-ffa450edef68
2007-10-17 21:01:50 +00:00
Herve Boutemy eecea0895e [MNG-2254] support XML file encoding when reading/writing settings and pom files
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@585265 13f79535-47bb-0310-9956-ffa450edef68
2007-10-16 21:26:43 +00:00
Jason van Zyl e108c1abdf o remove duplicate licenses
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@573134 13f79535-47bb-0310-9956-ffa450edef68
2007-09-06 02:32:38 +00:00
Jason van Zyl d8e8dd00b6 updating license headers
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@513036 13f79535-47bb-0310-9956-ffa450edef68
2007-02-28 22:52:16 +00:00
John Dennis Casey 086c589776 Adding default profile-id's.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@509744 13f79535-47bb-0310-9956-ffa450edef68
2007-02-20 20:51:15 +00:00
Jason van Zyl 72e7a4df53 o lining up all the uses of modello and using 1.0-alpha-13 of the modello plugin everywhere
o add the generation of a JDOMWriter for use in the embedder so that working with models doesn't                                    
  completely whack the existing XML, and allow for outputting the namespace declarations                                            
o add a security manager to the embedder which is off by default but will barf if someone                                           
  tries to set system properties. you have to specifically turn this on because it will more then                                   
  likely break tons of code like xerces setting a system property named "version", nice.       



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@493811 13f79535-47bb-0310-9956-ffa450edef68
2007-01-07 19:13:33 +00:00
Carlos Sanchez Gonzalez f7a33ca068 POM cleanup, remove inherited fields, added license and xsd
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@419880 13f79535-47bb-0310-9956-ffa450edef68
2006-07-07 12:23:28 +00:00
Carlos Sanchez Gonzalez ba6d62aeb2 Set svn properties
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@419870 13f79535-47bb-0310-9956-ffa450edef68
2006-07-07 11:17:34 +00:00
Carlos Sanchez Gonzalez 0f3ec3e38d Fix site generation
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@419869 13f79535-47bb-0310-9956-ffa450edef68
2006-07-07 11:16:53 +00:00
John Dennis Casey eab65e11ad (merged from branch revId: 379662.)
Original URL: http://svn.apache.org/viewcvs?rev=379662&view=rev

[MNG-2095] Adding xsd generation to site phase for modello projects.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@379663 13f79535-47bb-0310-9956-ffa450edef68
2006-02-22 03:13:17 +00:00
Brett Leslie Porter 9ae0914694 flip trunk to 2.1-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@356316 13f79535-47bb-0310-9956-ffa450edef68
2005-12-12 18:22:06 +00:00
John Dennis Casey 8a5fa61b17 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@356099 13f79535-47bb-0310-9956-ffa450edef68
2005-12-12 01:41:09 +00:00
John Dennis Casey 9cf94e34f2 [maven-release-plugin] prepare release maven-2.0.1
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@356093 13f79535-47bb-0310-9956-ffa450edef68
2005-12-12 01:34:03 +00:00
John Dennis Casey 187716230f Changing the version of modello plugin to the released.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@356077 13f79535-47bb-0310-9956-ffa450edef68
2005-12-12 01:02:52 +00:00
Brett Leslie Porter 65acc94926 implement lax parsing of repository metadata XML files
PR: MNG-1788


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@355404 13f79535-47bb-0310-9956-ffa450edef68
2005-12-09 07:58:04 +00:00
John Dennis Casey 5b7cea23b3 Fixing missing file reader init.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@355294 13f79535-47bb-0310-9956-ffa450edef68
2005-12-09 00:40:15 +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 b4c041a567 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@321042 13f79535-47bb-0310-9956-ffa450edef68
2005-10-14 07:26:39 +00:00
Brett Leslie Porter d783c5fc41 [maven-release-plugin] prepare release maven-2.0
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@321040 13f79535-47bb-0310-9956-ffa450edef68
2005-10-14 07:15:39 +00:00
Brett Leslie Porter 8c8c0c6b9e updated deps
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@315005 13f79535-47bb-0310-9956-ffa450edef68
2005-10-12 19:09:10 +00:00
Brett Leslie Porter 510de4fe54 upgrade plexus utils to 1.0.4-SNAPSHOT.
The group ID has changed, so add a bunch of exclusions to ensure the old is not picked up
fix bugs in mboot that wasn't honoring excludes.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@307294 13f79535-47bb-0310-9956-ffa450edef68
2005-10-08 14:13:31 +00:00
Brett Leslie Porter 192de6841a [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293588 13f79535-47bb-0310-9956-ffa450edef68
2005-10-04 11:13:52 +00:00
Brett Leslie Porter b4e4a1f375 [maven-release-plugin] prepare release maven-2.0-beta-3
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293584 13f79535-47bb-0310-9956-ffa450edef68
2005-10-04 11:02:48 +00:00
John Dennis Casey def783e4cf Resolving: MNG-934, MNG-669
o Changed default value for usePluginRegistry to 'false' in settings.mdo
o Changed default value for updateInterval to 'never' in plugin-registry.mdo
o Added ActivationOS in settings.mdo, profiles.mdo, maven.mdo
o Added code to the conversion utilities for Settings and Profiles to corresponding maven-model classes for ActivationOS
o Added OS activator for profiles which allows architecture, name, family, and version (with '!' negation of any of these)
o Added ActivationFile to settings.mdo, along with conversion code in the Settings->Model conversion utility
o Added packageWithVersion configuration to the modello plugin definition in maven-settings (this is apparently required now)



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293479 13f79535-47bb-0310-9956-ffa450edef68
2005-10-04 01:07:36 +00:00
Brett Leslie Porter 21350c840b PR: MNG-644
remove deprecated settings and profile settings

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293326 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 12:49:40 +00:00
Brett Leslie Porter c5acaded88 upgrade to plexus 1.0-alpha-7 container, switching to new group ID
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@293193 13f79535-47bb-0310-9956-ffa450edef68
2005-10-03 00:54:01 +00:00
Brett Leslie Porter 27bc0aea4d [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291643 13f79535-47bb-0310-9956-ffa450edef68
2005-09-26 15:30:36 +00:00
Brett Leslie Porter 80c8e188b8 [maven-release-plugin] prepare release maven-2.0-beta-2
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291641 13f79535-47bb-0310-9956-ffa450edef68
2005-09-26 15:18:55 +00:00
Brett Leslie Porter 06ab86cb54 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289368 13f79535-47bb-0310-9956-ffa450edef68
2005-09-16 02:57:16 +00:00
Brett Leslie Porter 5632e45815 [maven-release-plugin] prepare release maven-2.0-beta-1
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@289366 13f79535-47bb-0310-9956-ffa450edef68
2005-09-16 02:50:12 +00:00
Brett Leslie Porter fd4eb4c1d2 some dependency clean up
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280759 13f79535-47bb-0310-9956-ffa450edef68
2005-09-14 04:08:29 +00:00
Kenney Westerhof 4aa55430cf o Put modello-maven-plugin under dependencyManagement and chose version
1.0-alpha-5-SNAPSHOT for all so they're all the same.
  
o Updated modello plugin invocations in all poms to by adding execution elements
  and fixing goals section to get rid of deprecated notation.
  
o Removed dependency on modello-core in maven-plugin-tools; it seems it
  was there because maven-plugin-tools-java used StringUtils from modello -
  changed that to use the plexus-utils version.

o Reversed commons-cli version back to 1.0 (brett asked me to, a few days back).

o Updated all models to use fully qualified classnames - do not assume
  java.util.* is included! (it won't be anymore from modello 
  1.0-alpha-5-SNAPSHOT onward).

o Added some <?xml processing instructions to some models that didn't have them
  - vim now recognizes these files as XML (so I get syntax highlighting :))




git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280539 13f79535-47bb-0310-9956-ffa450edef68
2005-09-13 11:41:52 +00:00
John Dennis Casey c9b6d83c57 Resolving: MNG-835. Using activateByDefault within activation in the profile.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@280476 13f79535-47bb-0310-9956-ffa450edef68
2005-09-13 03:23:16 +00:00
Brett Leslie Porter 6d3dbc96c7 PR: MNG-821
Submitted by: Jesse McConnell
Reviewed by:  Brett Porter
Add file existence based profile activation


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@267429 13f79535-47bb-0310-9956-ffa450edef68
2005-09-03 06:59:07 +00:00
John Dennis Casey fe5a91b0d6 Working on: MNG-483
Fixing profile application to separate profiles discovered in and around POM from those in settings.xml, and apply them separately in the order: 

for-each-project-in-inheritance:{POM, profiles.xml}, settings.xml

Added common interface for accumulating, explicitly activating and deactivating, and retrieving profiles to be applied to a given project. This manager interface (ProfileManager) is general enough to be applicable to both the project-level and settings-level profiles.

Added 'performRelease'-keyed profile to super-POM which will be used by the release plugin and anyone using a parallel process, and which will enable '-DupdateReleaseInfo=true' for the deploy mojo, along with enabling the source attachment for the project.

Added 'attach' parameter to JarSourceMojo to allow local POM to turn off source attachments, overriding release profile in super-pom.

Updated the release:perform mojo to use '-DperformRelease=true' for switching on the new release profile, rather than just using '-DupdateReleaseInfo=true'...



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@233013 13f79535-47bb-0310-9956-ffa450edef68
2005-08-16 16:31:02 +00:00
Kenney Westerhof d396f24642 o Put all m2 core dependencies (plexus-container-default and plexus-utils)
under dependencyManagement of m2 and maven-plugins, and removed
  versions in all poms having either as a parent.
  Used version 1.0.2-SNAPSHOT for plexus-utils as that was used in maven-core
  and is not overridable.

o Bumped maven-archiver version to 2.0-beta-1-SNAPSHOT for maven-ear-plugin


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@227084 13f79535-47bb-0310-9956-ffa450edef68
2005-08-02 21:34:54 +00:00
Brett Leslie Porter 086463b5b4 PR: MNG-456
allow separate snapshot and release repositories
deprecate existing snapshotPolicy and checksumPolicy in favour of updatePolicy and checksumPolicy within the <releases> and <snapshots> elements in the <repository> element.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@224707 13f79535-47bb-0310-9956-ffa450edef68
2005-07-25 09:51:12 +00:00
Brett Leslie Porter 511af3d3e2 PR: MNG-596
add XSD definition to m2 poms and archetypes



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@220079 13f79535-47bb-0310-9956-ffa450edef68
2005-07-21 13:58:42 +00:00
John Dennis Casey 99bdd48d92 Bumping plexus-utils version to 1.0.1
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@219984 13f79535-47bb-0310-9956-ffa450edef68
2005-07-21 02:17:16 +00:00
Emmanuel Venisse a029d766ce Update all versions to beta-1-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@202001 13f79535-47bb-0310-9956-ffa450edef68
2005-06-27 15:29:14 +00:00
John Dennis Casey fcbc5e7d6f Resolving: MNG-495
o Pressing [ENTER] at a plugin update prompt should result in the plugin being registered, as indicated by the prompt.
o Use CLI switch '--no-plugin-updates' to suppress usage of the plugin registry
o Use CLI switch '--update-plugins' to force updated/resolved plugin versions to be registered
o Neither of these has a short CLI option, since we're starting to run out of sensible char options for these types of things.


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@193082 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 06:03:10 +00:00
John Dennis Casey 6100b37321 Updating non-maven, non-modello deps to get rid of snapshots. Also removed marmalade stuff from mboot.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@193052 13f79535-47bb-0310-9956-ffa450edef68
2005-06-23 02:31:28 +00:00
Brett Leslie Porter b138c8d378 reformat and optimize imports
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191627 13f79535-47bb-0310-9956-ffa450edef68
2005-06-21 05:42:35 +00:00
John Dennis Casey 9aaca6a72d o Added conversion handling of checksumPolicy to Settings and Profiles.
o Moved the profiles-builder stuff into maven-profile, to make that API more self-contained for reuse in Ant tasks, etc.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191551 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 20:08:05 +00:00
John Dennis Casey fda77afb12 Resolving issue: MNG-339
o Added checksumPolicy to artifact repository construction, which meant changing all the places where the factory was called.

o Added two command-line switches (-C=strict-checksum-checking, -c=lax-checksum-checking, or warning)

o Added checksum policy to all repository definitions (profiles.mdo, settings.mdo, maven.mdo)

o Changed the maven-artifact-ant stuff to use a Repository definition with checksumPolicy added to it

NOTE: I just realized that I haven't touched the inheritance/conversion of repository stuff from profiles/settings.xml to the model. I'll do this, and commit the additional changes.

Currently, the default checksum policy is to warn, since there are still bad checksums out there that prevent bootstrapping. Once we chase these down, we can change to default-strict checking. When verifying checksums, SHA-1 is attempted first, with MD5 acting as a backup verification method. If the checksum verification fails legitimately (not related to the process of retrieving/reading the checksum file), then the verification process is repeated ONCE ONLY.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@191536 13f79535-47bb-0310-9956-ffa450edef68
2005-06-20 18:53:53 +00:00
John Dennis Casey 1fc7419f03 o Added <properties/> for profiles configured in the pom.xml
o Split ModelNormalizationUtils into two utility classes in the maven-profile and maven-settings projects, to be used for converting Profile instances from the settings.xml and profiles.xml into maven-model instances.



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@190344 13f79535-47bb-0310-9956-ffa450edef68
2005-06-13 04:21:27 +00:00
John Dennis Casey a58b76e2e4 Adding profiles.xml and settings.xml support for profiles, along with integration tests for each.
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189510 13f79535-47bb-0310-9956-ffa450edef68
2005-06-08 03:27:43 +00:00
John Dennis Casey 29878afcc6 o pom-level profiles are working now
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@189464 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 22:36:44 +00:00
John Dennis Casey 215c30bbb3 Moved the packages org.apache.maven.model.settings and org.apache.maven.model.profiles to org.apache.maven.settings and org.apache.maven.profiles, respectively.
This is restoring the settings to their original package structure, and putting profiles next to it...the change I'm reversing was not a good one, conceptually.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@179289 13f79535-47bb-0310-9956-ffa450edef68
2005-05-31 21:48:55 +00:00