Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
10,504 Commits 85 Branches 93 Tags 86 MiB
Commit Graph

14 Commits

Author SHA1 Message Date
Hervé Boutemy ef41c0e4f4 updated model version to latest 1.1.0 
and xsd link in model documentation is already generated by Modello, no
need to duplicate information in handwritten description
 2018-04-11 07:43:55 +02:00
Michael Osipov 0dbdda823f Add .factorypath from m2e to .gitignore 2018-04-07 11:40:12 +02:00
Olivier Lamy 4085814329 ignore .java-version file 2015-03-15 22:26:45 +11: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
olivier lamy 28721c35e0 idea can produce out directory so ignore it 2013-02-24 09:31:43 +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
Hervé Boutemy 11ac804f59 added bootstrap files to .gitignore 2012-12-21 07:49:50 +01:00
Olivier Lamy 4dce88a170 ignore .idea 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1234714 13f79535-47bb-0310-9956-ffa450edef68
 2012-01-23 09:28:22 +00:00
Olivier Lamy c79ae58d0b add .DS_Store in .gitignore 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1176750 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-28 06:46:02 +00:00
Olivier Lamy 81e8cc9b5c add .DS_Store in .gitignore 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1176750 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-28 06:46:02 +00:00
Olivier Lamy 8e4a1f8890 ignore *.iml 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1134257 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-10 09:55:02 +00:00
Kristian Rosenvold f8c8aa5fa1 o Minor (test) modification. git workflow test 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@962440 13f79535-47bb-0310-9956-ffa450edef68
 2010-07-09 08:18:34 +00:00
Kristian Rosenvold 0e6cbbbf56 o Added first-version .gitignore 
Also testing git-svn integration

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@960598 13f79535-47bb-0310-9956-ffa450edef68
 2010-07-05 13:51:52 +00:00