Commit Graph

1107 Commits

Author SHA1 Message Date
Hervé Boutemy 5947c4ef71 [MNG-5771] enabled modello xdoc/xsd for core extensions mdo, with
minimum intro.
Still need to improve descriptions and info in mdo
2015-03-06 02:04:17 +01:00
Jason van Zyl 368516c2aa Change version from 3.2.6-SNAPSHOT to 3.3.0-SNAPSHOT 2015-03-04 10:58:05 -08:00
Jason van Zyl 7997634209 MNG-5774 Provide an extension point for alternate CLI configuration source 2015-03-01 10:22:26 -08:00
Igor Fedorenko b01bf0c3d4 MNG-5767 enforce use of maven.multiModuleProjectDirectory, fixed mvn*.bat
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2015-02-26 11:45:29 -05:00
Igor Fedorenko e28be4d33a MNG-5767 renamed projectBasedir to more descriptive multiModuleProjectDirectory
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2015-02-23 13:47:34 -05:00
Igor Fedorenko 2eab8924a9 MNG-5771 disabled modello xdoc/xsd for core extensions mdo
... hopefully fixes maven site generation

Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2015-02-20 19:17:57 -05:00
Igor Fedorenko 6efacdb3fc MNG-5771 user-defined core extensions
read ${maven.projectBasedir}/.mvn/extensions.xml and create core
extensions realms during maven runtime bootstrap. this required
short-lived bootstrap plexus container to resolve extensions.

individual extensions realms are wired to maven.ext realm according
to META-INF/maven/extension.xml exported packages specification

Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2015-02-20 14:05:54 -05:00
Igor Fedorenko 117df855e2 dispose dynamically created class realms
this is mostly to help integration tests reuse the same realm ids,
but plugging resource leaks is generally a good thing.

Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2015-02-20 10:26:04 -05:00
Igor Fedorenko 8ed9a1caa8 MNG-5767 .mvn/ for project specific jvm options and maven parameters
Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
2015-02-20 08:14:08 -05:00
Jason van Zyl 2d34e67eed First pass at cleaning up MavenExecutionRequestPopulator and its use.
Push MavenExecutionRequestPopulator down to only operate in the MavenCli. Two of the three methods were already called from MavenCli so now all of them are. In the process I deleted a bunch of code and pursue my quest to remove Settings from the core in order to make a general configuration mechanism that can be plugged into the core via the MavenCli.

Also removed the requirement of the LegacyRepositorySystem in the DefaultMavenExecutionRequestPopulator which breaks another tie with the legacy code. I took the bits that were needed and a lot of the code, after tracing through it, is redundant so it has been deleted.

Turning off:

injectMirror( request, request.getRemoteRepositories(), request.getMirrors() );
injectMirror( request, request.getPluginArtifactRepositories(), request.getMirrors() );

in DefaultMavenExecutionRequestPopulator

Results :

Failed tests:
  MavenITmng4190MirrorRepoMergingTest>AbstractMavenIntegrationTestCase.runTest:220->testit:76 null expected:<[1]> but was:<[4]>

Tests in error:
  MavenITmng4991NonProxyHostsTest>AbstractMavenIntegrationTestCase.runTest:220->testit:89 » Verification
  MavenITmng4963ParentResolutionFromMirrorTest>AbstractMavenIntegrationTestCase.runTest:220->testit:58 » Verification

There is mirror evaluation code in DefaultMaven:newRepositorySession( MavenExecutionRequest request ) which appears to
duplicate this logic but not quite enough for the ITs to pass.

---

Turning off:

injectProxy( request.getRemoteRepositories(), request.getProxies() );
injectProxy( request.getPluginArtifactRepositories(), request.getProxies() );

in

DefaultMavenExecutionRequestPopulator

Result:

The ITs pass

So the code is not needed so it has been deleted.

---

Turning off:

injectProxy( request.getRemoteRepositories(), request.getProxies() );
injectProxy( request.getPluginArtifactRepositories(), request.getProxies() );
injectAuthentication( request.getRemoteRepositories(), request.getServers() );
injectAuthentication( request.getPluginArtifactRepositories(), request.getServers() );

in

DefaultMavenExecutionRequestPopulator

