Apache/maven
1
0
Fork 0
mirror of https://github.com/apache/maven.git synced 2025-02-11 20:45:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,407 Commits 85 Branches 96 Tags
Commit Graph

811 Commits

Author SHA1 Message Date
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
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