Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
10,519 Commits 83 Branches 96 Tags 108 MiB
Commit Graph

2948 Commits

Author SHA1 Message Date
Robert Scholte 4b263106db [MNG-5755] Access toolchains without maven-toolchain-plugin 
Added List<Toolchain> getToolchains( MavenSession session, String type, Map<String, String> requirements ) to ToolchainManager
 2015-01-18 16:53:56 +01:00
Robert Scholte b6ae8ef8ab [MNG-5754] Toolchains should be read during initialization 
DefaultToolchainManagerPrivate now uses toolchains from MavenExecutionRequest
 2015-01-17 17:24:00 +01:00
Robert Scholte f75008743b [MNG-5754] Toolchains should be read during initialization 
MavenExecutionRequest has been extended with toolchains, which is filled by MavenCli
Interfaces have been extended with new methods, assuming only Maven provides implementations
 2015-01-17 15:45:53 +01:00
Robert Scholte 99f763decd Add junit tests for DefaultToolchainsBuilder and ToolchainsBuildingException 2015-01-16 13:24:57 +01:00
Jason van Zyl 36d491a648 MNG-5753: Allow plugin implementors to choose how they want the configuration created for a particular MojoExecution 2015-01-15 15:16:59 -05:00
Robert Scholte 32053c99d7 Add junittests for DefaultToolchain 
Implement toString() for better log messages
 2015-01-12 23:23:31 +01:00
Robert Scholte 3e133902fb Additional unittests for DefaultToolchainManagerPrivate 
Remove unnecessary null checks for Lists
Improve javadoc
 2015-01-11 22:02:14 +01:00
Robert Scholte 2d0ec94269 [MNG-5716] Add unittests for DefaultToolchainManagerPrivate 2015-01-10 22:58:24 +01:00
Igor Fedorenko bb4988496a better plugin/extensions realm parent classloader 
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
 2015-01-08 08:08:47 -05:00
Tibor17 3a6f63345c [MNG-5702] Final Fields on DefaultMavenExecutionResult.java 2015-01-02 20:20:26 +01:00
Tibor17 4d33358be2 [MNG-5702] Final Fields on DefaultMavenExecutionResult.java 2015-01-02 20:01:20 +01:00
Karl Heinz Marbaise 6f0318ed68 [MNG-5702] Wrong reactor summary output while using -T option 
Fixed checkstyle reported errors.
 2014-12-31 11:34:27 +01:00
Karl Heinz Marbaise cb91332d3d [MNG-5702] Wrong reactor summary output while using -T option 
Changing into a better solution which doesn't change the
 implemented type of Map but use a synchronized one.
 2014-12-31 11:25:55 +01:00
Karl Heinz Marbaise 3b671d0734 [MNG-5702] Wrong reactor summary output while using -T option 
Fixed by using ConcurrentMap instead non synchronized ones.
 2014-12-29 14:33:47 +01:00
Igor Fedorenko 6ab41ee8d3 MNG-5742 fixed null ComponentDescriptor#realm for extensions plugins 
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
 2014-12-26 13:27:51 -05:00
Hervé Boutemy c239f6ea6f [MNG-5748] keep builderId on copy 2014-12-26 17:24:39 +01:00
Hervé Boutemy 328a777cd5 [MNG-5747] keep useLegacyLocalRepositoryManager on copy 2014-12-26 17:19:40 +01:00
Igor Fedorenko 1420d61c05 MNG-5742 fixed duplicate plugin realms when extensions=true 
Consolidated plugin realm setup logic in DefaultMavenPluginManager.
Extensions realm is fully setup during project loading and the same
realm is used to both load extensions and execute plugin goals now.

Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
 2014-12-25 13:31:29 -05:00
Robert Scholte dbecf3b5cd Rename package so it has same structure as settings and model 2014-12-25 15:55:13 +01:00
Robert Scholte ceae922653 [MNG-3891] Modify maven-toolchain to look in ${maven.home}/conf/toolchains.xml and in ${user.home}/.m2/toolchains.xml 
Also added new cmdline option: -gt / --global-toolchains
 2014-12-25 14:55:02 +01:00
Jason van Zyl fa71e5f5ad [maven-release-plugin] prepare for next development iteration 2014-12-14 12:22:54 -05:00
Jason van Zyl 12a6b3acb9 [maven-release-plugin] prepare release maven-3.2.5 2014-12-14 12:22:35 -05:00
Hervé Boutemy 0252eb2a1f updated unit test 2014-12-13 18:09:45 +01:00
Hervé Boutemy 61f1d01ba8 since this class is new, immediately mark it package protected: it is 
the implementation of JavaToolchain interface (even if the interface is
empty at the moment)
 2014-12-13 17:52:31 +01:00
Hervé Boutemy 6f1bc80f3e added a notice about internal API 2014-12-13 15:18:31 +01:00
Igor Fedorenko d6e45a5d56 MNG-5719 reintroduced DefaultJavaToolChain 
DefaultJavaToolChain was the only way to access JDK toolchain
javaHome parameter and was used by some clients, notably Tycho.
The class is now marked as deprecated and clients are adviced to
use JavaToolchainImpl instead.

Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
 2014-12-13 08:42:07 -05:00
Jason van Zyl 35c49f7a5e [maven-release-plugin] prepare for next development iteration 2014-12-12 16:14:40 -05:00
Jason van Zyl ed0e6acb01 [maven-release-plugin] prepare release maven-3.2.4 2014-12-12 16:14:23 -05:00
Igor Fedorenko 369889296e introduced RepositorySessionDecorator 
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
 2014-11-25 19:11:00 -05:00
Igor Fedorenko c15226f13f decoupled project #file and #basedir to allow pom.xml processing 
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
 2014-11-25 19:11:00 -05:00
