Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MNG-6084] Support JSR 250 annotations

This commit is contained in:
Dan Tran 2016-09-11 21:07:39 -07:00 committed by Michael Osipov
parent 66fc74d629
commit a7dddcb876
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
maven-core/src/main/resources/META-INF/maven/extension.xml
View File

@ -98,6 +98,8 @@ under the License.
<exportedPackage>javax.enterprise.util.*</exportedPackage> <exportedPackage>javax.enterprise.util.*</exportedPackage>
<exportedPackage>javax.enterprise.inject.*</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 | 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>org.apache.maven.resolver:maven-resolver-impl</exportedArtifact>
<exportedArtifact>javax.inject:javax.inject</exportedArtifact> <exportedArtifact>javax.inject:javax.inject</exportedArtifact>
<exportedArtifact>javax.annotation:jsr250-api</exportedArtifact>
<exportedArtifact>org.slf4j:slf4j-api</exportedArtifact> <exportedArtifact>org.slf4j:slf4j-api</exportedArtifact>
<exportedArtifact>org.fusesource.jansi:jansi</exportedArtifact> <exportedArtifact>org.fusesource.jansi:jansi</exportedArtifact>

4
maven-embedder/pom.xml
View File

@ -87,6 +87,10 @@ under the License.
<groupId>javax.inject</groupId> <groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId> <artifactId>javax.inject</artifactId>
</dependency> </dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId> <artifactId>plexus-utils</artifactId>

7
maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
View File

@ -601,9 +601,9 @@ public class MavenCli
ClassRealm containerRealm = setupContainerRealm( cliRequest.classWorld, coreRealm, extClassPath, extensions ); ClassRealm containerRealm = setupContainerRealm( cliRequest.classWorld, coreRealm, extClassPath, extensions );
ContainerConfiguration cc = new DefaultContainerConfiguration().setClassWorld( cliRequest.classWorld ).setRealm( ContainerConfiguration cc = new DefaultContainerConfiguration().setClassWorld( cliRequest.classWorld )
containerRealm ).setClassPathScanning( PlexusConstants.SCANNING_INDEX ).setAutoWiring( true ).setName( .setRealm( containerRealm ).setClassPathScanning( PlexusConstants.SCANNING_INDEX ).setAutoWiring( true )
"maven" ); .setJSR250Lifecycle( true ).setName( "maven" );
Set<String> exportedArtifacts = new HashSet<>( coreEntry.getExportedArtifacts() ); Set<String> exportedArtifacts = new HashSet<>( coreEntry.getExportedArtifacts() );
Set<String> exportedPackages = new HashSet<>( coreEntry.getExportedPackages() ); Set<String> exportedPackages = new HashSet<>( coreEntry.getExportedPackages() );
@ -697,6 +697,7 @@ public class MavenCli
.setRealm( containerRealm ) // .setRealm( containerRealm ) //
.setClassPathScanning( PlexusConstants.SCANNING_INDEX ) // .setClassPathScanning( PlexusConstants.SCANNING_INDEX ) //
.setAutoWiring( true ) // .setAutoWiring( true ) //
.setJSR250Lifecycle( true ) //
.setName( "maven" ); .setName( "maven" );
DefaultPlexusContainer container = new DefaultPlexusContainer( cc, new AbstractModule() DefaultPlexusContainer container = new DefaultPlexusContainer( cc, new AbstractModule()

5
pom.xml
View File

@ -258,6 +258,11 @@ under the License.
<artifactId>javax.inject</artifactId> <artifactId>javax.inject</artifactId>
<version>1</version> <version>1</version>
</dependency> </dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
<version>1.0</version>
</dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-annotations</artifactId> <artifactId>plexus-component-annotations</artifactId>