This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 2288ddf CXF-7889: ensure all samples from CXF kit can work with JDK11
OOTB. Fixing most of jax-rs/minimal_osgi
2288ddf is described below
commit 2288ddf9f17f674f1406d0772f738ca37835361e
Author: reta <[email protected]>
AuthorDate: Wed Dec 26 22:19:08 2018 -0500
CXF-7889: ensure all samples from CXF kit can work with JDK11 OOTB. Fixing
most of jax-rs/minimal_osgi
---
.../release/samples/jax_rs/minimal_osgi/README.txt | 38 +------
.../release/samples/jax_rs/minimal_osgi/pom.xml | 117 +++++++--------------
.../jax_rs/minimal_osgi/src/main/config/config.ini | 7 +-
3 files changed, 42 insertions(+), 120 deletions(-)
diff --git
a/distribution/src/main/release/samples/jax_rs/minimal_osgi/README.txt
b/distribution/src/main/release/samples/jax_rs/minimal_osgi/README.txt
index 6712013..9d1b625 100644
--- a/distribution/src/main/release/samples/jax_rs/minimal_osgi/README.txt
+++ b/distribution/src/main/release/samples/jax_rs/minimal_osgi/README.txt
@@ -24,7 +24,7 @@ Pre-requisites
To take advantage of this sample, you should have a working knowledge of the
following:
-JSR-311 JAX-RS
+JSR-370 JAX-RS
* Maven
* OSGI
* Servlet
@@ -34,7 +34,7 @@ Sample walkthrough
Code walkthrough
-Let's start off with a basic JSR-311 JAX-RS application that you would like to
deploy in an OSGI environment:
+Let's start off with a basic JSR-370 JAX-RS application that you would like to
deploy in an OSGI environment:
* SampleResource
* SampleApplication
@@ -76,7 +76,7 @@ If you want to run it manually, do the following
1) mvn package
2) cd
target/deliver/jax_rs_minimal_osgi-<version>-equinox/jax_rs_minimal_osgi-<version>/
- 3) java -jar org.eclipse.osgi-3.6.2.R36x_v20110210.jar
+ 3) java -jar org.eclipse.osgi-3.13.0.v20180226-1711.jar
If all goes well, the Eclipse Equinox environment will start up and File
Install will install all the necessary bundles.
@@ -84,35 +84,3 @@ If you visit the following URL in your favorite browser on
the machine, you shou
http://localhost:8080/
-Bundles
--------
-
-If you're using Java 6, here is a listing of the bundles that are running
inside Eclipse Equinox to make this example run successfully:
-
-id State Bundle
-0 ACTIVE org.eclipse.osgi_3.6.2.R36x_v20110210 ;
OSGI system runtime
-1 ACTIVE org.apache.felix.fileinstall_3.1.10 ;
Bundle deployment system - may be removed if you have some other way to deploy
-2 ACTIVE org.codehaus.jettison.jettison_1.3.0 ;
CXF JAX-RS dependency for JSON
-3 ACTIVE org.mortbay.jetty.util_6.1.24 ;
HTTP OSGI service dependency
-4 ACTIVE org.apache.cxf.bundle-jaxrs_2.5.0.SNAPSHOT ;
CXF JAX-RS bundle
-5 ACTIVE org.apache.neethi_3.0.1 ;
CXF JAX-RS dependency
-6 ACTIVE org.eclipse.osgi.services_3.2.100.v20100503 ;
CXF JAX-RS dependency / HTTP OSGI service dependency
-7 ACTIVE org.apache.felix.http.whiteboard_2.2.0 ;
HTTP OSGI service dependency
-8 ACTIVE org.mortbay.jetty.security_6.1.24 ;
HTTP OSGI service dependency
-9 ACTIVE org.mortbay.jetty.server_6.1.24 ;
HTTP OSGI service dependency
-10 ACTIVE org.apache.felix.http.bundle_2.2.0 ;
HTTP OSGI service dependency
-11 ACTIVE org.apache.felix.http.base_2.2.0 ;
HTTP OSGI service dependency
-12 ACTIVE org.apache.servicemix.specs.jsr311-api-1.1_1.8.0 ;
CXF JAX-RS dependency
-13 ACTIVE org.apache.felix.http.bridge_2.2.0 ;
HTTP OSGI service dependency
-14 ACTIVE minimalosgi_0.0.0 ;
Sample application
-15 ACTIVE org.apache.felix.http.api_2.2.0 ;
HTTP OSGI service dependency
-16 ACTIVE org.apache.felix.http.jetty_2.2.0 ;
HTTP OSGI service dependency
-
-If you're using Java 5, there's a few more bundles that are added to make
things run successfully
-
-id State Bundle
-17 ACTIVE
org.apache.geronimo.specs.geronimo-activation_1.1_spec_1.1.0 ; CXF JAX-RS
dependency
-18 ACTIVE org.apache.servicemix.specs.stax-api-1.0_1.9.0
; CXF JAX-RS dependency
-19 ACTIVE org.apache.servicemix.specs.activation-api-1.1_1.9.0
; CXF JAX-RS dependency
-20 ACTIVE org.apache.servicemix.specs.jaxb-api-2.2_1.9.0
; CXF JAX-RS dependency
-21 ACTIVE
org.apache.geronimo.specs.geronimo-annotation_1.0_spec_1.1.1 ; CXF JAX-RS
dependency
diff --git a/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
b/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
index 6ce6b03..9276910 100644
--- a/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/minimal_osgi/pom.xml
@@ -30,42 +30,37 @@
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <equinox.version>3.7.0.v20110613</equinox.version>
+ <equinox.version>3.13.0.v20180226-1711</equinox.version>
</properties>
<dependencies>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.enterprise</artifactId>
- <version>4.2.0</version>
- </dependency>
- <dependency>
<groupId>org.eclipse.tycho</groupId>
<artifactId>org.eclipse.osgi</artifactId>
<version>${equinox.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.osgi</groupId>
- <artifactId>org.eclipse.osgi.services</artifactId>
- <version>3.2.100.v20100503</version>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.fileinstall</artifactId>
- <version>3.1.10</version>
+ <version>3.6.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.cm</artifactId>
+ <version>1.6.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <version>1.4.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.bundle</artifactId>
- <version>2.2.0</version>
+ <version>3.0.0</version>
<scope>compile</scope>
<!-- using compile instead of test so we don't need to import
geronimo-servlet_3.0_spec -->
<exclusions>
@@ -77,12 +72,26 @@
<groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.cometd</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jsr339-api-2.0</artifactId>
- <version>2.4.0</version>
+ <artifactId>org.apache.servicemix.specs.jaxrs-api-2.1</artifactId>
+ <version>2.9.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jaxws-api-2.2</artifactId>
+ <version>2.9.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.woodstox</groupId>
+ <artifactId>woodstox-core</artifactId>
+ <version>5.0.3</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -109,7 +118,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.3.1</version>
+ <version>3.1.1</version>
<configuration>
<archive>
<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
@@ -118,15 +127,8 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.20</version>
- <configuration>
- <skipTests>true</skipTests>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
+ <version>3.1.1</version>
<executions>
<execution>
<id>copy-dependencies</id>
@@ -137,8 +139,7 @@
<configuration>
<outputDirectory>${project.build.directory}/dependencies</outputDirectory>
<excludeScope>provided</excludeScope>
- <excludeGroupIds>org.slf4j</excludeGroupIds>
-
<excludeArtifactIds>geronimo-servlet_2.5_spec,org.eclipse.osgi,org.osgi.foundation</excludeArtifactIds>
+
<excludeArtifactIds>geronimo-servlet_2.5_spec,activation,org.eclipse.osgi,org.osgi.foundation,jaxws-api</excludeArtifactIds>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>false</overWriteSnapshots>
<overWriteIfNewer>true</overWriteIfNewer>
@@ -149,7 +150,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2.1</version>
+ <version>3.1.0</version>
<configuration>
<descriptors>
<descriptor>src/main/assembly/descriptor.xml</descriptor>
@@ -170,6 +171,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
+ <version>1.6.0</version>
<executions>
<execution>
<goals>
@@ -180,10 +182,6 @@
<configuration>
<executable>java</executable>
<arguments>
- <!--
- <argument>-Xdebug</argument>
-
<argument>-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</argument>
- -->
<argument>-jar</argument>
<argument>org.eclipse.osgi-${equinox.version}.jar</argument>
<argument>-console</argument>
@@ -192,48 +190,5 @@
</configuration>
</plugin>
</plugins>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e
settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.apache.maven.plugins
- </groupId>
- <artifactId>
- maven-dependency-plugin
- </artifactId>
- <versionRange>[2.2,)</versionRange>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
- <repositories>
- <repository>
- <id>apache-snapshots</id>
- <name>Apache SNAPSHOT Repository</name>
- <url>http://repository.apache.org/snapshots</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
</project>
diff --git
a/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/config/config.ini
b/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/config/config.ini
index 5f1989d..c5b0bc0 100644
---
a/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/config/config.ini
+++
b/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/config/config.ini
@@ -5,9 +5,9 @@
# 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
@@ -16,7 +16,6 @@
# under the License.
# http://wiki.restlet.org/docs_2.0/13-restlet/24-restlet/238-restlet.html
-osgi.bundles=org.apache.felix.fileinstall-3.1.10.jar@start
+osgi.bundles=./org.apache.felix.fileinstall-3.6.4.jar@start,./org.osgi.service.cm-1.6.0.jar@start,./org.osgi.service.event-1.4.0.jar@start
osgi.clean=true
eclipse.ignoreApp=true
-