Igor Fedorenko 8643e00993 introduced ProjectArtifactFactory component 
this hides use of deprecated/legacy ArtifactFactory and allows custom
project dependency artifact creation logic.

Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
 2014-11-25 19:11:00 -05:00
Igor Fedorenko ce6f0bfdb5 MNG-5727 fixed cryptic exception when managed depenency has no <version> 
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
 2014-11-25 19:11:00 -05:00
Robert Scholte 5c84bd33ba [MNG-5714] Add Merger for Maven Toolchain 2014-11-25 22:40:18 +01:00
Michael Osipov 0343c52601 Trimmed trailing whitespace 2014-11-23 13:04:30 +01:00
Hervé Boutemy b1b80f61a4 improved explanations 2014-11-15 02:50:38 +01:00
Hervé Boutemy e661aa87f5 improved javadoc and Java toolchain implementation class name (not a 
Plexus component, then DefaultComponentName convention doesn't apply)
 2014-11-08 22:43:09 +01:00
Hervé Boutemy 36d746789d make algo more visible 2014-11-08 21:53:16 +01:00
Hervé Boutemy bdf5770f95 improved documentation 2014-11-05 01:36:24 +01:00
Hervé Boutemy aef3b36c0e renamed DefaultJavaToolchainFactory to JavaToolchainFactory to ease 
understanding: there is no JavaToolchainFactory Plexus component
 2014-11-05 01:32:21 +01:00
Hervé Boutemy eddfef3394 improved javadoc 2014-11-05 01:24:32 +01:00
Hervé Boutemy b8d220c686 prepare provides before configuration, to follown descriptor logic 2014-11-05 01:23:26 +01:00
Hervé Boutemy 44174308a6 [MNG-5719] take the case change into account 2014-11-04 01:10:56 +01:00
Hervé Boutemy b013d97ceb [MNG-5719] renamed JavaToolChain to JavaToolchain for consistency and 
removed its Plexus component declaration
 2014-11-04 00:58:27 +01:00
Robert Scholte fa4f7040ad [MNG-5718] Change 'provides' from Object to Properties in toolchains.xml 2014-11-03 23:10:06 +01:00
Robert Scholte 01a879384c Add tests for equals() and hashCode() 2014-11-02 22:34:19 +01:00
Robert Scholte 21c13ca484 [MNG-5717] Enrich toolchain xml with merge information 
Pushing version forward from 1.0.0 to 1.1.0
 2014-11-02 21:15:50 +01:00
Robert Scholte 2d086fde25 remove unused import 2014-11-02 20:20:24 +01:00
Robert Scholte a131ac8d0a [MNG-5714] Add Merger for Maven Toolchain 
implement equals() and hashCode() for DefaultToolchain to help the
Merger
 2014-11-02 20:20:23 +01:00
Hervé Boutemy 2252862e2a [MNG-5716] return toolchains that are of expected type 2014-11-02 19:41:21 +01:00
Hervé Boutemy 24900f9301 [MNG-5713] fixed stupid typo due to JavaToolChain with C instead of c 2014-10-31 17:07:08 +01:00
Hervé Boutemy b0eb12b662 [MNG-5713] improved Toolchains API description 2014-10-31 16:51:23 +01:00
Hervé Boutemy 347ec7b6e7 [MNG-5712] improved toolchains descriptor documentation 2014-10-31 07:44:30 +01:00
Hervé Boutemy 366f57c563 updated parent pom (and fixed issues...) 2014-10-24 01:25:49 +02:00
Igor Fedorenko b80fb7d7ce MNG-5695 fixed inconsistent/incomplete custom guice scope bindings 
MojoExecution scope was only available for maven plugins and could not
be used for components defined in maven core or maven code extensions.

Session scope was only available for maven core and core extensions
but did not work for components from maven plugins.

Made both custom scopes available available in all realms.

Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
 2014-09-26 21:55:30 -04:00
Kristian Rosenvold 3d2d8619b1 [MNG-5687] Parallel Builds can build in wrong order 
Fixed JDK8 IT failure for MavenITmng3004ReactorFailureBehaviorMultithreadedTest#testitFailFastSingleThread

It turns out the execution order of the modules in the build can be incorrect, in some cases severely incorrect.
For parallel builds this can have all sorts of interesting side effects such as classpath
appearing to be intermittently incorrect, missing jars/resources and similar.

The -am options and -amd options may simply fail with the incorrect build order
because expected dependencies have not been built and actual dependencies may not have been built.

The underlying problem was that ProjectDependencyGraph#getDownstreamProjects and getUpstreamProjects
did not actually obey the reactor build order as defined by ProjectDependencyGraph#getSortedProjects,
even though the javadoc claims they should.

This has only worked by accident on earlier JDK's and might not have worked at all (basically
depends on Set iteration order being equal to insertion order). JDK8 has slightly different
iteration order, which caused the IT failure.

This problem may be the root cause of MNG-4996 and any other issue where the modules build
in incorrect order.

The bug affects:

parallel builds
command line -am (--also-make) option
command line -amd (also-make-dependents) option

On all java versions, although visibility might be somewhat different on different jdks.

Added simple unit test that catches the problem.
 2014-09-10 16:22:21 +02:00
Igor Fedorenko 0ba8fa1258 enabled JSR330-only components in all unit tests 
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
 2014-08-27 10:15:25 -04:00
Igor Fedorenko e67714aa26 sisu 0.3.0M1, sisu-guice 3.2.3 
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
 2014-08-26 14:11:21 -04:00
Jason van Zyl 5fff038d71 MNG-5683: Expand session scope so that @SessionScoped components can be injected into lifecycle participants. 2014-08-26 13:25:03 -04:00
Hervé Boutemy ca2b26ac5d fix a lot of checkstyle violations for future m-checkstyle-p 2.13, as 
proof of concept for misc violations suppressions strategies
 2014-08-19 00:17:28 +02:00
