[MNG-6084] Support JSR 250 annotations

RichVRed · May 25, 2017 · a7dddcb · a7dddcb
1 parent 66fc74d
commit a7dddcb
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/maven-core/src/main/resources/META-INF/maven/extension.xml b/maven-core/src/main/resources/META-INF/maven/extension.xml
@@ -98,6 98,8 @@ 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
@@ -157,6 159,7 @@ under the License.
  <exportedArtifact>org.apache.maven.resolver:maven-resolver-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>
 

diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
@@ -87,6 87,10 @@ under the License.
  <groupId>javax.inject</groupId>
  <artifactId>javax.inject</artifactId>
  </dependency>
  <dependency>
  <groupId>javax.annotation</groupId>
  <artifactId>jsr250-api</artifactId>
  </dependency>
  <dependency>
  <groupId>org.codehaus.plexus</groupId>
  <artifactId>plexus-utils</artifactId>

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
@@ -601,9 601,9 @@ private PlexusContainer container( CliRequest cliRequest )
 
  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() );
@@ -697,6 697,7 @@ private List<CoreExtensionEntry> loadCoreExtensions( CliRequest cliRequest, Clas
  .setRealm( containerRealm ) //
  .setClassPathScanning( PlexusConstants.SCANNING_INDEX ) //
  .setAutoWiring( true ) //
  .setJSR250Lifecycle( true ) //
  .setName( "maven" );
 
  DefaultPlexusContainer container = new DefaultPlexusContainer( cc, new AbstractModule()

diff --git a/pom.xml b/pom.xml
@@ -258,6 258,11 @@ under the License.
  <artifactId>javax.inject</artifactId>
  <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>