Result:

The ITs pass

The code in DefaultMaven:newRepositorySession( MavenExecutionRequest request ) appears to populate proxies and authentication correctly. The injectAuthentication code has been deleted.

---

This is also perfunctory in DefaultMavenExecutionRequestPopulator after tracing through it:

request.setRemoteRepositories( getEffectiveRepositories( request, request.getRemoteRepositories() ) );
request.setPluginArtifactRepositories( getEffectiveRepositories( request, request.getPluginArtifactRepositories() ) );
2015-02-08 22:26:48 -05:00
Robert Scholte 4f05b59de9 [MNG-5754] Toolchains should be read during initialization
No need to wrap ToolchainsBuildingException with MisconfiguredToolchainException.
The latter was required when using ToolchainManagerPrivate
2015-01-17 16:27:55 +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 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
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
Michael Osipov 0343c52601 Trimmed trailing whitespace 2014-11-23 13:04:30 +01:00
Hervé Boutemy 9ce1f17d1b [MNG-5707] warn if Maven unsupported slf4j binding used 2014-10-30 14:32:10 +01:00
Hervé Boutemy 366f57c563 updated parent pom (and fixed issues...) 2014-10-24 01:25:49 +02:00
Hervé Boutemy 1ba9a6ffe0 test code formatting 2014-08-19 17:17:05 +02: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
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
a-horst d8fd65a3ae MNG-2570: logging configuration now no longer overwrites the default log level as specified in conf/logging/simplelogger.properties
Submitted by: Andreas Horst <horst.andreas82@gmail.com>
Signed-off-by: Jason van Zyl <jason@tesla.io>
2014-07-06 13:09:41 -04: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
Michael Osipov 5c78a8d2fa [MNG-5648] Regression of MNG-5176, DST in effect is ignored 2014-06-15 19:16:07 +02:00
Hervé Boutemy a90d71e024 [MNG-5630] added missing ':' in case of forked goal 2014-05-16 22:21:45 +02:00
Hervé Boutemy c2700f38eb updated javadoc 2014-05-13 00:35:15 +02:00
Hervé Boutemy 2cea7c6f84 [MNG-5630] improved display of forked executions: added phase or goal 2014-05-10 20:53:56 +02:00
Michael Osipov 45ab718bc0 [MNG-5623] Exception when printing Reactor Summary 2014-04-30 21:38:22 +02:00
Michael Osipov a39d1d33f2 Remove unused imports. 2014-04-27 11:27:11 +02:00
Michael Osipov 0afed871f2 Small improvement on comments in formatTimestamp. 2014-02-16 16:31:42 +01: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 7a15512d88 Add missing header 2014-02-14 12:11:55 -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
Jason van Zyl 87bdfe5168 Add a test for parsing the thread configuration with the core multiplier 2014-02-14 11:47:20 -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
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
Michael Osipov be19ddb6d9 [MNG-5176] Print build times in an ISO 8601-style manner 2014-02-09 12:14:43 +01:00
Hervé Boutemy 4a39c02156 fixed errors reported by Checkstyle 2014-02-08 16:38:31 +01:00
Jason van Zyl 0c5678fa89 Remove weave mode building from the core 2014-02-06 16:27:15 -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
Michael Osipov d55dca85a1 Leave a space between colon and Console read password to improve
readability.
2014-02-01 12:23:10 +01:00
Robert Scholte 626884e9ee [MNG-4099] Password encryption CLI switches should prompt for password if missing 2014-01-10 22:29:00 +01: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
Robert Scholte 61dbaabfbd [MNG-5528] Help text confuses people 2014-01-06 23:21:26 +01: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 9bec8d7386 Use chained .append calls rather than concatenate strings in arguments to .append 2014-01-06 10:42:20 +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
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 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
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 19b0bb3ff3 link to SLF4J documentation on switching SLF4J binding 2013-08-02 10:58:06 +02:00
Hervé Boutemy 8bbfb6f3c2 more explanations on logger names 2013-08-02 10:05:27 +02:00
Hervé Boutemy f63335c4e6 more details on logging implementation 2013-08-02 09:58:43 +02:00
Hervé Boutemy ea97145dfc javadoc improvement 2013-08-02 01:28:45 +02:00
Hervé Boutemy aaa198abfb improved logging documentation 2013-08-02 01:27:07 +02:00
Hervé Boutemy b83de53e86 [MNG-5500] tracking file is now _remote.repositories (was
_maven.repositories in Maven 3.0.x)
2013-07-28 18:35:31 +02:00
Olivier Lamy e2f99c2ca5 add missing @since 3.1.0 2013-07-20 15:42:08 +10:00
Hervé Boutemy a2d30c322e bump to 3.1.1-SNAPSHOT 2013-07-19 19:31:00 +02: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 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 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 a2897f86b3 Code cleanup - Maven requires Java 5+ : Remove unnecessary unboxing 2013-06-11 21:47:18 +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 4e24edbcfe Add missing carriage return after version details 2013-06-02 21:32:45 +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
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
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
Hervé Boutemy 833b5f0e93 fixed merge conflicts 2013-03-19 23:55:04 +01:00
Jason van Zyl f50ae7b059 o Merge branch 'master' into eclipse-aether
Conflicts:
	maven-embedder/src/main/java/org/slf4j/impl/MavenSlf4jSimpleFriend.java
	pom.xml