Jason van Zyl 1ed1d8cd3d [maven-release-plugin] prepare for next development iteration 2014-08-11 13:55:03 -07:00
Jason van Zyl 33f8c3e102 [maven-release-plugin] prepare release maven-3.2.3 2014-08-11 13:54:57 -07:00
brianf 9216191869 default to ssl for central 2014-08-11 08:41:48 -04:00
Igor Fedorenko 693f8f6604 MNG-5677 hooks to allow fine-grained cache management 
Also fixed broken cache #flush() and missing #dispose() in
couple of places.

Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
 2014-08-08 22:28:06 +04:00
Igor Fedorenko 8980f67b9b MNG-5670 guard against ConcurrentModificationException iterating over System properties 
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
 2014-07-30 07:57:53 +04:00
markdingram 61c3740425 Fixes MNG-5663 - a regression introduced in 3.2.2 by MNG-5639 that prevents nested import POMs from resolving their dependencies. 
The cuplrit was the resetRepositories method in tandem with the repository
list instances being shared between ModelResolvers.

- The copy constructor for the ModelResolvers now creates new lists.
- The resetRepositories method has been removed. Instead there is a
'replace' parameter on the addRepository method that allows the
desired parameter replacement of MNG-5639 to take place.

Signed-off-by: Jason van Zyl <jason@tesla.io>
 2014-07-18 19:30:32 -04:00
Jason van Zyl faa29dee78 MNG-5656: Update maven-compiler-plugin to 3.1 in the default-bindings.xml 2014-07-06 15:05:11 -04:00
Jason van Zyl 1a4c003a2b MNG-5349: Make sure lifecycles have and id. When we switch to JSR330 I would prefer to use private final fields in Lifecycle.java and use the Precondition.assertNotNull check. This will serve for now. 2014-07-05 22:04:11 -04:00
Jason van Zyl 6cf9320942 MNG-5661: First step toward an immutable Maven Project. This removes all compentry from MavenProject. There's a note at the top 
of the class which describes the rest of the work.

check point
 2014-07-05 16:15:36 -04:00
Jason van Zyl ce6fc6237a Adding a note about the deprecation 2014-07-05 16:05:06 -04:00
Jason van Zyl 9cc2caeb9f Deprecate unused version of the project dependencies resovler in the core 2014-07-05 08:18:38 -04:00
Igor Fedorenko 963373726d MNG-5655 deduplicate WeakMojoExecutionListener instances 
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
 2014-06-26 09:07:30 -04:00
Kristian Rosenvold 4da87163f9 Added synchronization around copying system properties since they are a singleton, 
fix for [MRRESOURCES-65] and similar problem in assembly
 2014-06-20 17:16:52 +02:00
Jason van Zyl a18f5af192 [maven-release-plugin] prepare for next development iteration 2014-06-17 09:36:07 -04:00
Jason van Zyl 45f7c06d68 [maven-release-plugin] prepare release maven-3.2.2 2014-06-17 09:36:00 -04:00
Hervé Boutemy ffff00e908 fixed errors reported by Checkstyle 2014-06-16 18:30:24 +02:00
Christian Schulte 045bd1503b MNG-2199: Version ranges not supported for parent artifacts 
Fixes #21
Signed-off-by: Jason van Zyl <jason@tesla.io>
 2014-06-14 16:47:00 -04:00
Jason van Zyl e112cd89c7 MNG-3954: Remove the RuntimeInfo required in the setting.mdo 2014-06-13 12:07:11 -04:00
Jason van Zyl 661b4cf8f3 MNG-5620: LinkageError when CDI is in the classpath 2014-06-13 10:33:30 -04:00
Jason van Zyl 2a4d172600 MNG-5452: ${maven.build.timestamp} should use UTC instead of local timezone (or be configurable) 2014-06-13 10:25:37 -04:00
Jason van Zyl f1dcec88ae I inadvertently broke a test, my shell script doesn't check the failure and carried on. Sorry about that. 2014-06-12 10:29:47 -04:00
Jason van Zyl fc5cd37109 MNG-5346: update maven-plugin-plugin:descriptor default binding from generate-resources phase to process-classes 2014-06-12 02:57:02 -04:00
Mark Ingram 016932edbc MNG-5639: Support resolution of Import Scope POMs from Repo that contains a ${parameter} 
Fix up previous

Signed-off-by: Jason van Zyl <jason@tesla.io>
 2014-06-10 08:55:24 -04:00
Tamas Cservenak 18964baa25 Make sure participants and session scope exit are called 
Even in case of failing build.

Signed-off-by: Jason van Zyl <jason@tesla.io>
 2014-06-10 07:27:03 -04:00
Hervé Boutemy 73d35ba959 fixed errors reported by Checkstyle 2014-05-25 00:00:26 +02:00
Hervé Boutemy d402cc3dfc improved javadoc 2014-05-24 17:16:00 +02:00
Michael Osipov 0499d1d36a Merged https://github.com/apache/maven/pull/14. This closes #14. 2014-05-24 15:13:59 +02:00
Pavel Sorokin bd27f7814f MNG-5625: Fix typo 2014-05-24 12:29:09 +02:00
Pavel Sorokin 9468599ca3 MNG-5625: Correct the wording of the log message 2014-05-24 12:22:08 +02:00
Hervé Boutemy adc6d52361 extended javadoc 2014-05-24 11:21:21 +02:00
Pavel Sorokin 7a3e1ad740 MNG-5625: Provide a terse information about the used thread builder 2014-05-23 16:08:25 +02:00
Igor Fedorenko 702acd2e8b MNG-5578 fixed guice OutOfScopeException during multithreaded build 
This was a regression since 3.2.1 introduced by my commit 48fec944

Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
 2014-05-22 14:55:28 -04:00
