You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by da...@apache.org on 2016/11/22 00:45:11 UTC
[1/2] maven git commit: [MNG-6084] Support JSR 250 @PreDestory and
@PostContruct
Repository: maven
Updated Branches:
refs/heads/master 8ae1a3e92 -> 6755560a7
[MNG-6084] Support JSR 250 @PreDestory and @PostContruct
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/582ca659
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/582ca659
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/582ca659
Branch: refs/heads/master
Commit: 582ca6591ee9d2ed1de5ea58d10cba19cb8baf1d
Parents: 38300cf
Author: dantran <da...@apache.org>
Authored: Sun Sep 11 21:07:39 2016 -0700
Committer: Dan Tran <da...@emc.com>
Committed: Sun Nov 20 09:20:19 2016 -0800
----------------------------------------------------------------------
.../src/main/resources/META-INF/maven/extension.xml | 9 ++++++---
maven-embedder/pom.xml | 4 ++++
.../src/main/java/org/apache/maven/cli/MavenCli.java | 13 +++++++------
pom.xml | 5 +++++
4 files changed, 22 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/582ca659/maven-core/src/main/resources/META-INF/maven/extension.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/main/resources/META-INF/maven/extension.xml b/maven-core/src/main/resources/META-INF/maven/extension.xml
index f9cf07a..eaa807b 100644
--- a/maven-core/src/main/resources/META-INF/maven/extension.xml
+++ b/maven-core/src/main/resources/META-INF/maven/extension.xml
@@ -98,8 +98,10 @@ under the License.
<exportedPackage>javax.enterprise.util.*</exportedPackage>
<exportedPackage>javax.enterprise.inject.*</exportedPackage>
+ <!-- javax.annotation (JSR-250) -->
+ <exportedPackage>javax.annotation.*</exportedPackage>
- <!--
+ <!--
| We may potentially want to export these, but right now I'm not sure that anything Guice specific needs
| to be made available to plugin authors. If we find people are getting fancy and want to take advantage of
| Guice specifics we can expose that later. Really some testing needs to be done to see full hiding
@@ -157,11 +159,12 @@ under the License.
<exportedArtifact>org.eclipse.aether:aether-impl</exportedArtifact>
<exportedArtifact>javax.inject:javax.inject</exportedArtifact>
+ <exportedArtifact>javax.annotation:jsr250-api</exportedArtifact>
<exportedArtifact>org.slf4j:slf4j-api</exportedArtifact>
<exportedArtifact>org.fusesource.jansi:jansi</exportedArtifact>
<!--
- | We must also filter out the old Aether or NoClassDefFoundErrors will surface
+ | We must also filter out the old Aether or NoClassDefFoundErrors will surface
-->
<exportedArtifact>org.sonatype.aether:aether-api</exportedArtifact>
<exportedArtifact>org.sonatype.aether:aether-spi</exportedArtifact>
@@ -171,7 +174,7 @@ under the License.
| NOTE: Don't exclude the wagons or any of their dependencies (apart from the wagon API). This would otherwise
| provoke linkage errors for wagons contributed by build extensions. We also don't need to exclude the wagons
| from plugins. Plugins that use wagons directly and declare the corresponding dependency will simply use a
- | wagon from their plugin realm.
+ | wagon from their plugin realm.
-->
</exportedArtifacts>
</extension>
http://git-wip-us.apache.org/repos/asf/maven/blob/582ca659/maven-embedder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index f9973c5..db1bb34 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -101,6 +101,10 @@ under the License.
<artifactId>javax.inject</artifactId>
</dependency>
<dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-annotations</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/maven/blob/582ca659/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index 822f696..8f9546c 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -582,9 +582,9 @@ public class MavenCli
ClassRealm containerRealm = setupContainerRealm( cliRequest.classWorld, coreRealm, extClassPath, extensions );
- ContainerConfiguration cc = new DefaultContainerConfiguration().setClassWorld( cliRequest.classWorld ).setRealm(
- containerRealm ).setClassPathScanning( PlexusConstants.SCANNING_INDEX ).setAutoWiring( true ).setName(
- "maven" );
+ ContainerConfiguration cc = new DefaultContainerConfiguration().setClassWorld( cliRequest.classWorld ).
+ setRealm( containerRealm ).setClassPathScanning( PlexusConstants.SCANNING_INDEX ).setAutoWiring( true ).
+ setJSR250Lifecycle( true ).setName( "maven" );
Set<String> exportedArtifacts = new HashSet<>( coreEntry.getExportedArtifacts() );
Set<String> exportedPackages = new HashSet<>( coreEntry.getExportedPackages() );
@@ -680,6 +680,7 @@ public class MavenCli
.setRealm( containerRealm ) //
.setClassPathScanning( PlexusConstants.SCANNING_INDEX ) //
.setAutoWiring( true ) //
+ .setJSR250Lifecycle( true ) //enable support for @PostConstruct and @PreDestroy
.setName( "maven" );
DefaultPlexusContainer container = new DefaultPlexusContainer( cc, new AbstractModule()
@@ -1671,14 +1672,14 @@ public class MavenCli
if ( commandLine.hasOption( CLIManager.SET_SYSTEM_PROPERTY ) )
{
String[] defStrs = commandLine.getOptionValues( CLIManager.SET_SYSTEM_PROPERTY );
-
+
if ( defStrs != null )
{
//The following is needed to get precedence
//of properties which are defined on command line
- //over properties defined in the .mvn/maven.config.
+ //over properties defined in the .mvn/maven.config.
ArrayUtils.reverse( defStrs );
-
+
for ( String defStr : defStrs )
{
setCliProperty( defStr, userProperties );
http://git-wip-us.apache.org/repos/asf/maven/blob/582ca659/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 861b915..24c7df6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -266,6 +266,11 @@ under the License.
<version>1</version>
</dependency>
<dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-annotations</artifactId>
<version>${plexusVersion}</version>
[2/2] maven git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/maven
Posted by da...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/maven
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/6755560a
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/6755560a
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/6755560a
Branch: refs/heads/master
Commit: 6755560a753739e3c19a0feaf103cefe8d875b01
Parents: 582ca65 8ae1a3e
Author: Dan Tran <da...@gmail.com>
Authored: Mon Nov 21 16:44:45 2016 -0800
Committer: Dan Tran <da...@gmail.com>
Committed: Mon Nov 21 16:44:45 2016 -0800
----------------------------------------------------------------------
apache-maven/pom.xml | 4 +-
apache-maven/src/bin/m2.conf | 4 +-
apache-maven/src/bin/mvn | 32 ++-
apache-maven/src/bin/mvn.cmd | 59 +++++-
apache-maven/src/conf/settings.xml | 44 +----
apache-maven/src/conf/toolchains.xml | 42 ++--
.../main/appended-resources/META-INF/LICENSE.vm | 10 +-
apache-maven/src/main/assembly/component.xml | 1 -
doap_Maven.rdf | 6 +
.../ArtifactDescriptorReaderDelegate.java | 2 +-
.../internal/MavenRepositorySystemUtils.java | 21 +-
.../artifact/versioning/ArtifactVersion.java | 1 +
.../artifact/versioning/ComparableVersion.java | 12 +-
.../versioning/DefaultArtifactVersion.java | 1 +
.../versioning/ComparableVersionTest.java | 19 +-
.../apache/maven/building/ProblemCollector.java | 8 +-
.../maven/building/ProblemCollectorFactory.java | 6 +-
.../building/DefaultProblemCollectorTest.java | 8 +-
.../maven/building/DefaultProblemTest.java | 20 +-
.../building/ProblemCollectorFactoryTest.java | 4 +-
.../resolver/DebugResolutionListener.java | 4 +-
.../maven/project/MavenProjectBuilder.java | 3 +-
.../repository/legacy/DefaultWagonManager.java | 2 +-
.../DefaultLegacyArtifactCollector.java | 2 +-
.../legacy/DefaultWagonManagerTest.java | 2 +-
.../org/apache/maven/its/a/0.1/a-0.1.pom | 2 +-
.../org/apache/maven/its/b/0.1/b-0.1.pom | 2 +-
.../t12scm/maven/p0/1.0/p0-1.0.pom | 4 +-
.../t12scm/maven/p1/1.0/p1-1.0.pom | 2 +-
maven-core/project-builder.txt | 1 -
.../org/apache/maven/ArtifactFilterManager.java | 4 +-
.../java/org/apache/maven/DefaultMaven.java | 123 +++++++-----
.../DefaultProjectDependenciesResolver.java | 2 +-
.../src/main/java/org/apache/maven/Maven.java | 3 +
.../org/apache/maven/ProjectCycleException.java | 2 +-
.../java/org/apache/maven/SessionScoped.java | 4 +-
.../maven/bridge/MavenRepositorySystem.java | 10 +-
.../execution/DefaultMavenExecutionRequest.java | 4 +-
.../DefaultMavenExecutionRequestPopulator.java | 47 +++++
.../maven/execution/MavenExecutionRequest.java | 20 +-
.../MavenExecutionRequestPopulator.java | 2 +-
.../apache/maven/execution/MavenSession.java | 30 +--
.../maven/execution/ProjectDependencyGraph.java | 1 +
.../maven/extension/internal/CoreExports.java | 2 +-
.../apache/maven/graph/DefaultGraphBuilder.java | 4 +-
.../org/apache/maven/graph/GraphBuilder.java | 5 +
.../DefaultRepositorySystemSessionFactory.java | 6 +-
.../org/apache/maven/lifecycle/Lifecycle.java | 2 +-
.../lifecycle/MojoExecutionConfigurator.java | 4 +-
.../internal/LifecycleDependencyResolver.java | 10 +-
.../internal/LifecyclePluginResolver.java | 12 +-
.../lifecycle/internal/LifecycleStarter.java | 2 +-
.../internal/ProjectArtifactFactory.java | 2 +-
.../multithreaded/MultiThreadedBuilder.java | 20 +-
.../mapping/DefaultLifecycleMapping.java | 2 +-
.../maven/lifecycle/mapping/Lifecycle.java | 6 +-
.../maven/lifecycle/mapping/LifecycleMojo.java | 14 +-
.../maven/lifecycle/mapping/LifecyclePhase.java | 26 +--
.../plugin/DefaultProjectArtifactsCache.java | 32 +--
.../apache/maven/plugin/MavenPluginManager.java | 2 +-
.../PluginParameterExpressionEvaluator.java | 6 +-
.../maven/plugin/ProjectArtifactsCache.java | 2 +-
.../internal/DefaultPluginVersionResolver.java | 8 +-
.../maven/project/DefaultProjectBuilder.java | 2 +-
.../project/DefaultProjectBuildingRequest.java | 7 +-
.../org/apache/maven/project/MavenProject.java | 2 +-
.../project/RepositorySessionDecorator.java | 2 +-
.../properties/internal/SystemProperties.java | 30 ++-
.../maven/repository/RepositorySystem.java | 15 --
.../settings/DefaultMavenSettingsBuilder.java | 2 +-
.../maven/toolchain/DefaultToolchain.java | 10 +-
.../toolchain/DefaultToolchainManager.java | 6 +-
.../DefaultToolchainManagerPrivate.java | 2 +-
.../toolchain/RequirementMatcherFactory.java | 4 +-
.../maven/toolchain/ToolchainManager.java | 4 +-
.../toolchain/ToolchainManagerPrivate.java | 2 +-
.../maven/toolchain/ToolchainPrivate.java | 2 +-
.../building/DefaultToolchainsBuilder.java | 16 +-
.../DefaultToolchainsBuildingRequest.java | 2 +-
.../DefaultToolchainsBuildingResult.java | 10 +-
.../building/ToolchainsBuildingResult.java | 2 +-
.../toolchain/java/DefaultJavaToolChain.java | 2 +-
.../toolchain/merge/MavenToolchainMerger.java | 6 +-
maven-core/src/main/mdo/toolchains.mdo | 8 +-
maven-core/src/site/apt/index.apt | 23 ++-
.../apt/scripting-support/marmalade-support.apt | 196 -------------------
...faultMavenExecutionRequestPopulatorTest.java | 2 +-
.../maven/lifecycle/LifecycleExecutorTest.java | 2 +-
.../lifecycle/internal/stub/AboutTheStubs.html | 2 +-
.../lifecycle/mapping/LifecyclePhaseTest.java | 16 +-
.../apache/maven/plugin/PluginManagerTest.java | 2 +-
.../project/AbstractMavenProjectTestCase.java | 13 +-
.../maven/project/PomConstructionTest.java | 2 +-
.../artifact/DefaultMavenMetadataCacheTest.java | 36 +---
.../maven/repository/TestRepositorySystem.java | 10 +-
.../DefaultToolchainManagerPrivateTest.java | 8 +-
.../building/DefaultToolchainsBuilderTest.java | 16 +-
.../org/apache/maven/its/a/0.1/a-0.1.pom | 2 +-
.../org/apache/maven/its/b/0.1/b-0.1.pom | 2 +-
.../junit/junit/3.8.1/junit-3.8.1.pom | 2 +-
.../maven-artifact-3.0-SNAPSHOT.pom | 52 ++---
.../test/test-extension/1/test-extension-1.pom | 6 +-
.../1/test-lifecycle-and-artifactHandler-1.pom | 4 +-
.../maven/maven-parent/5/maven-parent-5.pom | 10 +-
.../plexus-classworlds-1.2-alpha-10.pom | 2 +-
.../1.1.6/plexus-components-1.1.6.pom | 18 +-
.../plexus-container-default-1.0-alpha-32.pom | 4 +-
.../plexus/plexus/1.0.10/plexus-1.0.10.pom | 2 +-
.../plexus/plexus/1.0.11/plexus-1.0.11.pom | 8 +-
.../plexus/plexus/1.0.4/plexus-1.0.4.pom | 2 +-
.../plexus/plexus/1.0.8/plexus-1.0.8.pom | 4 +-
.../plexus/plexus/1.0.9/plexus-1.0.9.pom | 2 +-
.../project-caching/1/project-caching-1.pom | 4 +-
.../toolchain/model/toolchains-jdks-extend.xml | 2 +-
.../org/apache/maven/cli/CLIReportingUtils.java | 17 +-
.../java/org/apache/maven/cli/CliRequest.java | 4 +-
.../java/org/apache/maven/cli/MavenCli.java | 36 +++-
.../SettingsXmlConfigurationProcessor.java | 2 +-
.../maven/slf4j-configuration.properties | 1 +
maven-embedder/src/site/apt/index.apt.vm | 7 +-
maven-embedder/src/site/apt/logging.apt | 2 +-
.../test-maven-ext/1/test-maven-ext-1.pom | 4 +-
.../1/bad-ext-plugin-dep-ver-maven-plugin-1.pom | 2 +-
.../bad-ext-plugin-maven-ver-maven-plugin-1.pom | 4 +-
.../1/err-loading-plugin-maven-plugin-1.pom | 2 +-
.../org/apache/maven/errortest/dep/1/dep-1.pom | 2 +-
.../err-resolving-ext-plugin-maven-plugin-1.pom | 2 +-
.../org/apache/maven/errortest/dep/1/dep-1.pom | 2 +-
.../1/test-maven-ext-dep-1.pom | 2 +-
.../test-maven-ext/1/test-maven-ext-1.pom | 4 +-
...t-plugin-artifact-missing-maven-plugin-1.pom | 2 +-
.../1/ext-plugin-version-err-maven-plugin-1.pom | 2 +-
.../local-repo/org/test/bad-pom/1/bad-pom-1.pom | 2 +-
.../java/org/apache/maven/cli/MavenCliTest.java | 8 +-
.../src/test/projects/config/.mvn/maven.config | 2 +-
.../model/building/DefaultModelBuilder.java | 43 ++--
.../building/DefaultModelBuildingRequest.java | 5 +-
.../maven/model/building/FileModelSource.java | 8 +-
.../org/apache/maven/model/building/Result.java | 2 +-
.../maven/model/building/StringModelSource.java | 2 +-
.../maven/model/building/UrlModelSource.java | 2 +-
.../DefaultDependencyManagementImporter.java | 30 ++-
.../model/superpom/DefaultSuperPomProvider.java | 3 +-
.../model/validation/DefaultModelValidator.java | 167 ++++++++--------
.../maven/model/versioning/ModelVersions.java | 132 -------------
.../org/apache/maven/model/pom-4.0.0.xml | 39 ++--
.../org/apache/maven/model/pom-4.1.0.xml | 109 -----------
maven-model-builder/src/site/apt/index.apt | 2 +-
.../DefaultInheritanceAssemblerTest.java | 6 +-
.../maven/model/merge/MavenModelMergerTest.java | 4 +-
.../validation/DefaultModelValidatorTest.java | 73 +++++--
.../module-path-not-artifactId-child.xml | 2 +-
.../module-path-not-artifactId-expected.xml | 2 +-
.../missing-artifactId-pluginManagement.xml | 39 ++++
.../raw-model/missing-ga-pluginManagement.xml | 39 ++++
.../missing-groupId-pluginManagement.xml | 39 ++++
.../missing-plugin-version-pluginManagement.xml | 40 ++++
maven-model/src/main/mdo/maven.mdo | 22 +--
.../descriptor/PluginDescriptorBuilder.java | 2 +
.../descriptor/PluginDescriptorBuilderTest.java | 1 +
maven-plugin-api/src/test/resources/plugin.xml | 1 +
.../DefaultSettingsBuildingRequest.java | 7 +-
.../settings/building/FileSettingsSource.java | 2 +-
.../maven/settings/building/SettingsSource.java | 2 +-
.../settings/building/StringSettingsSource.java | 2 +-
.../settings/building/UrlSettingsSource.java | 4 +-
.../settings/merge/MavenSettingsMerger.java | 5 +-
.../validation/DefaultSettingsValidator.java | 2 +-
maven-slf4j-provider/pom.xml | 116 +++++++++++
.../java/org/slf4j/impl/MavenSimpleLogger.java | 117 +++++++++++
.../slf4j/impl/MavenSimpleLoggerFactory.java | 44 +++++
.../src/main/script/patch-slf4j-simple.groovy | 53 +++++
maven-slf4j-provider/src/site/site.xml | 36 ++++
pom.xml | 19 +-
src/site/xdoc/index.xml | 1 +
175 files changed, 1480 insertions(+), 1190 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/6755560a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/6755560a/pom.xml
----------------------------------------------------------------------