2013-03-18 13:27:43 -07:00
Stuart McCulloch 8b97b0a2da Fix call to SimpleLoggerFactory.reset method (use LoggerFactory to make sure we get the right instance to reset, as SimpleLoggerFactory.INSTANCE is not actually used by slf4j-simple's StaticLoggerBinder) and remove temporary reflection workaround
Signed-off-by: Jason van Zyl <jason@tesla.io>
2013-03-18 12:12:22 -07:00
Jason van Zyl cc2da2fabe o using slf4j 1.7.4 which adds the method to clear the logger cache
o update the code to use slf4j 1.7.4
o the logging failures in the embedded ITs are now fixed
2013-03-18 11:01:40 -07:00
Jason van Zyl 33abdd2ccf o update to slf4j 1.7.3 and use logger factory reset() 2013-03-17 18:48:06 -07: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
rfscholte 41a292d9a2 [MNG-5213] Verify time formatting 2013-03-09 13:09:48 +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 8181e7c7fa Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/maven into trunk 2013-02-14 21:13:42 -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
Jason van Zyl 38d132b64d Merge branch 'trunk' of github.com:apache/maven-3 into trunk
Conflicts:
	apache-maven/src/bin/mvn
	maven-embedder/src/site/apt/logging.apt
2013-02-14 18:02:32 -05:00
rfscholte b1b526ac9e Improve description 2013-02-11 16:13:45 +01:00
rfscholte 353f73bf22 Fix typo 2013-02-11 11:19:55 +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 5d06bc6a25 fixed typo 2013-02-02 16:59:20 +01:00
olivier lamy 8ada7e763b [MNG-5185] [MNG-5181]
can be activated using -Dmaven.simpleLocalRepoMan=true (for add in MAVEN_OPTS)
2013-02-01 00:41:44 +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
Hervé Boutemy 72bdc8602e added slf4j-simple logging configuration reinitialization to have
Core ITs run without errors
2013-01-06 11:50:25 +01:00
Hervé Boutemy 57d9c68e56 stdout/stderr redirection should be sufficient 2012-12-21 07:50:56 +01:00
Hervé Boutemy 547b8c4c30 fix bootstrap (with Ant) 2012-12-20 08:49:02 +01:00
Hervé Boutemy 0ab0641d3f added Logback support 2012-12-19 00:36:27 +01:00
Hervé Boutemy 3269928699 added log4j2 configuration support 2012-12-19 00:09:04 +01:00
Hervé Boutemy 3511b09d1e added Slf4jConfigurationFactory to detect actual slf4j logging
implementation and load appropriate Slf4jConfiguration implementation
from META-INF/maven/slf4j-configuration.properties
2012-12-18 23:44:18 +01:00
Hervé Boutemy eb190f0295 mark @Override 2012-12-18 04:35:48 +01:00
Hervé Boutemy 9eeb098380 can't be a Plexus component since Plexus container is not initialized at
logging configuration time
2012-12-18 04:35:08 +01:00
Hervé Boutemy 8112e6a835 created Slf4jConfiguration.Level enum to replace int 2012-12-18 04:23:52 +01:00
Hervé Boutemy e950603218 is Slf4jConfiguration.setLoggerFile(File) API useful? 2012-12-18 04:11:57 +01:00
Hervé Boutemy 7f21c4a31a improved javadoc 2012-12-16 21:15:26 +01:00
Hervé Boutemy eb9257e70c added javadoc for logging levels int values accepted 2012-12-16 11:21:30 +01:00
Hervé Boutemy 25bae5acd7 fixed indentation 2012-12-16 09:49:17 +01:00
Hervé Boutemy aa0b71ca62 improved javadoc 2012-12-16 09:44:26 +01:00
Hervé Boutemy 39e11cf2e5 extracted Slf4jConfiguration interface and corresponding implementation
to clearly separate code depending on slf4j binding

still need to add automatic selection of implementation
2012-12-16 01:57:36 +01:00
Hervé Boutemy 73ffdaf863 added license header 2012-12-16 01:52:20 +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 5ccb925067 added Plexus LoggerManager injection 2012-12-03 22:37:43 +01:00
Hervé Boutemy 543870467f fixed errors reported by Checkstyle 2012-12-02 20:22:52 +01:00
Hervé Boutemy 1062524b39 [MNG-5396] changed logger name for execution events and batch transfer
(was MavenCli)

this shows some logging patterns we should discuss about and document
our conventions
2012-12-01 09:35:12 +01:00
Hervé Boutemy aebb647020 removed unused import 2012-12-01 09:14:57 +01:00
Jason van Zyl a4c34bfa3f - fix typo 2012-11-30 15:13:07 -08:00
Jason van Zyl d5e5717dd7 [MNG-5390] mvn -rf (no argument) results in NPE
Created a simple primordial logger that implements the error methods required between CLI parsing and logger initialization. I don't want to have to look to see if the logger is null.
2012-11-30 15:12:03 -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 567cd13787 fixed typos
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413425 13f79535-47bb-0310-9956-ffa450edef68
2012-11-25 21:23:34 +00:00
Jason van Zyl b5f1798f2d - revert the release as we're missing MNG-5381
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413389 13f79535-47bb-0310-9956-ffa450edef68
2012-11-25 19:07:27 +00:00
Jason van Zyl 84b15b971b [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413381 13f79535-47bb-0310-9956-ffa450edef68
2012-11-25 17:59:53 +00:00
Jason van Zyl 7815ab87ad [maven-release-plugin] prepare release maven-3.1.0
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413379 13f79535-47bb-0310-9956-ffa450edef68
2012-11-25 17:59:36 +00:00
Herve Boutemy 9009b8f858 fixed errors reported by Checkstyle
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413335 13f79535-47bb-0310-9956-ffa450edef68
2012-11-25 11:04:16 +00:00
Herve Boutemy 8a0d8ecb12 code format
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413323 13f79535-47bb-0310-9956-ffa450edef68
2012-11-25 10:48:50 +00:00
Jason van Zyl 451c43152b cleanup of the class realm purging
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413287 13f79535-47bb-0310-9956-ffa450edef68
2012-11-25 03:12:49 +00:00
Herve Boutemy eff45b31ba added notes about logger name, with Plexus Logger API that cannot follow logger name as class name convention :(
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1412766 13f79535-47bb-0310-9956-ffa450edef68
2012-11-23 07:45:43 +00:00
Herve Boutemy a71baa4579 added notes about logger name, with Plexus Logger API that cannot follow logger name as class name convention :(
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1412766 13f79535-47bb-0310-9956-ffa450edef68
2012-11-23 07:45:43 +00:00
Herve Boutemy d36522363f added info about direct SLF4J use
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1412765 13f79535-47bb-0310-9956-ffa450edef68
2012-11-23 07:17:37 +00:00
Herve Boutemy c4703d2437 added info about direct SLF4J use
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1412765 13f79535-47bb-0310-9956-ffa450edef68
2012-11-23 07:17:37 +00:00
Herve Boutemy db109865ab require Velocity filtering
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1410883 13f79535-47bb-0310-9956-ffa450edef68
2012-11-18 12:59:14 +00:00
Herve Boutemy aac56f0f97 require Velocity filtering
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1410883 13f79535-47bb-0310-9956-ffa450edef68
2012-11-18 12:59:14 +00:00
Herve Boutemy b1a90588d2 added developer documentation about logging APIs
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1410815 13f79535-47bb-0310-9956-ffa450edef68
2012-11-18 02:23:48 +00:00
Herve Boutemy b1dbec59ab added developer documentation about logging APIs
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1410815 13f79535-47bb-0310-9956-ffa450edef68
2012-11-18 02:23:48 +00:00
Herve Boutemy 3c6b12aec9 moved CLI Options Reference to a dedicated page
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1410808 13f79535-47bb-0310-9956-ffa450edef68
2012-11-18 00:58:30 +00:00
Herve Boutemy 5869fc1197 moved CLI Options Reference to a dedicated page
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1410808 13f79535-47bb-0310-9956-ffa450edef68
2012-11-18 00:58:30 +00:00
Herve Boutemy ac0897486e o code formatting
o added license header

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1410724 13f79535-47bb-0310-9956-ffa450edef68
2012-11-17 12:27:48 +00:00
Herve Boutemy b838131093 o code formatting
o added license header

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1410724 13f79535-47bb-0310-9956-ffa450edef68
2012-11-17 12:27:48 +00:00
Olivier Lamy 7200f2d038 avoid logger with name ended with .null if no hint
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1409719 13f79535-47bb-0310-9956-ffa450edef68
2012-11-15 10:18:21 +00:00
Olivier Lamy e1e683cbbb avoid logger with name ended with .null if no hint
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1409719 13f79535-47bb-0310-9956-ffa450edef68
2012-11-15 10:18:21 +00:00
Olivier Lamy bd143134c9 code format and add @since
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1409718 13f79535-47bb-0310-9956-ffa450edef68
2012-11-15 10:18:06 +00:00
Olivier Lamy 72df73f9e8 code format and add @since
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1409718 13f79535-47bb-0310-9956-ffa450edef68
2012-11-15 10:18:06 +00:00
Herve Boutemy 1a6a6bd2e3 removed unused imports
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1407920 13f79535-47bb-0310-9956-ffa450edef68
2012-11-11 05:33:06 +00:00
Jason van Zyl d698618204 MNG-5374: Fix transfer listener after the JSR330 merge
For the following cases I have done the following:

1) Logging to the console: I simply restored the class that was there such that when logging to the console it uses System.out as it did and the d
ownload progress appears as it did.

2) Logging in batch mode: the batch mode transfer listener uses an SLF4J logger and the batch mode transfer listener doesn't report download progr
ess so there is no issue. Download progress would just create a bunch of noise. The size and the speed at which it is downloaded are logged.

3) Logging to a file: same as 2) except it's all diverted to the specified file.