Jason van Zyl bef7fac6e3 [MNG-5613] fix NullPointerException when error occur during project dependency graph creation 
Submitted by: Sebastian Le Merdy <sebastian.lemerdy@gmail.com>
From: https://github.com/apache/maven/pull/13
 2014-05-20 20:26:27 -04:00
Hervé Boutemy b527490517 removed unused imports 2014-05-10 16:19:28 +02:00
Igor Fedorenko ac8e59ac60 MNG-5591 use 'reactor' hint for reactor WorkspaceReader 
When maven is invoked from m2e, container.lookup(WorkspaceReader.class)
returns component with role-hint=ide, which I believe is a bug in Susi
or Guice (or at least well misunderstood feature). This masks
ReactorReader workspace reader implementation and breaks reactor
dependency resolution.

The solution is to use explicit "reactor" role hint for ReactorReader.
This avoids fuzzy default component lookup logic and guarantees reactor
reader is always used regardless of presence of other workspace readers.

Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
 2014-02-28 23:54:51 -05:00
Igor Fedorenko 48fec9440d MNG-5578 cleanup redundant session binding in mojo executin scope 
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
 2014-02-28 21:15:42 -05:00
Jason van Zyl 969a35dd42 Add a provisional marker to the Builder interface and add a bit of javadoc. 2014-02-15 10:42:57 -05:00
Jason van Zyl cd55c4fcbe [maven-release-plugin] prepare for next development iteration 2014-02-14 12:32:50 -05:00
Jason van Zyl ea8b2b0764 [maven-release-plugin] prepare release maven-3.2.1 2014-02-14 12:32:44 -05:00
Jason van Zyl 9459c0a9f3 Move the POMs back the 3.2.1-SNAPSHOT 2014-02-14 12:14:35 -05:00
Jason van Zyl e4d073b681 [maven-release-plugin] prepare for next development iteration 2014-02-14 12:00:12 -05:00
Jason van Zyl 1ef536c7b8 [maven-release-plugin] prepare release maven-3.2.1 2014-02-14 12:00:04 -05:00
Igor Fedorenko 0f1fcd7066 Revert "MNG-5552 made classifier part of MavenProject.artifactMap key" 
This reverts commit f35698c790.

There are plugins that rely on the broken behaviour and I don't have the
time to fix this in backwards compatible way right now.

http://markmail.org/message/gjfuofw5gpsr5yxz

Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
 2014-02-13 21:41:07 -05:00
Jason van Zyl 30fadd074e Fix for multithreading configuration where you have something like -TC2.2 2014-02-12 11:43:51 -05:00
Jason van Zyl d8c57c441d [maven-release-plugin] prepare for next development iteration 2014-02-10 19:55:28 -05:00
Jason van Zyl 9f109b6047 [maven-release-plugin] prepare release maven-3.2.0 2014-02-10 19:55:21 -05:00
Jason van Zyl bc9bd89838 Roll back to 3.2.0-SNAPSHOT 2014-02-10 19:51:43 -05:00
Olivier Lamy bc3f5dcc8e add missing license header 2014-02-11 11:37:33 +11:00
Jason van Zyl 1bf4b9e3e6 [maven-release-plugin] prepare for next development iteration 2014-02-10 18:27:37 -05:00
Jason van Zyl ffe7dc4073 [maven-release-plugin] prepare release maven-3.2.0 2014-02-10 18:27:30 -05:00
Jason van Zyl 8d489a2deb MNG-5582: Continue to track all the projects in the reactor even if the set is constrained by --projects 2014-02-10 14:56:06 -05:00
Igor Fedorenko f8afa711df MNG-5581 Introduced LifecycleMappingDelegate extension point 
LifecycleMappingDelegate allows extension points provide custom
lifecycle mapping logic. The main usecase is to allow lifecycle
that reuse plugin configuration from default lifecycle. For
example "test-only" lifecycle will only run mojos bound to
tests phase of default lifecycle and nothing else.

Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
 2014-02-09 22:09:34 -05:00
Jason van Zyl 1d84cbeffa MNG-5578: Make the workspace reader pluggable by creating a session scope where the MavenSession created can be injected in implementations that have the @SessionScoped annotation 2014-02-09 21:52:35 -05:00
Kristian Rosenvold 276c7636d3 Removed the remaining weave mode code 2014-02-09 13:52:22 +01:00
Michael Osipov be19ddb6d9 [MNG-5176] Print build times in an ISO 8601-style manner 2014-02-09 12:14:43 +01:00
Robert Scholte f6bb98f584 [MNG-5572] Warn for building plugins with extensions in a reactor 2014-02-08 19:21:34 +01:00
Hervé Boutemy 81619e6f1a restore public interface 2014-02-08 16:41:28 +01:00
Hervé Boutemy 4a39c02156 fixed errors reported by Checkstyle 2014-02-08 16:38:31 +01:00
Jason van Zyl a7cb1596c1 MNG-5479: ExecutionEvent.Type.SessionEnded omited when runtime exception thrown 2014-02-06 22:21:55 -05:00
Jason van Zyl 097cc8d25f Move ThreadOutputMuxer to sit along with the multithreaded Builder implementation 2014-02-06 16:39:15 -05:00
Jason van Zyl 0c5678fa89 Remove weave mode building from the core 2014-02-06 16:27:15 -05:00
Jason van Zyl ccc7cb3abc Forgot to remove the deleted files. 2014-02-05 22:48:04 -05:00
Jason van Zyl 09961c3150 MNG-5575: Separate distinct build strategies into their own new Builder implementation. The interface is not ideal yet, but gives us a cleaner 
separation of implementations and gives us a path forward.
 2014-02-05 22:43:04 -05:00
Jason van Zyl 3bf568eda6 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/maven 2014-02-03 17:37:52 -05:00
Jason van Zyl 90ab970006 Hiding the project sorter as it is an implementation detail of the graph and I want to make another implementation. 2014-02-03 17:37:05 -05:00
Igor Fedorenko 43d67de045 MNG-5570 unit test lifecycle participant influence reactor order 
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
 2014-01-29 07:40:19 -05:00
