Repository: aries-jax-rs-whiteboard Updated Branches: refs/heads/master ad5e86177 -> aec6ebe6d
update to jaxrs 2.1 API Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/8f4e18e8 Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/8f4e18e8 Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/8f4e18e8 Branch: refs/heads/master Commit: 8f4e18e8e7249a64535eb25ea6c8a51ae7f9b3f6 Parents: ad5e861 Author: Raymond Auge <[email protected]> Authored: Tue Nov 28 13:42:25 2017 -0500 Committer: Raymond Auge <[email protected]> Committed: Tue Nov 28 13:42:25 2017 -0500 ---------------------------------------------------------------------- javax-ws-rs/2_0/bnd.bnd | 13 ------- javax-ws-rs/2_0/pom.xml | 75 ---------------------------------------- javax-ws-rs/README | 12 +++++++ javax-ws-rs/bnd.bnd | 14 ++++++++ javax-ws-rs/pom.xml | 82 +++++++++++++++++++++++++++++++++++++------- pom.xml | 8 ----- 6 files changed, 96 insertions(+), 108 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/8f4e18e8/javax-ws-rs/2_0/bnd.bnd ---------------------------------------------------------------------- diff --git a/javax-ws-rs/2_0/bnd.bnd b/javax-ws-rs/2_0/bnd.bnd deleted file mode 100644 index 2c8f923..0000000 --- a/javax-ws-rs/2_0/bnd.bnd +++ /dev/null @@ -1,13 +0,0 @@ -# Keep -include instruction first because order matters --include: ~jar:file:${.}/target/lib/jaxrs-api.jar!/META-INF/MANIFEST.MF - -Bundle-SymbolicName: ${project.artifactId} -Bundle-Version: ${project.version} -Provide-Capability:\ - osgi.contract;\ - osgi.contract=JavaJAXRS;\ - uses:="javax.ws.rs,javax.ws.rs.client,javax.ws.rs.container,javax.ws.rs.core,javax.ws.rs.ext";\ - version:List<Version>="2,1.1" - --includeresource:\ - @${.}/target/lib/jaxrs-api.jar!/!META-INF/maven/(javax.ws.rs|org.apache.servicemix.specs)/* \ No newline at end of file http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/8f4e18e8/javax-ws-rs/2_0/pom.xml ---------------------------------------------------------------------- diff --git a/javax-ws-rs/2_0/pom.xml b/javax-ws-rs/2_0/pom.xml deleted file mode 100644 index d590bfc..0000000 --- a/javax-ws-rs/2_0/pom.xml +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.apache.aries.jax.rs</groupId> - <artifactId>org.apache.aries.jax.javax.ws.rs.parent</artifactId> - <version>0.0.1-SNAPSHOT</version> - </parent> - - <artifactId>org.apache.aries.jax.rs.jaxrs.api</artifactId> - <name>Apache Aries JAX-RS Specification 2.0 API</name> - - <dependencies> - <dependency> - <groupId>org.apache.servicemix.specs</groupId> - <artifactId>org.apache.servicemix.specs.jsr339-api-2.0.1</artifactId> - <version>2.9.0</version> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>3.0.1</version> - <executions> - <execution> - <id>copy</id> - <phase>process-classes</phase> - <goals> - <goal>copy</goal> - </goals> - </execution> - </executions> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.apache.servicemix.specs</groupId> - <artifactId>org.apache.servicemix.specs.jsr339-api-2.0.1</artifactId> - <overWrite>false</overWrite> - <destFileName>jaxrs-api.jar</destFileName> - </artifactItem> - </artifactItems> - <outputDirectory>${project.build.directory}/lib</outputDirectory> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>true</overWriteSnapshots> - </configuration> - </plugin> - <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-maven-plugin</artifactId> - </plugin> - </plugins> - </build> -</project> http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/8f4e18e8/javax-ws-rs/README ---------------------------------------------------------------------- diff --git a/javax-ws-rs/README b/javax-ws-rs/README new file mode 100644 index 0000000..646a59e --- /dev/null +++ b/javax-ws-rs/README @@ -0,0 +1,12 @@ + +Apache Aries JAX-RS Specification 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=370 +[2] http://apache.org/legal/resolved.html#osgi-category-b \ No newline at end of file http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/8f4e18e8/javax-ws-rs/bnd.bnd ---------------------------------------------------------------------- diff --git a/javax-ws-rs/bnd.bnd b/javax-ws-rs/bnd.bnd new file mode 100644 index 0000000..73646be --- /dev/null +++ b/javax-ws-rs/bnd.bnd @@ -0,0 +1,14 @@ +# Keep -include instruction first because order matters +-include: ${.}/target/sources/META-INF/MANIFEST.MF + +Bundle-License: CDDL-1.1;link="https://spdx.org/licenses/CDDL-1.1.html"; +Provide-Capability:\ + osgi.contract;\ + osgi.contract=JavaJAXRS;\ + uses:="javax.ws.rs,javax.ws.rs.client,javax.ws.rs.container,javax.ws.rs.core,javax.ws.rs.ext,javax.ws.rs.sse";\ + version:List<Version>="2.1,2,1.1" + +-exportcontents: javax.ws.rs.*;version='2.1' + +-includeresource: META-INF/README=README +-removeheaders: Archiver-Version, Created-By, Built-By, Build-Jdk http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/8f4e18e8/javax-ws-rs/pom.xml ---------------------------------------------------------------------- diff --git a/javax-ws-rs/pom.xml b/javax-ws-rs/pom.xml index e06f63a..bacccf1 100644 --- a/javax-ws-rs/pom.xml +++ b/javax-ws-rs/pom.xml @@ -17,26 +17,84 @@ specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> - <artifactId>org.apache.aries.jax.javax.ws.rs.parent</artifactId> - <name>Apache Aries JAX-RS Specification API</name> - <packaging>pom</packaging> - <parent> - <groupId>org.apache.aries.jax.rs</groupId> + <groupId>org.apache.aries.jax.rs</groupId> <artifactId>org.apache.aries.jax.rs</artifactId> <version>0.0.1-SNAPSHOT</version> + <relativePath /> </parent> - + + <groupId>org.apache.aries.spec</groupId> + <artifactId>org.apache.aries.javax.jax.rs-api</artifactId> + <name>Apache Aries JAX-RS Specification API</name> + <version>0.0.1-SNAPSHOT</version> + <properties> - <baseline.skip>true</baseline.skip> + <spec.groupId>javax.ws.rs</spec.groupId> + <spec.artifactId>javax.ws.rs-api</spec.artifactId> + <spec.version>2.1</spec.version> + <remoteresources.skip>true</remoteresources.skip> </properties> - <modules> - <module>2_0</module> - </modules> -</project> + <licenses> + <license> + <name>CDDL-1.1</name> + <url>https://spdx.org/licenses/CDDL-1.1.html</url> + <comments>This project uses the javax.ws.rs 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> + <executions> + <execution> + <id>unpack-sources</id> + <phase>process-sources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <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>module-info.java</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> +</project> http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/8f4e18e8/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 3783df3..3c760ec 100644 --- a/pom.xml +++ b/pom.xml @@ -240,14 +240,6 @@ </plugins> </reporting> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.12</version> - </dependency> - </dependencies> - <repositories> <repository> <id>apache snapshots</id>
