Author: rotty3000 Date: Tue Nov 7 17:20:19 2017 New Revision: 1814528 URL: http://svn.apache.org/viewvc?rev=1814528&view=rev Log: [CDI] fix the annotation API to latest and re-structure source/javadoc generation so it works properly
Signed-off-by: Raymond Augé <[email protected]> Modified: aries/trunk/cdi/javax.annotation-api/bnd.bnd aries/trunk/cdi/javax.annotation-api/pom.xml aries/trunk/cdi/pom.xml Modified: aries/trunk/cdi/javax.annotation-api/bnd.bnd URL: http://svn.apache.org/viewvc/aries/trunk/cdi/javax.annotation-api/bnd.bnd?rev=1814528&r1=1814527&r2=1814528&view=diff ============================================================================== --- aries/trunk/cdi/javax.annotation-api/bnd.bnd (original) +++ aries/trunk/cdi/javax.annotation-api/bnd.bnd Tue Nov 7 17:20:19 2017 @@ -1,10 +1,14 @@ -Export-Package: \ - javax.annotation;version="1.2",\ - javax.annotation.security;version="1.2",\ - javax.annotation.sql;version="1.2" -Provide-Capability: \ - osgi.contract; \ - osgi.contract=JavaAnnotation; \ - uses:="javax.annotation, javax.annotation.security, javax.annotation.sql"; \ - version:List<Version>='1,1.1,1.2' --includeresource: @geronimo-annotation_1.2_spec-*.jar!/META-INF/LICENSE, @geronimo-annotation_1.2_spec-*.jar!/META-INF/NOTICE \ No newline at end of file +# Keep -include instruction first because order matters +-include: ~file:${.}/target/sources/META-INF/MANIFEST.MF + +-exportcontents: javax.annotation.*;version='1.3' + +-includeresource:\ + META-INF/LICENSE=${.}/target/sources/META-INF/LICENSE,\ + META-INF/NOTICE=${.}/target/sources/META-INF/NOTICE + +Provide-Capability:\ + osgi.contract;\ + osgi.contract=JavaAnnotation;\ + uses:="javax.annotation, javax.annotation.security, javax.annotation.sql";\ + version:List<Version>='1.3,1.2,1.1,1' Modified: aries/trunk/cdi/javax.annotation-api/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/cdi/javax.annotation-api/pom.xml?rev=1814528&r1=1814527&r2=1814528&view=diff ============================================================================== --- aries/trunk/cdi/javax.annotation-api/pom.xml (original) +++ aries/trunk/cdi/javax.annotation-api/pom.xml Tue Nov 7 17:20:19 2017 @@ -32,42 +32,69 @@ <artifactId>org.apache.aries.javax.annotation-api</artifactId> <name>Javax Annotation API Bundle</name> <description>Javax Annotation API Bundle</description> + <properties> + <spec.group.id>org.apache.geronimo.specs</spec.group.id> + <spec.artifact.id>geronimo-annotation_1.3_spec</spec.artifact.id> + </properties> <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>3.0.1</version> + <executions> + <execution> + <id>unpack-sources</id> + <phase>process-sources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>${spec.group.id}</groupId> + <artifactId>${spec.artifact.id}</artifactId> + <classifier>sources</classifier> + <version>1.0</version> + <overWrite>false</overWrite> + <outputDirectory>${project.build.directory}/sources</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>biz.aQute.bnd</groupId> <artifactId>bnd-maven-plugin</artifactId> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-sources</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <executions> <execution> - <id>javadoc-jar</id> - <phase>package</phase> + <id>attach-javadocs</id> <goals> <goal>jar</goal> </goals> - <configuration> - <includeDependencySources>true</includeDependencySources> - - <dependencySourceIncludes> - <dependencySourceInclude>org.apache.geronimo.specs:geronimo-annotation_1.2_spec</dependencySourceInclude> - </dependencySourceIncludes> - </configuration> </execution> </executions> </plugin> </plugins> + <sourceDirectory>${project.build.directory}/sources</sourceDirectory> </build> - <dependencies> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-annotation_1.2_spec</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - </dependencies> - </project> Modified: aries/trunk/cdi/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/cdi/pom.xml?rev=1814528&r1=1814527&r2=1814528&view=diff ============================================================================== --- aries/trunk/cdi/pom.xml (original) +++ aries/trunk/cdi/pom.xml Tue Nov 7 17:20:19 2017 @@ -35,7 +35,7 @@ <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> <properties> - <bnd.version>3.4.0</bnd.version> + <bnd.version>3.5.0</bnd.version> <full.version>${project.version} (${timestamp} AD)</full.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <surefire.version>2.12</surefire.version>