Jason van Zyl b05dd063f9 Slight addition to MNG-5389 so that the afterSessionEnd method throws a MavenExecutionException like the other methods in the participant 2014-01-24 11:36:50 -05:00
Igor Fedorenko 8f3eca3d0f MNG-5389 introduced MavenLifecycleParticipant#afterSessionEnd callback 
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
 2014-01-19 18:48:43 -05:00
Robert Scholte 91499839cf [MNG-5230] Command line option to exclude modules from reactor 
Contributed by Luuk van den Broek, slightly changed by Robert Scholte
Exclude/include marker char now match profiles, i.e +, ! and -
 2014-01-09 00:06:19 +01:00
Jason van Zyl 6e3f24babc Updated the notes about the order of processing and a small problem with the conflation of duplicate checkingin getProjectMap 2014-01-06 12:16:06 -05:00
Jason van Zyl 7c3052ddeb MNG-5557: Constrain the set of projects that are passed into the ReactorReader as specified by --projects 
- Add some documentation about the lifecycle within DefaultMaven
- Remove the use of DelegatingLocalArtifactRepository in DefaultMaven as it has been replaced with the use of the
  ReactorReader which is an implementation of Aether's WorkspaceReader
- Localize the manipulation of the ProjectBuildingRequest to getProjectsFromReactor()
- Deprecated getLogger()
 2014-01-06 10:55:01 -05:00
Stephen Connolly 3929f55c31 Remove redundant casts 2014-01-06 11:23:19 +00:00
Stephen Connolly 5f29be799f Remove dead code (initializers) 2014-01-06 11:21:26 +00:00
Stephen Connolly 9a9cf059fd Just in case of file lock extra try and delete 2014-01-06 11:08:14 +00:00
Stephen Connolly e2b7ea2a96 Compare Xpp3Dom instances not objects that are different types and are being compared by Object.equals i.e. instance identity 2014-01-06 11:00:47 +00:00
Stephen Connolly 4b6eaadd28 Remove redundant Null check 2014-01-06 10:54:26 +00:00
Stephen Connolly 7ec819a2ce Remove redundant Null check 2014-01-06 10:53:51 +00:00
Stephen Connolly 9bec8d7386 Use chained .append calls rather than concatenate strings in arguments to .append 2014-01-06 10:42:20 +00:00
Stephen Connolly c156b1512f duplicate ; 2014-01-06 10:35:53 +00:00
Stephen Connolly f92c5bf5fd Flag that we are ignoring this 2014-01-06 10:34:45 +00:00
Stephen Connolly 9a55914061 Remove unnecessary unboxing 2014-01-06 10:32:16 +00:00
Stephen Connolly c30c76e423 Use StringBuilder 2014-01-06 10:31:04 +00:00
Stephen Connolly 77aeb15556 targetting 3.2.0 release 2014-01-06 09:49:00 +00:00
Jesse Glick 2eb419ed95 [MNG-5075] MavenProject.getParent throws undocumented ISE 
Submitted by Jesse Glick
 2014-01-05 19:17:03 +00:00
Igor Fedorenko e698ce6e67 MNG-5549 introduced MojoExecutionEvent and ProjectExecutionEvent 
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
 2013-12-20 10:06:04 -05:00
Igor Fedorenko f35698c790 MNG-5552 made classifier part of MavenProject.artifactMap key 
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
 2013-12-17 12:56:36 -05:00
Igor Fedorenko b99658c943 MNG-5550 default MojoExecution source to Source.LIFECYCLE 
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
 2013-12-14 19:44:25 -05:00
Igor Fedorenko bc84e6c7d3 MNG-5549 introduced MojoExecutionListener and ProjectExecutionListener 
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
 2013-12-14 19:43:42 -05:00
Igor Fedorenko 2ef658430f MNG-5530 simplified MojoExecutionScope binding 
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
 2013-11-18 09:41:15 -05:00
Igor Fedorenko 8700b05857 MNG-5530 Introduced mojo execution guice component scope 
Mojo execution scoped components are annotated with @MojoExecutionScoped
They are created just before configured mojo instance is created
and disposed immediately after mojo execution finishes.

Execution scoped components can request @Inject MavenSession,
MavenProject and MojoExecution instances in addition to any
standard Maven core components and components defined in
maven plugin contributing execution scoped components.

Execution scoped components can be injected into Mojos using
standard /* @component */ javadoc (and likely new mojo
annotations).

If execution scoped component implements MojoExecutionListener
callback interface, its #afterMojoExecutionSuccess method will be
invoked after successful mojo execution and #afterMojoExecutionAlways
method will be executed after both successful and failed mojo
executions.

Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
 2013-10-31 07:49:54 -04:00
Jason van Zyl b0acd5e73a The version:set plugin works to roll/unroll changes (where the release plugin is not very good) so we can use more standard versions which will help withe ITs. 2013-10-04 15:05:56 -04:00
Jason van Zyl 72326aef76 [maven-release-plugin] prepare for next development iteration 2013-09-17 11:17:49 -04:00
Jason van Zyl 0728685237 [maven-release-plugin] prepare release maven-3.1.1 2013-09-17 11:17:43 -04:00
Jason van Zyl b7e3ce220c I'm reverting this as per Benjamin: the change to the artifact filter is an optimization to avoid downloading needless artifacts, but for cases of uber JARs or other stuff pulling in those packages, the class realm manager's imports are crucial 2013-09-17 10:22:35 -04:00
Jason van Zyl c61c387cf6 MNG-5513: Artifact filtering not updated for Eclipse Aether filtering 
Also, please note that org.eclipse.aether.internal.impl should be imported into plugin realms, thereby restoring Maven 3.0.x style behavior which imports org.sonatype.aether.impl and sub packages (especially o.s.a.impl.internal which after the move to Eclipse is no longer a sub package of o.e.a.impl)  according to Benjamin (thanks!)
 2013-09-17 00:09:54 -04:00
