Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,668 Commits 84 Branches 96 Tags 107 MiB
Commit Graph

9668 Commits

Author SHA1 Message Date
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
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
Hervé Boutemy 7196f82ff2 improved javadoc 2013-02-02 09:40:06 +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
olivier lamy 6c3ec90f2c prevent possible NPE 2013-01-31 23:03:46 +01:00
Kristian Rosenvold 176a85f43c Fixed line feeds, added .gitattributes 2013-01-29 16:27:02 +01:00
olivier lamy 2f97f96fb1 [MNG-5418] Can't activate a profile by checking for the presence of a file in ${myProperty}. 2013-01-24 22:58:39 +01:00
Hervé Boutemy ff370850cd refactoring: extracted MavenSnapshotMetadata from 
(Local+Remote)SnapshotMetadata
 2013-01-19 13:36:20 +01:00
Hervé Boutemy 37d3166d00 removed unused annotation 2013-01-19 09:22:56 +01:00
Hervé Boutemy 1408254fb8 use MavenMetadata.read(File) API instead of duplicating code 2013-01-19 09:04:29 +01:00
Hervé Boutemy 9a1d22fa40 move MAVEN_METADATA_XML constant to MavenMetadata class 2013-01-19 08:56:12 +01:00
Hervé Boutemy 66dc8c6ec1 code simplification 2013-01-18 00:44:02 +01:00
Hervé Boutemy ff21286eee extracted readVersionInfoMap method 2013-01-17 23:22:58 +01:00
Hervé Boutemy d22d94903a code simplification 2013-01-17 22:56:18 +01:00
Hervé Boutemy 0824df85f3 little code simplification 2013-01-17 22:04:09 +01:00
Hervé Boutemy 5ad8e34e63 improved javadoc 2013-01-17 22:00:49 +01:00
Hervé Boutemy b6e99c7676 added javadoc 2013-01-12 09:08:05 +01:00
Anders Hammar 77b12f962d Fixed incorrect Maven property example. 
Signed-off-by: Anders Hammar <anders@hammar.net>
 2013-01-07 11:35:57 +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 89c2524458 ${basedir} is deprecated 2013-01-05 10:29:49 +01:00
Benjamin Bentmann 36bee64938 Added Aether's snapshot repo to ease building 2012-12-29 22:27:26 +01:00
Benjamin Bentmann 3916201b98 Used improved conflict resolver 2012-12-29 22:25:25 +01:00
Hervé Boutemy 57d9c68e56 stdout/stderr redirection should be sufficient 2012-12-21 07:50:56 +01:00
Hervé Boutemy 11ac804f59 added bootstrap files to .gitignore 2012-12-21 07:49:50 +01:00