4) I created two protected methods in MavenCli so that integrators can supply their own console and batch transfer listeners if they wish.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1407913 13f79535-47bb-0310-9956-ffa450edef68
2012-11-11 04:40:00 +00:00
Jason van Zyl a23f7cfd10 o Use SLF4J for logging
Conflicts:

	pom.xml

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1396842 13f79535-47bb-0310-9956-ffa450edef68
2012-10-10 22:48:08 +00:00
Herve Boutemy 9c54c7a660 renamed method to match the output format: html, not apt
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1395807 13f79535-47bb-0310-9956-ffa450edef68
2012-10-08 23:10:18 +00:00
Herve Boutemy 49d8d172d9 next version will be 3.1 (Jira updated accordingly: 3.1 renamed to 3.2)
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1395257 13f79535-47bb-0310-9956-ffa450edef68
2012-10-07 09:14:21 +00:00
Olivier Lamy 541bc917e8 [MNG-5338] Accept a directory with -f/--file
Submitted by Jesse Glick.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1382080 13f79535-47bb-0310-9956-ffa450edef68
2012-09-07 16:02:54 +00:00
Jason van Zyl 6e901c5797 o Enabled support and discovery of JSR-330 components
o Added Slf4j logger factory to support generic JSR-330 logging

o Exported Guice package for components that access Guice (or better it's injector) directly

Widen export of Guice packages (not ideal, need to look into ways to avoid this)

o use specific exports

o for now we will attempt to hide all of Guice in plugin realms and we'll do a bit of testing

closes #3

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1380105 13f79535-47bb-0310-9956-ffa450edef68
2012-09-03 01:07:31 +00:00
Herve Boutemy 1087f9339a o renamed method to better match the work done
o added documentation

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1377393 13f79535-47bb-0310-9956-ffa450edef68
2012-08-26 09:03:03 +00:00
Herve Boutemy 3289f39cb9 [MNG-5279] added anchors for each option
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1332308 13f79535-47bb-0310-9956-ffa450edef68
2012-04-30 17:30:04 +00:00
Herve Boutemy b7cd7e8bc8 renamed generated file: it's .html, not .apt (even if I initially wanted apt, but snippet macro could not do it)
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1332305 13f79535-47bb-0310-9956-ffa450edef68
2012-04-30 17:27:29 +00:00
Herve Boutemy 8904ba6889 [MNG-5279] added CLI options to the code documentation site
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1332011 13f79535-47bb-0310-9956-ffa450edef68
2012-04-29 22:33:19 +00:00
Herve Boutemy 32357134cd formatting
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1331989 13f79535-47bb-0310-9956-ffa450edef68
2012-04-29 20:29:06 +00:00
Benjamin Bentmann 82b345e009 o Migrated to Eclipse Aether 2011-12-30 21:43:28 +01:00
Olivier Lamy e6ef3dd660 [MNG-5206] plexus container never disposed
Submitted by Stuart McCulloch.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1211692 13f79535-47bb-0310-9956-ffa450edef68
2011-12-07 22:55:08 +00:00
Olivier Lamy 50b6e3b621 [MNG-5206] plexus container never disposed
Submitted by Stuart McCulloch.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1211692 13f79535-47bb-0310-9956-ffa450edef68
2011-12-07 22:55:08 +00:00
Olivier Lamy 85ed3a1525 bump version to 3.0.5-SNAPSHOT 3.0.4 is on release branch: feel free to hack :-) here
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1211509 13f79535-47bb-0310-9956-ffa450edef68
2011-12-07 16:22:49 +00:00
Olivier Lamy 65507bcfde bump version to 3.0.5-SNAPSHOT 3.0.4 is on release branch: feel free to hack :-) here
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1211509 13f79535-47bb-0310-9956-ffa450edef68
2011-12-07 16:22:49 +00:00
Olivier Lamy 862ff21440 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1210462 13f79535-47bb-0310-9956-ffa450edef68
2011-12-05 13:48:51 +00:00
Olivier Lamy 36abba0fa0 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1210462 13f79535-47bb-0310-9956-ffa450edef68
2011-12-05 13:48:51 +00:00
Olivier Lamy 11c001ba01 [maven-release-plugin] prepare release maven-3.0.4-RC3
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1210460 13f79535-47bb-0310-9956-ffa450edef68
2011-12-05 13:47:24 +00:00
Olivier Lamy d8f872895e [maven-release-plugin] prepare release maven-3.0.4-RC3
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1210460 13f79535-47bb-0310-9956-ffa450edef68
2011-12-05 13:47:24 +00:00
Olivier Lamy 5259b7b623 back to 3.0.4-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1210076 13f79535-47bb-0310-9956-ffa450edef68
2011-12-04 08:46:27 +00:00
Olivier Lamy b8e759de02 back to 3.0.4-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1210076 13f79535-47bb-0310-9956-ffa450edef68
2011-12-04 08:46:27 +00:00
Olivier Lamy 8edd56b679 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1209001 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 08:44:24 +00:00
Olivier Lamy f154515a41 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1209001 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 08:44:24 +00:00
Olivier Lamy 790169b9a5 [maven-release-plugin] prepare release maven-3.0.4
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1208998 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 08:43:14 +00:00
Olivier Lamy 8abaddfd17 [maven-release-plugin] prepare release maven-3.0.4
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1208998 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 08:43:14 +00:00