Jason van Zyl 0194cd61c8 We must also filter out the old Aether as well to prevent NoClassDefFoundErrors 2013-09-14 21:02:05 -04:00
Jason van Zyl 6125acf1c4 Merge branch 'mng-5513' 2013-09-14 20:22:18 -04:00
Jason van Zyl 340dd3fc6e Change poms over to major.minor-SNAPSHOT 2013-09-14 17:05:06 -04:00
Hervé Boutemy 65e219f621 fix scm connection and developerConnection values in modules, waiting 
for maven-scm support of default inherited values, which appends
/${artifactId}
 2013-09-14 16:15:38 +02:00
Tamas Cservenak 97732f7ee7 [MNG-5513] Restoring Maven 3.0.x style behavior 
As it was importing org.sonatype.aether.impl and
sub packages, but since Aether move to Eclipse
the org.eclipse.aether.internal.impl is no longer
sub package of org.eclipse.aether.impl (but it
was in Sonatype Aether)
 2013-09-11 14:01:15 +02:00
Tamas Cservenak 4a7b25c3dd [MNG-5513] Artifact filtering for Eclipse Aether fixed 
The filtering was left unchanged, while Aether
GroupID changed from org.sonatype.aether to
org.eclipse.aether, basically letting
Plugins to reference Eclipse Aether that
would produce runtime Linkage errors.
 2013-09-11 13:59:40 +02:00
Jason van Zyl 07f0fce320 [maven-release-plugin] prepare for next development iteration 2013-09-05 12:59:21 -04:00
Jason van Zyl 892b464683 [maven-release-plugin] prepare release maven-3.1.1 2013-09-05 12:59:15 -04:00
Hervé Boutemy 6b2db085c0 code formatting 2013-08-21 21:38:01 +02:00
Jason van Zyl 11f46bd4c4 MNG-5503: Fix for the issue where Maven 3.1.0 fails to resolve artifacts produced by reactor build 
The general strategy is to fall back to Aether artifact type and use its notion of identity as much as possible. I have
a simple IT taken from the sample project that I will also push.
 2013-08-20 05:54:28 -07:00
Hervé Boutemy 2d33fad18c give coordinates of plexus configuration files used to define content 2013-08-02 15:24:11 +02:00
Hervé Boutemy 82eba2a03f improved javadoc 2013-07-28 14:08:13 +02:00
Hervé Boutemy 2351cc1bb9 added a link to ExceptionHandler in the "useful entry points" section 2013-07-28 13:46:14 +02:00
Hervé Boutemy 7ffd13af5f added links to toolchains descriptor reference 2013-07-27 23:10:34 +02:00
Hervé Boutemy 8009c099a0 prefer DuplicatProjectException in same package and explicit package for 
org.apache.maven.project.DuplicatProjectException
 2013-07-27 19:16:52 +02:00
Olivier Lamy d5259127ed add missing @since 3.0.2 2013-07-20 15:46:16 +10:00
Hervé Boutemy 465202c505 added a link to ArtifactHandler API 2013-07-19 19:34:02 +02:00
Hervé Boutemy a2d30c322e bump to 3.1.1-SNAPSHOT 2013-07-19 19:31:00 +02:00
Stephen Connolly 9f7d5171fe narrow the exclusion 2013-07-18 11:19:00 +01:00
Arnaud Héritier 9f8eabce22 Bump to 3.2-SNAPSHOT 2013-07-15 22:37:09 +02:00
Jason van Zyl 271761de84 [maven-release-plugin] prepare for next development iteration 2013-06-27 22:10:23 -04:00
Jason van Zyl 893ca28a1d [maven-release-plugin] prepare release maven-3.1.0 2013-06-27 22:10:16 -04:00
Jason van Zyl 09e77b53f0 Revert "[maven-release-plugin] prepare release maven-3.1" 
This reverts commit a47ef06832.
 2013-06-23 08:15:55 -07:00
Jason van Zyl 87e5972726 Revert "[maven-release-plugin] prepare for next development iteration" 
This reverts commit e22b2fa16a.
 2013-06-23 08:15:29 -07:00
Jason van Zyl e22b2fa16a [maven-release-plugin] prepare for next development iteration 2013-06-23 08:03:57 -07:00
Jason van Zyl a47ef06832 [maven-release-plugin] prepare release maven-3.1 2013-06-23 08:03:53 -07:00
Arnaud Héritier 21907a74e7 Revert "Code cleanup - It's better (for perfs) to use a chain of append() calls than a unique append with several Strings concatenations" 
This reverts commit c8e94a5b08.

Decreases too much the code readibility
 2013-06-14 10:29:43 +02:00
Arnaud Héritier 456268af61 Code cleanup -  Remove Redundant Cast(s) 2013-06-11 22:28:48 +02:00
Arnaud Héritier da48cfff83 Code cleanup - Redundant array creation for calling varargs method 2013-06-11 22:27:26 +02:00
Arnaud Héritier d92746dc25 Code cleanup - Maven requires Java 5+ : Replace for and while loops by for each 2013-06-11 22:21:54 +02:00
Arnaud Héritier 1f84f8f296 Code cleanup - Maven requires Java 5+ : Replace String.indexOf() by String.contains() 2013-06-11 22:19:20 +02:00
Arnaud Héritier 9e5183f0ad Code cleanup - Various code simplifications (tests, loops, …) 2013-06-11 22:09:51 +02:00
Arnaud Héritier c8e94a5b08 Code cleanup - It's better (for perfs) to use a chain of append() calls than a unique append with several Strings concatenations 2013-06-11 21:58:50 +02:00
Arnaud Héritier 96db1abbe9 Code cleanup - Maven requires Java 5+ : Remove unnecessary boxing 2013-06-11 21:43:53 +02:00
Arnaud Héritier 143216f93a Fix misprint 2013-06-11 20:53:31 +02:00
Hervé Boutemy 4ec06bf67c default m-site-p plugin is 3.3 2013-06-02 12:40:38 +02:00
Jason van Zyl e1286aea83 [maven-release-plugin] prepare for next development iteration 2013-06-01 08:56:26 -04:00
Jason van Zyl c726cdd3a9 [maven-release-plugin] prepare release maven-3.1.0-alpha-1 2013-06-01 08:56:20 -04:00
Hervé Boutemy ac64dd6bb6 [MNG-5482] detect missing Sonatype Aether classes to give a hint to 
AetherClassNotFound Wiki article
 2013-05-30 03:10:51 +02:00
