You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ro...@apache.org on 2017/11/28 18:56:02 UTC
[2/3] aries-jax-rs-whiteboard git commit: rename directory
rename directory
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/7eb883d2
Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/7eb883d2
Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/7eb883d2
Branch: refs/heads/master
Commit: 7eb883d20844d33e07e4edd39227952079ae109f
Parents: 8f4e18e
Author: Raymond Auge <ro...@apache.org>
Authored: Tue Nov 28 13:44:31 2017 -0500
Committer: Raymond Auge <ro...@apache.org>
Committed: Tue Nov 28 13:44:31 2017 -0500
----------------------------------------------------------------------
javax-ws-rs/README | 12 -----
javax-ws-rs/bnd.bnd | 14 ------
javax-ws-rs/pom.xml | 100 ------------------------------------------
javax.jax.rs-api/README | 12 +++++
javax.jax.rs-api/bnd.bnd | 14 ++++++
javax.jax.rs-api/pom.xml | 100 ++++++++++++++++++++++++++++++++++++++++++
pom.xml | 2 +-
7 files changed, 127 insertions(+), 127 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/7eb883d2/javax-ws-rs/README
----------------------------------------------------------------------
diff --git a/javax-ws-rs/README b/javax-ws-rs/README
deleted file mode 100644
index 646a59e..0000000
--- a/javax-ws-rs/README
+++ /dev/null
@@ -1,12 +0,0 @@
-
-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/7eb883d2/javax-ws-rs/bnd.bnd
----------------------------------------------------------------------
diff --git a/javax-ws-rs/bnd.bnd b/javax-ws-rs/bnd.bnd
deleted file mode 100644
index 73646be..0000000
--- a/javax-ws-rs/bnd.bnd
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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/7eb883d2/javax-ws-rs/pom.xml
----------------------------------------------------------------------
diff --git a/javax-ws-rs/pom.xml b/javax-ws-rs/pom.xml
deleted file mode 100644
index bacccf1..0000000
--- a/javax-ws-rs/pom.xml
+++ /dev/null
@@ -1,100 +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.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>
- <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>
-
- <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/7eb883d2/javax.jax.rs-api/README
----------------------------------------------------------------------
diff --git a/javax.jax.rs-api/README b/javax.jax.rs-api/README
new file mode 100644
index 0000000..646a59e
--- /dev/null
+++ b/javax.jax.rs-api/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/7eb883d2/javax.jax.rs-api/bnd.bnd
----------------------------------------------------------------------
diff --git a/javax.jax.rs-api/bnd.bnd b/javax.jax.rs-api/bnd.bnd
new file mode 100644
index 0000000..73646be
--- /dev/null
+++ b/javax.jax.rs-api/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/7eb883d2/javax.jax.rs-api/pom.xml
----------------------------------------------------------------------
diff --git a/javax.jax.rs-api/pom.xml b/javax.jax.rs-api/pom.xml
new file mode 100644
index 0000000..bacccf1
--- /dev/null
+++ b/javax.jax.rs-api/pom.xml
@@ -0,0 +1,100 @@
+<?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.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>
+ <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>
+
+ <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/7eb883d2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3c760ec..3f8b399 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
</scm>
<modules>
- <module>javax-ws-rs</module>
+ <module>javax.jax.rs-api</module>
<module>jax-rs.whiteboard</module>
<module>jax-rs.itests</module>
<module>jax-rs.example</module>