Commit Graph

679 Commits

Author SHA1 Message Date
Hervé Boutemy deacaadf60 use maven-project-info-reports-plugin 2.7, which has better git support 2013-05-17 00:14:13 +02:00
Hervé Boutemy 204f96955a maven-site-plugin 3.3 released 2013-05-13 19:54:24 +02:00
Hervé Boutemy d6f02bb406 added a notice for the MSITE-687 workaround 2013-04-25 19:27:49 +02: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
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
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
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
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