rfscholte 4cc6a3fdef Fix Javadoc warnings 2013-05-28 23:29:01 +02:00
Stephen Connolly 85eed72eb1 In the canonical pom order, i.e. our pom.xml code style, <pluginManagement> comes before <plugins> 2013-05-28 10:49:38 +01:00
Stephen Connolly 348f716433 Add Apache RAT pluging configuration to exclude files that have a legitimate reason for being excluded 
- We should maybe review this list periodically, but to my mind there are legitimate reasons for excluding all of these files from the ASL license header requirements
 2013-05-28 10:37:02 +01:00
Stephen Connolly c6c6bdc49f Add ASL license header 2013-05-28 10:19:32 +01:00
Jason van Zyl 326303e22a [maven-release-plugin] prepare for next development iteration 2013-05-25 08:33:08 -04:00
Jason van Zyl 42b69f0b0a [maven-release-plugin] prepare release maven-3.1.0-alpha-1 2013-05-25 08:33:02 -04:00
Jason van Zyl 00b9029094 [maven-release-plugin] prepare for next development iteration 2013-05-23 10:23:11 -04:00
Jason van Zyl 32d720ea0c [maven-release-plugin] prepare release maven-3.1.0-alpha-1 2013-05-23 10:23:05 -04:00
Hervé Boutemy d7b31b3c90 reapplied commit 994a27d004 after Eclipse 
Aether merge:
removed code duplication: maven-core should use base
MavenRepositorySystemUtils provided by maven-aether-provider as a
basis before adding environment configuration instead of copy/paste
Aether configuration
 2013-04-09 08:27:06 +02:00
Jason van Zyl 95fbf6f445 [maven-release-plugin] prepare for next development iteration 2013-03-30 10:52:15 -04:00
Jason van Zyl 262b9bb1ef [maven-release-plugin] prepare release maven-3.1.0-alpha-1 2013-03-30 10:52:10 -04:00
Jason van Zyl 08eab1953d o revert release plugin commits 2013-03-30 10:50:39 -04:00
Jason van Zyl 01c969e1eb [maven-release-plugin] prepare for next development iteration 2013-03-30 10:21:32 -04:00
Jason van Zyl 2decac4869 [maven-release-plugin] prepare release maven-3.1.0 2013-03-30 10:19:45 -04:00
Hervé Boutemy 42962fa281 code formatting 2013-03-30 09:37:11 +01:00
Kristian Rosenvold 973673721b [MNG-5456] Incorrect exception handling in parallel build 2013-03-30 07:00:05 +01:00
Jason van Zyl ebf2e4ddea Merge branch 'eclipse-aether' of github.com:tesla/tesla-build into eclipse-aether 
Conflicts:
	.gitignore
	pom.xml
 2013-03-14 13:03:31 -07:00
Stuart McCulloch 2c2bf6e6e5 Use Eclipse/Sisu 0.0.0.M2 milestone 
Signed-off-by: Jason van Zyl <jason@tesla.io>
 2013-03-13 08:49:00 -04:00
Igor Fedorenko 9b58a3cfdc MNG-5444 fixed building MavenProject from ModelSource 
To maintain compatibility with (the extremely unlikely) existing
implementations of ModelSource, the new API methods are provided
via optional ModelSource2 interface. Updated javadoc to encourage
use of the new API.

Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
 2013-03-03 22:03:50 -05:00
rfscholte f6f4ef5e03 [MNG-3131] Error message is misleading if a missing plugin parameter is of a type like List 2013-03-01 16:14:22 +01:00
Jason van Zyl de40fe19a8 o update for changes in Aether APIs 2013-02-16 22:48:55 -05:00
rfscholte 56cd921fbd MNG-3131: Error message is misleading if a missing plugin parameter is of a type like List 2013-02-16 14:49:19 +01:00
Jason van Zyl 137cbd8a97 Merge branch 'trunk' into eclipse-aether 
Conflicts:
	maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
	maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
	maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
	maven-aether-provider/src/test/java/org/apache/maven/repository/internal/AbstractRepositoryTestCase.java
	maven-aether-provider/src/test/java/org/apache/maven/repository/internal/DefaultVersionResolverTest.java
	maven-core/src/main/java/org/apache/maven/DefaultMaven.java
	maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultLegacySupport.java
	maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResult.java
	maven-embedder/src/main/java/org/apache/maven/cli/transfer/Slf4jMavenTransferListener.java
	pom.xml
	src/site/site.xml
 2013-02-14 22:08:26 -05:00
