Apache/maven
1
0
Fork 0
mirror of https://github.com/apache/maven.git synced 2025-02-08 11:05:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,543 Commits 86 Branches 96 Tags
Commit Graph

9543 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stuart McCulloch
34a8c6ce3b Use Eclipse/Sisu 0.0.0.M2a milestone 
Signed-off-by: Jason van Zyl <jason@tesla.io>
 2013-03-23 15:24:51 -07:00
Jason van Zyl
2d7069b6e3 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/maven 2013-03-19 10:25:34 -07:00
Stuart McCulloch
c5f161a8d6 Avoid mixing two flavours of Guice on the classpath. 
Note: the main blocker to using Google-Guice for Maven3 is the lack of a release with the new ProvisionListener API, which is needed to support Plexus lifecycles. While there are other fixes/features in Sisu-Guice that are nice-to-have (such as removal of the big global singleton lock) they aren't strictly required for Maven3.

Signed-off-by: Jason van Zyl <jason@tesla.io>
 2013-03-19 10:16:40 -07:00
Hervé Boutemy
e438f1140e added information about encoding configuration 2013-03-19 01:21:13 +01:00
Hervé Boutemy
10983877dc removed unused configuration 2013-03-18 23:35:03 +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
2ec0a6b69f Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/maven 2013-03-18 11:03:04 -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
Hervé Boutemy
317e7c6238 removed unused properties 2013-03-17 20:41:19 +01:00
Stuart McCulloch
4849df9183 Reverting some unexpected aether dependency changes to the top-level pom which broke the build 
Signed-off-by: Jason van Zyl <jason@tesla.io>
 2013-03-15 16:46:28 -07:00
Jason van Zyl
cf4d0be0ae o using snapshot version of sisu to vet any issues, and adding ossrh as a snapshot repository while testing 2013-03-15 06:49:59 -07:00
Jason van Zyl
bd4c38b7fd o using snapshot version of sisu to vet any issues, and adding ossrh as a snapshot repository while testing 2013-03-15 06: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
olivier lamy
c138fe884d add Stuart in contributor section 2013-03-05 22:11:26 +01:00
olivier lamy
57954042c5 [MNG-5445] Missing PathTranslator @Requirement in org.apache.maven.project.interpolation.StringSearchModelInterpolator 
Submitted by Stuart McCulloch.
 2013-03-05 22:11:26 +01: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
Hervé Boutemy
ef06aab96d updated ${maven.build.version} example to show the actual git format 2013-03-03 09:43:05 +01:00
rfscholte
d659d21df1 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/maven 2013-03-01 16:16:04 +01: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
Kristian Rosenvold
80e01fea5b Reverted 1a1fe6d50802713d969ed08d6fa06dec53cf90e9 to make things workproperly on java5/windows 2013-02-27 07:27:43 +01:00
Hervé Boutemy
0645eb72fe update Modello version 2013-02-27 02:02:26 +01:00
olivier lamy
28721c35e0 idea can produce out directory so ignore it 2013-02-24 09:31:43 +01:00
rfscholte
c5c1eab665 Add javadoc 2013-02-22 16:28:48 +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
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
3868007bf5 o missed mvn in the merge 2013-02-14 21:05:08 -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
39d063a435 o remove unecessary setup for svn 2013-02-14 18:04:03 -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
olivier lamy
40ecab772c use released wagon 2.4 2013-02-10 21:13:15 +01: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
ada6bd1e63 introduced maven.site.path property 2013-02-07 00:02:31 +01:00
Hervé Boutemy
297bbca90f fixed svnpubsub configuration (since parent pom upgrade, staging 
result base directory has changed)
 2013-02-07 00:00:04 +01:00
Hervé Boutemy
02014d8b38 updated ciManagement url 2013-02-06 22:19:56 +01:00
Hervé Boutemy
ca514cea44 updated svnpubsub configuration to publish to /ref/3-LATEST (consistent 
with websites' r849425)
 2013-02-06 22:18:06 +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
aeee413bda updated maven-parent to latest release 2013-02-02 18:08:18 +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
853636d6aa code formatting 2013-02-02 16:46:43 +01:00