Author: rotty3000
Date: Wed Nov 29 14:54:40 2017
New Revision: 1816630
URL: http://svn.apache.org/viewvc?rev=1816630&view=rev
Log:
[CDI] fix spec packaging to use origin APIs while meeting ASF regulations
Added:
aries/trunk/cdi/javax.annotation-api/README
aries/trunk/cdi/javax.cdi-api/README
aries/trunk/cdi/javax.el-api/README
aries/trunk/cdi/javax.inject-api/README
aries/trunk/cdi/javax.interceptor-api/README
Removed:
aries/trunk/cdi/javax.cdi-api/LICENSE
aries/trunk/cdi/javax.cdi-api/NOTICE
aries/trunk/cdi/javax.cdi-api/src/main/resources/META-INF/services/javax.enterprise.inject.spi.CDIProvider
aries/trunk/cdi/javax.inject-api/LICENSE
aries/trunk/cdi/javax.inject-api/NOTICE
aries/trunk/cdi/javax.interceptor-api/LICENSE
aries/trunk/cdi/javax.interceptor-api/NOTICE
Modified:
aries/trunk/cdi/javax.annotation-api/bnd.bnd
aries/trunk/cdi/javax.annotation-api/pom.xml
aries/trunk/cdi/javax.cdi-api/bnd.bnd
aries/trunk/cdi/javax.cdi-api/pom.xml
aries/trunk/cdi/javax.el-api/bnd.bnd
aries/trunk/cdi/javax.el-api/pom.xml
aries/trunk/cdi/javax.inject-api/bnd.bnd
aries/trunk/cdi/javax.inject-api/pom.xml
aries/trunk/cdi/javax.interceptor-api/bnd.bnd
aries/trunk/cdi/javax.interceptor-api/pom.xml
aries/trunk/cdi/pom.xml
Added: aries/trunk/cdi/javax.annotation-api/README
URL:
http://svn.apache.org/viewvc/aries/trunk/cdi/javax.annotation-api/README?rev=1816630&view=auto
==============================================================================
--- aries/trunk/cdi/javax.annotation-api/README (added)
+++ aries/trunk/cdi/javax.annotation-api/README Wed Nov 29 14:54:40 2017
@@ -0,0 +1,12 @@
+
+Apache Aries Javax Annotation API
+Copyright 2017 The Apache Software Foundation
+
+This product includes software originating from [1] repackaged under the
+CDDL-1.1 license.
+
+The repackaging adds additional OSGi metadata following the directions
+located at [2].
+
+[1] https://jcp.org/en/jsr/detail?id=250
+[2] http://apache.org/legal/resolved.html#osgi-category-b
\ No newline at end of file
Modified: aries/trunk/cdi/javax.annotation-api/bnd.bnd
URL:
http://svn.apache.org/viewvc/aries/trunk/cdi/javax.annotation-api/bnd.bnd?rev=1816630&r1=1816629&r2=1816630&view=diff
==============================================================================
--- aries/trunk/cdi/javax.annotation-api/bnd.bnd (original)
+++ aries/trunk/cdi/javax.annotation-api/bnd.bnd Wed Nov 29 14:54:40 2017
@@ -1,14 +1,11 @@
-# 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
-
+Bundle-License: CDDL-1.1;link="https://spdx.org/licenses/CDDL-1.1.html";
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'
+
+-exportcontents: javax.annotation.*;version='1.3'
+
+-includeresource: META-INF/README=README
+-removeheaders: Archiver-Version, Created-By, Built-By, Build-Jdk
Modified: aries/trunk/cdi/javax.annotation-api/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/cdi/javax.annotation-api/pom.xml?rev=1816630&r1=1816629&r2=1816630&view=diff
==============================================================================
--- aries/trunk/cdi/javax.annotation-api/pom.xml (original)
+++ aries/trunk/cdi/javax.annotation-api/pom.xml Wed Nov 29 14:54:40 2017
@@ -29,20 +29,45 @@
<relativePath>..</relativePath>
</parent>
+ <groupId>org.apache.aries.spec</groupId>
<artifactId>org.apache.aries.javax.annotation-api</artifactId>
- <name>Javax Annotation API Bundle</name>
- <description>Javax Annotation API Bundle</description>
+ <name>Apache Aries Javax Annotation API</name>
+ <description>Apache Aries Javax Annotation API</description>
+
<properties>
- <spec.group.id>org.apache.geronimo.specs</spec.group.id>
-
<spec.artifact.id>geronimo-annotation_1.3_spec</spec.artifact.id>
+ <spec.groupId>javax.annotation</spec.groupId>
+ <spec.artifactId>javax.annotation-api</spec.artifactId>
+ <spec.version>1.3.1</spec.version>
+ <remoteresources.skip>true</remoteresources.skip>
</properties>
+ <licenses>
+ <license>
+ <name>CDDL-1.1</name>
+ <url>https://spdx.org/licenses/CDDL-1.1.html</url>
+ <comments>This project uses the javax.annotation API
artifact under the terms of the CDDL-1.1 license.</comments>
+ </license>
+ </licenses>
+
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+
<addDefaultImplementationEntries>false</addDefaultImplementationEntries>
+
<addDefaultSpecificationEntries>false</addDefaultSpecificationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>3.0.1</version>
+ <version>3.0.1</version><!--$NO-MVN-MAN-VER$-->
<executions>
<execution>
<id>unpack-sources</id>
@@ -53,12 +78,13 @@
<configuration>
<artifactItems>
<artifactItem>
-
<groupId>${spec.group.id}</groupId>
-
<artifactId>${spec.artifact.id}</artifactId>
+
<groupId>${spec.groupId}</groupId>
+
<artifactId>${spec.artifactId}</artifactId>
<classifier>sources</classifier>
-
<version>1.0</version>
+
<version>${spec.version}</version>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/sources</outputDirectory>
+
<excludes>pom.xml,META-INF/LICENSE.txt</excludes>
</artifactItem>
</artifactItems>
</configuration>
@@ -69,32 +95,7 @@
<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>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
<sourceDirectory>${project.build.directory}/sources</sourceDirectory>
</build>
-
</project>
Added: aries/trunk/cdi/javax.cdi-api/README
URL:
http://svn.apache.org/viewvc/aries/trunk/cdi/javax.cdi-api/README?rev=1816630&view=auto
==============================================================================
--- aries/trunk/cdi/javax.cdi-api/README (added)
+++ aries/trunk/cdi/javax.cdi-api/README Wed Nov 29 14:54:40 2017
@@ -0,0 +1,12 @@
+
+Apache Aries Javax CDI API
+Copyright 2017 The Apache Software Foundation
+
+This product includes software originating from [1] repackaged under the
+ASL-2.0 license.
+
+The repackaging adds additional OSGi metadata following the directions
+located at [2].
+
+[1] https://jcp.org/en/jsr/detail?id=365
+[2] http://apache.org/legal/resolved.html#osgi-category-b
\ No newline at end of file
Modified: aries/trunk/cdi/javax.cdi-api/bnd.bnd
URL:
http://svn.apache.org/viewvc/aries/trunk/cdi/javax.cdi-api/bnd.bnd?rev=1816630&r1=1816629&r2=1816630&view=diff
==============================================================================
--- aries/trunk/cdi/javax.cdi-api/bnd.bnd (original)
+++ aries/trunk/cdi/javax.cdi-api/bnd.bnd Wed Nov 29 14:54:40 2017
@@ -1,11 +1,14 @@
-Export-Package: \
- javax.decorator,\
- javax.enterprise.*
-Import-Package: org.apache.aries.cdi.provider;version='[0.0.1,2.0.0)',*
+Bundle-License: ASL-2.0;link="http://www.apache.org/licenses/LICENSE-2.0.txt";
Provide-Capability: \
osgi.contract; \
osgi.contract=JavaCDI; \
uses:="javax.decorator,javax.enterprise.context,javax.enterprise.context.spi,javax.enterprise.event,javax.enterprise.inject,javax.enterprise.inject.spi,javax.enterprise.util";
\
- version:List<Version>='1.0,1.1,1.2,2.0'
+ version:List<Version>='2.0,1.2,1.1,1.0'
+
+-exportcontents: \
+ javax.decorator.*;version='2.0',\
+ javax.enterprise.*;version='2.0'
+
+-includeresource: META-INF/README=README
+-removeheaders: Archiver-Version, Created-By, Built-By, Build-Jdk
-contract: JavaEL, JavaInject, JavaInterceptor
--includeresource: META-INF/=LICENSE, META-INF/=NOTICE
Modified: aries/trunk/cdi/javax.cdi-api/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/cdi/javax.cdi-api/pom.xml?rev=1816630&r1=1816629&r2=1816630&view=diff
==============================================================================
--- aries/trunk/cdi/javax.cdi-api/pom.xml (original)
+++ aries/trunk/cdi/javax.cdi-api/pom.xml Wed Nov 29 14:54:40 2017
@@ -29,71 +29,89 @@
<relativePath>..</relativePath>
</parent>
+ <groupId>org.apache.aries.spec</groupId>
<artifactId>org.apache.aries.javax.cdi-api</artifactId>
- <name>Javax CDI API Bundle</name>
- <description>Javax CDI API Bundle</description>
+ <name>Apache Aries Javax CDI API</name>
+ <description>Apache Aries Javax CDI API</description>
+
+ <properties>
+ <spec.groupId>javax.enterprise</spec.groupId>
+ <spec.artifactId>cdi-api</spec.artifactId>
+ <spec.version>2.0</spec.version>
+ <remoteresources.skip>true</remoteresources.skip>
+ </properties>
+
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
<build>
<plugins>
<plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+
<addDefaultImplementationEntries>false</addDefaultImplementationEntries>
+
<addDefaultSpecificationEntries>false</addDefaultSpecificationEntries>
+ </manifest>
+ </archive>
+ </configuration>
</plugin>
+
<plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>3.0.1</version><!--$NO-MVN-MAN-VER$-->
<executions>
<execution>
- <id>javadoc-jar</id>
- <phase>package</phase>
+ <id>unpack-sources</id>
+ <phase>process-sources</phase>
<goals>
- <goal>jar</goal>
+ <goal>unpack</goal>
</goals>
<configuration>
-
<includeDependencySources>true</includeDependencySources>
-
-
<dependencySourceIncludes>
-
<dependencySourceInclude>javax.enterprise:cdi-api</dependencySourceInclude>
-
</dependencySourceIncludes>
+ <artifactItems>
+ <artifactItem>
+
<groupId>${spec.groupId}</groupId>
+
<artifactId>${spec.artifactId}</artifactId>
+
<classifier>sources</classifier>
+
<version>${spec.version}</version>
+
<overWrite>false</overWrite>
+
<outputDirectory>${project.build.directory}/sources</outputDirectory>
+<!--
<excludes>pom.xml,META-INF/LICENSE.txt</excludes>
+-->
+ </artifactItem>
+ </artifactItems>
</configuration>
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ </plugin>
</plugins>
+
<sourceDirectory>${project.build.directory}/sources</sourceDirectory>
</build>
<dependencies>
<dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.el</groupId>
- <artifactId>javax.el-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.interceptor</groupId>
-
<artifactId>javax.interceptor-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.aries.cdi</groupId>
+ <groupId>org.apache.aries.spec</groupId>
<artifactId>org.apache.aries.javax.el-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.aries.cdi</groupId>
+ <groupId>org.apache.aries.spec</groupId>
<artifactId>org.apache.aries.javax.inject-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.aries.cdi</groupId>
+ <groupId>org.apache.aries.spec</groupId>
<artifactId>org.apache.aries.javax.interceptor-api</artifactId>
<version>${project.version}</version>
</dependency>
Added: aries/trunk/cdi/javax.el-api/README
URL:
http://svn.apache.org/viewvc/aries/trunk/cdi/javax.el-api/README?rev=1816630&view=auto
==============================================================================
--- aries/trunk/cdi/javax.el-api/README (added)
+++ aries/trunk/cdi/javax.el-api/README Wed Nov 29 14:54:40 2017
@@ -0,0 +1,12 @@
+
+Apache Aries Javax EL API
+Copyright 2017 The Apache Software Foundation
+
+This product includes software originating from [1] repackaged under the
+CDDL-1.1 license.
+
+The repackaging adds additional OSGi metadata following the directions
+located at [2].
+
+[1] https://jcp.org/en/jsr/detail?id=341
+[2] http://apache.org/legal/resolved.html#osgi-category-b
\ No newline at end of file
Modified: aries/trunk/cdi/javax.el-api/bnd.bnd
URL:
http://svn.apache.org/viewvc/aries/trunk/cdi/javax.el-api/bnd.bnd?rev=1816630&r1=1816629&r2=1816630&view=diff
==============================================================================
--- aries/trunk/cdi/javax.el-api/bnd.bnd (original)
+++ aries/trunk/cdi/javax.el-api/bnd.bnd Wed Nov 29 14:54:40 2017
@@ -1,8 +1,11 @@
-Export-Package: \
- javax.el;version='1.0.0'
+Bundle-License: CDDL-1.1;link="https://spdx.org/licenses/CDDL-1.1.html";
Provide-Capability: \
osgi.contract; \
osgi.contract=JavaEL; \
uses:="javax.el"; \
- version:List<Version>='2.1,2.2,3.0'
--includeresource: @tomcat-el-api-*.jar!/META-INF/LICENSE,
@tomcat-el-api-*.jar!/META-INF/NOTICE
\ No newline at end of file
+ version:List<Version>='3.0,2.2,2.1'
+
+-exportcontents: javax.el.*;version='3.0'
+
+-includeresource: META-INF/README=README
+-removeheaders: Archiver-Version, Created-By, Built-By, Build-Jdk
Modified: aries/trunk/cdi/javax.el-api/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/cdi/javax.el-api/pom.xml?rev=1816630&r1=1816629&r2=1816630&view=diff
==============================================================================
--- aries/trunk/cdi/javax.el-api/pom.xml (original)
+++ aries/trunk/cdi/javax.el-api/pom.xml Wed Nov 29 14:54:40 2017
@@ -29,45 +29,73 @@
<relativePath>..</relativePath>
</parent>
+ <groupId>org.apache.aries.spec</groupId>
<artifactId>org.apache.aries.javax.el-api</artifactId>
- <name>Javax EL API Bundle</name>
- <description>Javax EL API Bundle</description>
+ <name>Apache Aries Javax EL API</name>
+ <description>Apache Aries Javax EL API</description>
+
+ <properties>
+ <spec.groupId>javax.el</spec.groupId>
+ <spec.artifactId>javax.el-api</spec.artifactId>
+ <spec.version>3.0.1-b04</spec.version>
+ <remoteresources.skip>true</remoteresources.skip>
+ </properties>
+
+ <licenses>
+ <license>
+ <name>CDDL-1.1</name>
+ <url>https://spdx.org/licenses/CDDL-1.1.html</url>
+ <comments>This project uses the javax.annotation API
artifact under the terms of the CDDL-1.1 license.</comments>
+ </license>
+ </licenses>
<build>
<plugins>
<plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+
<addDefaultImplementationEntries>false</addDefaultImplementationEntries>
+
<addDefaultSpecificationEntries>false</addDefaultSpecificationEntries>
+ </manifest>
+ </archive>
+ </configuration>
</plugin>
+
<plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>3.0.1</version><!--$NO-MVN-MAN-VER$-->
<executions>
<execution>
- <id>javadoc-jar</id>
- <phase>package</phase>
+ <id>unpack-sources</id>
+ <phase>process-sources</phase>
<goals>
- <goal>jar</goal>
+ <goal>unpack</goal>
</goals>
<configuration>
-
<includeDependencySources>true</includeDependencySources>
-
-
<dependencySourceIncludes>
-
<dependencySourceInclude>org.apache.tomcat:tomcat-el-api</dependencySourceInclude>
-
</dependencySourceIncludes>
+ <artifactItems>
+ <artifactItem>
+
<groupId>${spec.groupId}</groupId>
+
<artifactId>${spec.artifactId}</artifactId>
+
<classifier>sources</classifier>
+
<version>${spec.version}</version>
+
<overWrite>false</overWrite>
+
<outputDirectory>${project.build.directory}/sources</outputDirectory>
+
<excludes>pom.xml,META-INF/LICENSE.txt</excludes>
+ </artifactItem>
+ </artifactItems>
</configuration>
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ </plugin>
</plugins>
+
<sourceDirectory>${project.build.directory}/sources</sourceDirectory>
</build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-el-api</artifactId>
- <version>8.0.46</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
</project>
Added: aries/trunk/cdi/javax.inject-api/README
URL:
http://svn.apache.org/viewvc/aries/trunk/cdi/javax.inject-api/README?rev=1816630&view=auto
==============================================================================
--- aries/trunk/cdi/javax.inject-api/README (added)
+++ aries/trunk/cdi/javax.inject-api/README Wed Nov 29 14:54:40 2017
@@ -0,0 +1,12 @@
+
+Apache Aries Javax Inject API
+Copyright 2017 The Apache Software Foundation
+
+This product includes software originating from [1] repackaged under the
+ASL-2.0 license.
+
+The repackaging adds additional OSGi metadata following the directions
+located at [2].
+
+[1] https://jcp.org/en/jsr/detail?id=250
+[2] http://apache.org/legal/resolved.html#osgi-category-b
\ No newline at end of file
Modified: aries/trunk/cdi/javax.inject-api/bnd.bnd
URL:
http://svn.apache.org/viewvc/aries/trunk/cdi/javax.inject-api/bnd.bnd?rev=1816630&r1=1816629&r2=1816630&view=diff
==============================================================================
--- aries/trunk/cdi/javax.inject-api/bnd.bnd (original)
+++ aries/trunk/cdi/javax.inject-api/bnd.bnd Wed Nov 29 14:54:40 2017
@@ -1,9 +1,9 @@
-Export-Package: \
- javax.inject;version='1.0.0'
+Bundle-License: ASL-2.0;link="http://www.apache.org/licenses/LICENSE-2.0.txt";
Provide-Capability: \
osgi.contract; \
osgi.contract=JavaInject; \
uses:="javax.inject"; \
version:Version='1'
--includeresource: META-INF/=LICENSE, META-INF/=NOTICE
\ No newline at end of file
+-includeresource: META-INF/README=README
+-exportcontents: javax.inject.*;version='1.0.0'
Modified: aries/trunk/cdi/javax.inject-api/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/cdi/javax.inject-api/pom.xml?rev=1816630&r1=1816629&r2=1816630&view=diff
==============================================================================
--- aries/trunk/cdi/javax.inject-api/pom.xml (original)
+++ aries/trunk/cdi/javax.inject-api/pom.xml Wed Nov 29 14:54:40 2017
@@ -29,45 +29,73 @@
<relativePath>..</relativePath>
</parent>
+ <groupId>org.apache.aries.spec</groupId>
<artifactId>org.apache.aries.javax.inject-api</artifactId>
- <name>Javax Inject API Bundle</name>
- <description>Javax Inject API Bundle</description>
+ <name>Apache Aries Javax Inject API</name>
+ <description>Apache Aries Javax Inject API</description>
+
+ <properties>
+ <spec.groupId>javax.inject</spec.groupId>
+ <spec.artifactId>javax.inject</spec.artifactId>
+ <spec.version>1</spec.version>
+ <remoteresources.skip>true</remoteresources.skip>
+ </properties>
+
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ </license>
+ </licenses>
<build>
<plugins>
<plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+
<addDefaultImplementationEntries>false</addDefaultImplementationEntries>
+
<addDefaultSpecificationEntries>false</addDefaultSpecificationEntries>
+ </manifest>
+ </archive>
+ </configuration>
</plugin>
+
<plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>3.0.1</version><!--$NO-MVN-MAN-VER$-->
<executions>
<execution>
- <id>javadoc-jar</id>
- <phase>package</phase>
+ <id>unpack-sources</id>
+ <phase>process-sources</phase>
<goals>
- <goal>jar</goal>
+ <goal>unpack</goal>
</goals>
<configuration>
-
<includeDependencySources>true</includeDependencySources>
-
-
<dependencySourceIncludes>
-
<dependencySourceInclude>javax.inject:javax.inject</dependencySourceInclude>
-
</dependencySourceIncludes>
+ <artifactItems>
+ <artifactItem>
+
<groupId>${spec.groupId}</groupId>
+
<artifactId>${spec.artifactId}</artifactId>
+
<classifier>sources</classifier>
+
<version>${spec.version}</version>
+
<overWrite>false</overWrite>
+
<outputDirectory>${project.build.directory}/sources</outputDirectory>
+<!--
<excludes>pom.xml,META-INF/LICENSE.txt</excludes>
+-->
+ </artifactItem>
+ </artifactItems>
</configuration>
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ </plugin>
</plugins>
+
<sourceDirectory>${project.build.directory}/sources</sourceDirectory>
</build>
-
- <dependencies>
- <dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- <version>1</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
</project>
Added: aries/trunk/cdi/javax.interceptor-api/README
URL:
http://svn.apache.org/viewvc/aries/trunk/cdi/javax.interceptor-api/README?rev=1816630&view=auto
==============================================================================
--- aries/trunk/cdi/javax.interceptor-api/README (added)
+++ aries/trunk/cdi/javax.interceptor-api/README Wed Nov 29 14:54:40 2017
@@ -0,0 +1,12 @@
+
+Apache Aries Javax Interceptor API
+Copyright 2017 The Apache Software Foundation
+
+This product includes software originating from [1] repackaged under the
+CDDL-1.1 license.
+
+The repackaging adds additional OSGi metadata following the directions
+located at [2].
+
+[1] https://jcp.org/en/jsr/detail?id=318
+[2] http://apache.org/legal/resolved.html#osgi-category-b
\ No newline at end of file
Modified: aries/trunk/cdi/javax.interceptor-api/bnd.bnd
URL:
http://svn.apache.org/viewvc/aries/trunk/cdi/javax.interceptor-api/bnd.bnd?rev=1816630&r1=1816629&r2=1816630&view=diff
==============================================================================
--- aries/trunk/cdi/javax.interceptor-api/bnd.bnd (original)
+++ aries/trunk/cdi/javax.interceptor-api/bnd.bnd Wed Nov 29 14:54:40 2017
@@ -1,8 +1,11 @@
-Export-Package: \
- javax.interceptor
+Bundle-License: CDDL-1.1;link="https://spdx.org/licenses/CDDL-1.1.html";
Provide-Capability: \
osgi.contract; \
osgi.contract=JavaInterceptor; \
uses:="javax.interceptor"; \
version:List<Version>='1.1,1.2'
--includeresource: @geronimo-interceptor_*.jar!/META-INF/LICENSE,
@geronimo-interceptor_*.jar!/META-INF/NOTICE
\ No newline at end of file
+
+-exportcontents: javax.interceptor.*;version='1.2'
+
+-includeresource: META-INF/README=README
+-removeheaders: Archiver-Version, Created-By, Built-By, Build-Jdk
Modified: aries/trunk/cdi/javax.interceptor-api/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/cdi/javax.interceptor-api/pom.xml?rev=1816630&r1=1816629&r2=1816630&view=diff
==============================================================================
--- aries/trunk/cdi/javax.interceptor-api/pom.xml (original)
+++ aries/trunk/cdi/javax.interceptor-api/pom.xml Wed Nov 29 14:54:40 2017
@@ -29,45 +29,73 @@
<relativePath>..</relativePath>
</parent>
+ <groupId>org.apache.aries.spec</groupId>
<artifactId>org.apache.aries.javax.interceptor-api</artifactId>
- <name>Javax Interceptor API Bundle</name>
- <description>Javax Interceptor API Bundle</description>
+ <name>Apache Aries Javax Interceptor API</name>
+ <description>Apache Aries Javax Interceptor API</description>
+
+ <properties>
+ <spec.groupId>javax.interceptor</spec.groupId>
+ <spec.artifactId>javax.interceptor-api</spec.artifactId>
+ <spec.version>1.2.1</spec.version>
+ <remoteresources.skip>true</remoteresources.skip>
+ </properties>
+
+ <licenses>
+ <license>
+ <name>CDDL-1.1</name>
+ <url>https://spdx.org/licenses/CDDL-1.1.html</url>
+ <comments>This project uses the javax.interceptor API
artifact under the terms of the CDDL-1.1 license.</comments>
+ </license>
+ </licenses>
<build>
<plugins>
<plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+
<addDefaultImplementationEntries>false</addDefaultImplementationEntries>
+
<addDefaultSpecificationEntries>false</addDefaultSpecificationEntries>
+ </manifest>
+ </archive>
+ </configuration>
</plugin>
+
<plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>3.0.1</version><!--$NO-MVN-MAN-VER$-->
<executions>
<execution>
- <id>javadoc-jar</id>
- <phase>package</phase>
+ <id>unpack-sources</id>
+ <phase>process-sources</phase>
<goals>
- <goal>jar</goal>
+ <goal>unpack</goal>
</goals>
<configuration>
-
<includeDependencySources>true</includeDependencySources>
-
-
<dependencySourceIncludes>
-
<dependencySourceInclude>org.apache.geronimo.specs:geronimo-interceptor_1.2_spec</dependencySourceInclude>
-
</dependencySourceIncludes>
+ <artifactItems>
+ <artifactItem>
+
<groupId>${spec.groupId}</groupId>
+
<artifactId>${spec.artifactId}</artifactId>
+
<classifier>sources</classifier>
+
<version>${spec.version}</version>
+
<overWrite>false</overWrite>
+
<outputDirectory>${project.build.directory}/sources</outputDirectory>
+
<excludes>pom.xml,META-INF/LICENSE.txt</excludes>
+ </artifactItem>
+ </artifactItems>
</configuration>
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ </plugin>
</plugins>
+
<sourceDirectory>${project.build.directory}/sources</sourceDirectory>
</build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_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=1816630&r1=1816629&r2=1816630&view=diff
==============================================================================
--- aries/trunk/cdi/pom.xml (original)
+++ aries/trunk/cdi/pom.xml Wed Nov 29 14:54:40 2017
@@ -153,35 +153,10 @@
<configuration>
<source>1.8</source>
<target>1.8</target>
- <encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.7</version>
- </plugin>
- <plugin>
-
<groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-gpg-plugin</artifactId>
- <version>1.4</version>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
-
<goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
-
<groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-install-plugin</artifactId>
- <version>2.5.2</version>
- </plugin>
- <plugin>
-
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.1</version>
<configuration>
@@ -190,49 +165,6 @@
</archive>
</configuration>
</plugin>
- <plugin>
-
<groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10.3</version>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
-
<groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-release-plugin</artifactId>
- <version>2.5.1</version>
- <configuration>
-
<autoVersionSubmodules>true</autoVersionSubmodules>
- <pushChanges>false</pushChanges>
-
<localCheckout>true</localCheckout>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.scm</groupId>
-
<artifactId>maven-scm-providers-git</artifactId>
- <version>(,1.4]</version>
- </plugin>
- <plugin>
-
<groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- <plugin>
-
<groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>${surefire.version}</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
-
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
- </plugin>
</plugins>
</pluginManagement>
</build>