Jason van Zyl 27ad9858d2 Merge branch 'aether' of github.com:bentmann/maven-3 into eclipse-aether 
Conflicts:
	.gitignore
	apache-maven/pom.xml
	maven-aether-provider/pom.xml
	maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
	maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
	maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
	maven-aether-provider/src/main/java/org/apache/maven/repository/internal/LocalSnapshotMetadataGenerator.java
	maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemSession.java
	maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenServiceLocator.java
	maven-aether-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadataGenerator.java
	maven-artifact/pom.xml
	maven-compat/pom.xml
	maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
	maven-compat/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java
	maven-core/pom.xml
	maven-core/src/main/java/org/apache/maven/DefaultMaven.java
	maven-core/src/main/java/org/apache/maven/ReactorReader.java
	maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginRealmCache.java
	maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
	maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
	maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java
	maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
	maven-core/src/test/java/org/apache/maven/project/LegacyLocalRepositoryManager.java
	maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
	maven-core/src/test/java/org/apache/maven/repository/TestRepositoryConnector.java
	maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java
	maven-embedder/pom.xml
	maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
	maven-model-builder/pom.xml
	maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
	maven-model/pom.xml
	maven-plugin-api/pom.xml
	maven-plugin-api/src/main/mdo/plugin.mdo
	maven-plugin-api/src/site/apt/index.apt
	maven-repository-metadata/pom.xml
	maven-settings-builder/pom.xml
	maven-settings/pom.xml
	pom.xml
	src/site/site.xml
 2013-02-14 20:21:50 -05:00
Benjamin Bentmann 4fdcdbd262 Followed change to DependencyNode.getPremanaged*() 2013-02-10 19:11:11 +01:00
Hervé Boutemy 720bef7df7 [MNG-5181] renamed *simple* local repository *manager* to *legacy* local 
repository
 2013-02-09 15:43:00 +01:00
Hervé Boutemy 114c98f310 [MNG-5181] added a warning when enhanced local repository manager is 
disabled: this should be avoided
 2013-02-04 01:27:53 +01:00
Benjamin Bentmann b5e0532310 Updated for latest ConflictResolver 2013-02-03 20:44:44 +01:00
Hervé Boutemy 5d06bc6a25 fixed typo 2013-02-02 16:59:20 +01:00
Hervé Boutemy 71dd7f3d2a code formatting 2013-02-02 16:52:16 +01:00
Hervé Boutemy 7196f82ff2 improved javadoc 2013-02-02 09:40:06 +01:00
olivier lamy 27f8b0f81a [MNG-5185] [MNG-5181] 
add cli flag to be able to remove use of EnhancedLocalRepositoryManager.
 2013-02-01 00:35:46 +01:00
Kristian Rosenvold 176a85f43c Fixed line feeds, added .gitattributes 2013-01-29 16:27:02 +01:00
Benjamin Bentmann 3916201b98 Used improved conflict resolver 2012-12-29 22:25:25 +01:00
Hervé Boutemy 3849bbd46a fixed errors reported by Checkstyle 2012-12-16 21:49:18 +01:00
Hervé Boutemy 915b1553f2 changed MavenModelMerger extensions visibility to protected to improve 
documentation
 2012-12-15 21:12:22 +01:00
Hervé Boutemy 87952bd073 added link to Plexus Classworlds 2012-12-12 17:37:03 +01:00
Hervé Boutemy 3d4a06c700 added ClassRealmManager entry point 2012-12-12 01:57:02 +01:00
Jason van Zyl c8536bf89f - make m2e happy on import 2012-12-08 19:30:57 -05:00
Hervé Boutemy d6544c4814 reverted change that got in previous commit by inadvertance 2012-12-08 17:47:12 +01:00
Hervé Boutemy 23bd8d98a6 added @since info 2012-12-08 16:05:37 +01:00
Anders Hammar f95ab2e7cd [MNG-5402] Better build number for git 
Signed-off-by: Anders Hammar <anders@hammar.net>
 2012-12-05 14:21:04 +01:00
Jason van Zyl 73e1445987 [maven-release-plugin] prepare for next development iteration 2012-12-03 19:58:46 -08:00
Jason van Zyl 618d12906d [maven-release-plugin] prepare release maven-3.1.0 2012-12-03 19:58:40 -08:00
Hervé Boutemy ac213ec571 [MNG-5245] updated maven-site-plugin to 3.2 2012-12-03 23:27:47 +01:00
Hervé Boutemy b63904c9db fixed errors reported by Checkstyle (once again...) 2012-12-03 02:21:58 +01:00
Hervé Boutemy 543870467f fixed errors reported by Checkstyle 2012-12-02 20:22:52 +01:00
Hervé Boutemy 71a8427df6 code formatting 2012-12-02 12:38:12 +01:00
Kristian Rosenvold 75ea1e4297 [MNG-5208] Parallel (-T option) multi module build fires wrong project failed event 
Patch by Stefan Eder , applied with minor modifications
 2012-12-02 11:05:37 +01:00
Hervé Boutemy fee1640d65 [MNG-5395] don't inject DefaultMavenPluginManager's logger into Mojos 
but create a dedicated logger with Mojo implementation name
 2012-12-01 04:27:23 +01:00
Kristian Rosenvold a278bec9d3 o Fixed another super-subtle classloader leak 2012-11-30 11:46:23 +01:00
Kristian Rosenvold 2103c82d57 o Changed array to atomicreference since arrays are not thread-safe 2012-11-30 07:33:31 +01:00
Jason van Zyl 97e8ae2737 - wind this back to version 2.2 2012-11-29 08:47:44 -08:00
Jason van Zyl fcffe3c9d5 [maven-release-plugin] prepare for next development iteration 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413481 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-26 05:07:28 +00:00
Jason van Zyl 29c9b29f68 [maven-release-plugin] prepare release maven-3.1.0 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413479 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-26 05:07:15 +00:00
Herve Boutemy 614e7bd173 separate SLF4J export from JSR-330 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413416 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-25 21:02:47 +00:00
Jason van Zyl d3756b95cc MNG-5381: Restore MavenSession.getRepositoryCache() for Tycho users so they are not forced to upgrade to 3.1 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413391 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-25 19:09:44 +00:00