Apache/maven
1
0
Fork 0
mirror of https://github.com/apache/maven.git synced 2025-03-08 01:30:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,268 Commits 85 Branches 97 Tags
Commit Graph

860 Commits

Author SHA1 Message Date
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
olivier lamy
c138fe884d add Stuart in contributor section 2013-03-05 22:11:26 +01:00
Hervé Boutemy
0645eb72fe update Modello version 2013-02-27 02:02:26 +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
olivier lamy
40ecab772c use released wagon 2.4 2013-02-10 21:13:15 +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
aeee413bda updated maven-parent to latest release 2013-02-02 18:08:18 +01:00
Hervé Boutemy
ab9b42d3db publish site to fixed location /ref/3-latest to better use svnpubsub: 
release directory creation will be done with "svn cp 3-latest <effective
release version>"
 2013-02-02 15:28:13 +01:00
Hervé Boutemy
3ad5e54036 improved description 2013-02-02 15:21:09 +01:00
Kristian Rosenvold
176a85f43c Fixed line feeds, added .gitattributes 2013-01-29 16:27:02 +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
Benjamin Bentmann
36bee64938 Added Aether's snapshot repo to ease building 2012-12-29 22:27:26 +01:00
Hervé Boutemy
c5f54f8a6a fixed bootstrap (really, this time) 2012-12-20 08:58:13 +01:00
Hervé Boutemy
547b8c4c30 fix bootstrap (with Ant) 2012-12-20 08:49:02 +01:00
Hervé Boutemy
2acec0557a avoid timestamp in javadoc 2012-12-16 21:21:58 +01:00
Hervé Boutemy
866f2c58b8 prepared svnpubsub for site 2012-12-15 10:48:38 +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
Anders Hammar
19492b485a [MNG-5403] tar.gz release artifacts have wrong permissions on directories 
Upgrading to m-assembly-p v2.4 solves this.

Signed-off-by: Anders Hammar <anders@hammar.net>
 2012-12-04 13:50:03 +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
olivier lamy
af70de4b96 fix scm informations 2012-12-01 12:24:39 +01:00
Kristian Rosenvold
86004d6022 o Classworlds 2.4.2 2012-12-01 11:16:17 +01:00
Hervé Boutemy
4c8b3009d1 removed non-aggregate reportSets which duplicate default ones (then 
cause twice plugin invocation)
 2012-11-30 19:56:20 +01:00
Kristian Rosenvold
9712df3ded o Fixed another classloader leak where core was grabbing random elements in plugin classloaders 2012-11-30 08:56:19 +01:00
Jason van Zyl
620137ebca MNG-5386: Dispose of ClassRealms after invocation to prevent out of Permgen errors (update to classworlds 2.4.1) 2012-11-29 21:51:11 -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
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
Jason van Zyl
fdf808d012 wagon 2.3 will be in central shortly, remove from the POM for the release 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413074 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-23 21:41:40 +00:00
Jason van Zyl
f45e5f1084 wagon 2.3 will be in central shortly, remove from the POM for the release 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413074 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-23 21:41:40 +00:00
Jason van Zyl
c401d36101 use staging repository in the POM to test Wagon 2.3, this is wrong but until the Jenkins/Nexus setup is figured out this will keep the build working 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1411752 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-20 17:20:20 +00:00
Jason van Zyl
0098ceb9fc use staging repository in the POM to test Wagon 2.3, this is wrong but until the Jenkins/Nexus setup is figured out this will keep the build working 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1411752 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-20 17:20:20 +00:00
Jason van Zyl
603fe408ca update to Wagon 2.3 through the staging repo so we can validate 2.3 is good with master 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1411743 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-20 16:58:42 +00:00
Jason van Zyl
1e41eff172 update to Wagon 2.3 through the staging repo so we can validate 2.3 is good with master 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1411743 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-20 16:58:42 +00:00
Herve Boutemy
143354e5f9 [MNG-5380] [MNG-5336] use Modello 1.6, which adds xml:space="preserve" support for DOM and fixes xdoc propoerties output 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1411559 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-20 06:30:12 +00:00
Herve Boutemy
731fa826e5 [MNG-5380] [MNG-5336] use Modello 1.6, which adds xml:space="preserve" support for DOM and fixes xdoc propoerties output 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1411559 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-20 06:30:12 +00:00
Herve Boutemy
f750ec8970 added link to plexus-container-default javadoc 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1411369 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-19 19:50:04 +00:00
Herve Boutemy
21c2429519 added link to plexus-container-default javadoc 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1411369 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-19 19:50:04 +00:00
Herve Boutemy
17eec87d33 plexus-utils 3.0.9 released 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1411083 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-19 06:58:42 +00:00
Herve Boutemy
d707fa5b81 plexus-utils 3.0.9 released 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1411083 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-19 06:58:42 +00:00
Herve Boutemy
9bfdb4fe49 [MNG-5380] preserve whitespace in Maven plugin configuration when elemnt has xml:space="preserve" 
partial fix, Modello 1.6 is required but I can't deploy it

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1410886 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-18 13:29:18 +00:00
Herve Boutemy
7def319030 [MNG-5380] preserve whitespace in Maven plugin configuration when elemnt has xml:space="preserve" 
partial fix, Modello 1.6 is required but I can't deploy it

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1410886 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-18 13:29:18 +00:00
Herve Boutemy
ed3893b188 o upgraded MPIR to 2.6 
o added Markdown support to m-site-p (waiting for next m-site-p version which will include it by default)

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1407910 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-11 04:22:44 +00:00
Jason van Zyl
78a18e907d o update to slf4j 1.7.2 which allows the customization of the WARN level label. in the case of maven we vary slightly from all the standard logging implementations in that we use the string WARNING instead of WARN. once this change is made all the ITs pass again as all the failures were the result of string searches anchored on WARNING. 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1397289 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-11 20:26:24 +00:00