Apache/maven
1
0
Fork 0
mirror of https://github.com/apache/maven.git synced 2025-03-07 00:59:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,102 Commits 84 Branches 97 Tags
Commit Graph

482 Commits

Author SHA1 Message Date
Jason van Zyl
271761de84 [maven-release-plugin] prepare for next development iteration 2013-06-27 22:10:23 -04:00
Jason van Zyl
893ca28a1d [maven-release-plugin] prepare release maven-3.1.0 2013-06-27 22:10:16 -04:00
Jason van Zyl
09e77b53f0 Revert "[maven-release-plugin] prepare release maven-3.1" 
This reverts commit a47ef06832bff888928c66c525e18439b7a3c0f3.
 2013-06-23 08:15:55 -07:00
Jason van Zyl
87e5972726 Revert "[maven-release-plugin] prepare for next development iteration" 
This reverts commit e22b2fa16a14551b6a9f8fd5776d21cf5ef6c663.
 2013-06-23 08:15:29 -07:00
Jason van Zyl
e22b2fa16a [maven-release-plugin] prepare for next development iteration 2013-06-23 08:03:57 -07:00
Jason van Zyl
a47ef06832 [maven-release-plugin] prepare release maven-3.1 2013-06-23 08:03:53 -07:00
Jason van Zyl
e1286aea83 [maven-release-plugin] prepare for next development iteration 2013-06-01 08:56:26 -04:00
Jason van Zyl
c726cdd3a9 [maven-release-plugin] prepare release maven-3.1.0-alpha-1 2013-06-01 08:56:20 -04:00
rfscholte
22d74b0df9 Fix errors reported by DOAP, shortened descriptions where required (DOAP accepts max 10 words) 2013-05-29 20:47:26 +02:00
Brett Porter
2fea34f701 fix typo and use names from their respective POMs 2013-05-28 21:22:22 -07:00
Jason van Zyl
b0a83f6259 o update notice to reflect Aether and Sisu coming from the Eclipse Foundation 2013-05-28 19:06:19 -04:00
rfscholte
bd6beaa925 Adjust Copyright year 2013-05-28 22:24:07 +02:00
Stephen Connolly
348f716433 Add Apache RAT pluging configuration to exclude files that have a legitimate reason for being excluded 
- We should maybe review this list periodically, but to my mind there are legitimate reasons for excluding all of these files from the ASL license header requirements
 2013-05-28 10:37:02 +01:00
Stephen Connolly
c6c6bdc49f Add ASL license header 2013-05-28 10:19:32 +01:00
Jason van Zyl
326303e22a [maven-release-plugin] prepare for next development iteration 2013-05-25 08:33:08 -04:00
Jason van Zyl
42b69f0b0a [maven-release-plugin] prepare release maven-3.1.0-alpha-1 2013-05-25 08:33:02 -04:00
Jason van Zyl
00b9029094 [maven-release-plugin] prepare for next development iteration 2013-05-23 10:23:11 -04:00
Jason van Zyl
32d720ea0c [maven-release-plugin] prepare release maven-3.1.0-alpha-1 2013-05-23 10:23:05 -04:00
Jason van Zyl
95fbf6f445 [maven-release-plugin] prepare for next development iteration 2013-03-30 10:52:15 -04:00
Jason van Zyl
262b9bb1ef [maven-release-plugin] prepare release maven-3.1.0-alpha-1 2013-03-30 10:52:10 -04:00
Jason van Zyl
08eab1953d o revert release plugin commits 2013-03-30 10:50:39 -04:00
Jason van Zyl
01c969e1eb [maven-release-plugin] prepare for next development iteration 2013-03-30 10:21:32 -04:00
Jason van Zyl
2decac4869 [maven-release-plugin] prepare release maven-3.1.0 2013-03-30 10:19:45 -04: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
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
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
Hervé Boutemy
3e95b5f1c7 updated content 2012-12-16 21:13:57 +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
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
527cee25ef - Look for older setups as well, thanks to @mcculls for spotting this 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413474 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-26 03:50:32 +00:00
Jason van Zyl
a284ef279c - keep git init script out of the source distribution 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413393 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-25 19:23:04 +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
becf420bfa - export JAVA_HOME if it is not set or it commands, like javadoc, that expect it don't work very well 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413378 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-25 17:50:48 +00:00
Jason van Zyl
63fd9ed4d8 MNG-5376: Account for changes between the Apple and Oracle JDKs on OSX 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1413208 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-24 17:22:54 +00:00
Jason van Zyl
074667f20f MNG-5376: Account for changes between the Apple and Oracle JDKs on OSX 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1412409 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-22 02:24:16 +00:00
Jason van Zyl
325972aed0 MNG-5376: Account for changes between the Apple and Oracle JDKs on OSX 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1412409 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-22 02:24:16 +00:00
Jason van Zyl
44f65114cc MNG-5053: Remove obsolete debugger arguments 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1409024 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-13 23:35:05 +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
Jason van Zyl
d2a9a88c9e Explicitly set Sisu container logging to 'info' so it doesn't appear during Maven debug (-X) logging. To re-enable, remove this line from conf/logging/simplelogger.properties in the distribution. 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1396843 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-10 22:48:14 +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
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
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