Skip to content

Commit

Permalink
Fix for Jersey client missing javax.inject and version 1.14.6
Browse files Browse the repository at this point in the history
  • Loading branch information
scottslewis committed Feb 12, 2022
1 parent bea96ce commit 060f1ce
Show file tree
Hide file tree
Showing 55 changed files with 70 additions and 69 deletions.
Binary file not shown.
Binary file modified build/artifacts.jar
Binary file not shown.
Binary file modified build/content.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
102 changes: 51 additions & 51 deletions build/karaf-features.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
name="ecf-remoteservices-jaxrs-1.14.5">
name="ecf-remoteservices-jaxrs-1.14.6">

<repository>https://repo1.maven.org/maven2/org/apache/cxf/karaf/apache-cxf/3.3.4/apache-cxf-3.3.4-features.xml</repository>

<repository>http://download.eclipse.org/rt/ecf/RELEASE/site.p2/karaf-features.xml</repository>

<feature name="ecf-rs-distribution-jaxrs" version="1.14.5"
<feature name="ecf-rs-distribution-jaxrs" version="1.14.6"
description="ECF JaxRS Distribution Provider Support. See https://github.com/ECF/JaxRSProviders">
<feature>ecf-rs-rsa</feature>
<feature>ecf-rs-console</feature>
Expand All @@ -23,30 +23,30 @@
</bundle>
<bundle>https://raw.githubusercontent.com/ECF/JaxRSProviders/master/build/plugins/com.fasterxml.jackson.module.jackson-module-jaxb-annotations_2.10.1.jar
</bundle>
<bundle>https://raw.githubusercontent.com/ECF/JaxRSProviders/master/build/plugins/org.eclipse.ecf.provider.jaxrs_1.7.1.202202072129.jar
<bundle>https://raw.githubusercontent.com/ECF/JaxRSProviders/master/build/plugins/org.eclipse.ecf.provider.jaxrs_1.7.1.202202112253.jar
</bundle>
<bundle>https://raw.githubusercontent.com/ECF/JaxRSProviders/master/build/plugins/jakarta.xml.bind-api_2.3.2.jar
</bundle>
</feature>

<feature name="ecf-rs-distribution-jaxrs-server"
version="1.14.5"
version="1.14.6"
description="ECF JaxRS Distribution Provider Server Support. See https://github.com/ECF/JaxRSProviders">
<feature>http</feature>
<feature version="1.14.5">ecf-rs-distribution-jaxrs</feature>
<bundle>https://raw.githubusercontent.com/ECF/JaxRSProviders/master/build/plugins/org.eclipse.ecf.provider.jaxrs.server_1.11.1.202202072129.jar
<feature version="1.14.6">ecf-rs-distribution-jaxrs</feature>
<bundle>https://raw.githubusercontent.com/ECF/JaxRSProviders/master/build/plugins/org.eclipse.ecf.provider.jaxrs.server_1.11.1.202202112253.jar
</bundle>
</feature>

<feature name="ecf-rs-distribution-jaxrs-client"
version="1.14.5"
version="1.14.6"
description="ECF JaxRS Distribution Provider Client Support. See https://github.com/ECF/JaxRSProviders">
<feature version="1.14.5">ecf-rs-distribution-jaxrs</feature>
<bundle>https://raw.githubusercontent.com/ECF/JaxRSProviders/master/build/plugins/org.eclipse.ecf.provider.jaxrs.client_1.8.1.202202072129.jar
<feature version="1.14.6">ecf-rs-distribution-jaxrs</feature>
<bundle>https://raw.githubusercontent.com/ECF/JaxRSProviders/master/build/plugins/org.eclipse.ecf.provider.jaxrs.client_1.8.1.202202112253.jar
</bundle>
</feature>

<feature name="ecf-rs-jersey-deps" version="1.14.5"
<feature name="ecf-rs-jersey-deps" version="1.14.6"
description="ECF JaxRS Jersey Dependencies">
<bundle>https://raw.githubusercontent.com/ECF/JaxRSProviders/master/build/plugins/com.sun.activation.javax.activation_1.2.0.jar
</bundle>
Expand Down Expand Up @@ -98,113 +98,113 @@
</feature>

<feature name="ecf-rs-distribution-jersey-server"
version="1.14.5"
version="1.14.6"
description="ECF Jersey Server Distribution Provider. See https://github.com/ECF/JaxRSProviders">
<feature version="1.14.5">ecf-rs-distribution-jaxrs-server</feature>
<feature version="1.14.5">ecf-rs-jersey-deps</feature>
<feature version="1.14.6">ecf-rs-distribution-jaxrs-server</feature>
<feature version="1.14.6">ecf-rs-jersey-deps</feature>
<feature>ecf-rs-discovery-jmdns</feature>
<bundle>https://raw.githubusercontent.com/ECF/JaxRSProviders/master/build/plugins/org.glassfish.jersey.containers.jersey-container-servlet_2.30.1.jar
</bundle>
<bundle>https://raw.githubusercontent.com/ECF/JaxRSProviders/master/build/plugins/org.glassfish.jersey.containers.jersey-container-servlet-core_2.30.1.jar
</bundle>
<bundle>https://raw.githubusercontent.com/ECF/JaxRSProviders/master/build/plugins/org.eclipse.ecf.provider.jersey.server_1.11.1.202202072129.jar
<bundle>https://raw.githubusercontent.com/ECF/JaxRSProviders/master/build/plugins/org.eclipse.ecf.provider.jersey.server_1.11.1.202202112253.jar
</bundle>
</feature>

<feature name="ecf-rs-distribution-jersey-server-basicauth-ext"
version="1.14.5"
version="1.14.6"
description="ECF Jersey Server Basic Auth Extension Example. See https://github.com/ECF/JaxRSProviders">
<feature version="1.14.5">ecf-rs-distribution-jersey-server</feature>
<bundle start-level="50">https://raw.githubusercontent.com/ECF/JaxRSProviders/master/build/plugins/org.eclipse.ecf.example.jersey.server.basicauth_1.0.2.202202072129.jar
<feature version="1.14.6">ecf-rs-distribution-jersey-server</feature>
<bundle start-level="50">https://raw.githubusercontent.com/ECF/JaxRSProviders/master/build/plugins/org.eclipse.ecf.example.jersey.server.basicauth_1.0.2.202202112253.jar
</bundle>
</feature>

<feature name="ecf-rs-distribution-jersey-client-basicauth-ext"
version="1.14.5"
version="1.14.6"
description="ECF Jersey Client Distribution Provider Basic Auth Extension Example. See https://github.com/ECF/JaxRSProviders">
<feature version="1.14.5">ecf-rs-distribution-jersey-client</feature>
<bundle start-level="50">https://raw.githubusercontent.com/ECF/JaxRSProviders/master/build/plugins/org.eclipse.ecf.example.jersey.client.basicauth_1.0.1.202202072129.jar
<feature version="1.14.6">ecf-rs-distribution-jersey-client</feature>
<bundle start-level="50">https://raw.githubusercontent.com/ECF/JaxRSProviders/master/build/plugins/org.eclipse.ecf.example.jersey.client.basicauth_1.0.1.202202112253.jar
</bundle>
</feature>

<feature name="ecf-rs-distribution-cxf-server" version="1.14.5"
<feature name="ecf-rs-distribution-cxf-server" version="1.14.6"
description="ECF CXF Server Distribution Provider. See https://github.com/ECF/JaxRSProviders">
<feature version="1.14.5">ecf-rs-distribution-jaxrs-server</feature>
<feature version="1.14.6">ecf-rs-distribution-jaxrs-server</feature>
<feature>ecf-rs-discovery-jmdns</feature>
<feature>cxf-jaxrs</feature>
<bundle>https://raw.githubusercontent.com/ECF/JaxRSProviders/master/build/plugins/org.eclipse.ecf.provider.cxf.server_1.8.2.202202072129.jar
<bundle>https://raw.githubusercontent.com/ECF/JaxRSProviders/master/build/plugins/org.eclipse.ecf.provider.cxf.server_1.8.2.202202112253.jar
</bundle>
</feature>

<feature name="ecf-rs-distribution-jersey-client"
version="1.14.5"
version="1.14.6"
description="ECF Jersey Client Distribution Provider. See https://github.com/ECF/JaxRSProviders">
<feature version="1.14.5">ecf-rs-distribution-jaxrs-client</feature>
<feature version="1.14.5">ecf-rs-jersey-deps</feature>
<bundle>https://raw.githubusercontent.com/ECF/JaxRSProviders/master/build/plugins/org.eclipse.ecf.provider.jersey.client_1.8.1.202202072129.jar
<feature version="1.14.6">ecf-rs-distribution-jaxrs-client</feature>
<feature version="1.14.6">ecf-rs-jersey-deps</feature>
<bundle>https://raw.githubusercontent.com/ECF/JaxRSProviders/master/build/plugins/org.eclipse.ecf.provider.jersey.client_1.8.2.202202112253.jar
</bundle>
</feature>

<feature name="ecf-rs-distribution-jersey" version="1.14.5"
<feature name="ecf-rs-distribution-jersey" version="1.14.6"
description="ECF Jersey Server and Client Distribution Provider. See https://github.com/ECF/JaxRSProviders">
<feature version="1.14.5">ecf-rs-distribution-jersey-server</feature>
<feature version="1.14.5">ecf-rs-distribution-jersey-client</feature>
<feature version="1.14.6">ecf-rs-distribution-jersey-server</feature>
<feature version="1.14.6">ecf-rs-distribution-jersey-client</feature>
</feature>

<feature name="ecf-rs-distribution-cxf-client" version="1.14.5"
<feature name="ecf-rs-distribution-cxf-client" version="1.14.6"
description="ECF CXF Client Distribution Provider. See https://github.com/ECF/JaxRSProviders">
<feature>ecf-rs-rsa</feature>
<feature>ecf-rs-console</feature>
<feature>ecf-rs-discovery-jmdns</feature>
<feature>cxf-jaxrs</feature>
<bundle>https://raw.githubusercontent.com/ECF/JaxRSProviders/master/build/plugins/org.eclipse.ecf.provider.jaxrs_1.7.1.202202072129.jar
<bundle>https://raw.githubusercontent.com/ECF/JaxRSProviders/master/build/plugins/org.eclipse.ecf.provider.jaxrs_1.7.1.202202112253.jar
</bundle>
<bundle>https://raw.githubusercontent.com/ECF/JaxRSProviders/master/build/plugins/org.eclipse.ecf.provider.jaxrs.client_1.8.1.202202072129.jar
<bundle>https://raw.githubusercontent.com/ECF/JaxRSProviders/master/build/plugins/org.eclipse.ecf.provider.jaxrs.client_1.8.1.202202112253.jar
</bundle>
<feature version="1.14.5">ecf-rs-distribution-jaxrs-client</feature>
<bundle>https://raw.githubusercontent.com/ECF/JaxRSProviders/master/build/plugins/org.eclipse.ecf.provider.cxf.client_1.5.0.202202072129.jar
<feature version="1.14.6">ecf-rs-distribution-jaxrs-client</feature>
<bundle>https://raw.githubusercontent.com/ECF/JaxRSProviders/master/build/plugins/org.eclipse.ecf.provider.cxf.client_1.5.0.202202112253.jar
</bundle>
</feature>

<feature name="ecf-rs-distribution-cxf" version="1.14.5"
<feature name="ecf-rs-distribution-cxf" version="1.14.6"
description="ECF CXF Server and Client Distribution Provider. See https://github.com/ECF/JaxRSProviders">
<feature version="1.14.5">ecf-rs-distribution-cxf-server</feature>
<feature version="1.14.5">ecf-rs-distribution-cxf-client</feature>
<feature version="1.14.6">ecf-rs-distribution-cxf-server</feature>
<feature version="1.14.6">ecf-rs-distribution-cxf-client</feature>
</feature>

<feature name="ecf-rs-examples-jaxrs-student" version="1.14.5"
<feature name="ecf-rs-examples-jaxrs-student" version="1.14.6"
description="ECF JaxRS Student Example Service API. See https://github.com/ECF/JaxRSProviders">
<bundle>https://raw.githubusercontent.com/ECF/JaxRSProviders/master/build/plugins/com.mycorp.examples.student_2.0.0.202202072129.jar
<bundle>https://raw.githubusercontent.com/ECF/JaxRSProviders/master/build/plugins/com.mycorp.examples.student_2.0.0.202202112253.jar
</bundle>
</feature>

<feature name="ecf-rs-examples-jaxrs-spacex-launch" version="1.14.5"
<feature name="ecf-rs-examples-jaxrs-spacex-launch" version="1.14.6"
description="ECF JaxRS SpaceX Launch Example Service API. See https://github.com/ECF/JaxRSProviders">
<bundle>https://raw.githubusercontent.com/ECF/JaxRSProviders/master/build/plugins/org.eclipse.ecf.example.spacex.launch.api_1.1.0.202202072129.jar
<bundle>https://raw.githubusercontent.com/ECF/JaxRSProviders/master/build/plugins/org.eclipse.ecf.example.spacex.launch.api_1.1.0.202202112253.jar
</bundle>
</feature>

<feature name="ecf-rs-examples-jaxrs-student-host"
version="1.14.5"
version="1.14.6"
description="ECF JaxRS Student Example Service Host. See https://github.com/ECF/JaxRSProviders">
<feature version="1.14.5">ecf-rs-examples-jaxrs-student</feature>
<bundle>https://raw.githubusercontent.com/ECF/JaxRSProviders/master/build/plugins/com.mycorp.examples.student.remoteservice.host_2.3.1.202202072129.jar
<feature version="1.14.6">ecf-rs-examples-jaxrs-student</feature>
<bundle>https://raw.githubusercontent.com/ECF/JaxRSProviders/master/build/plugins/com.mycorp.examples.student.remoteservice.host_2.3.1.202202112253.jar
</bundle>
</feature>

<feature name="ecf-rs-examples-jaxrs-student-client"
version="1.14.5"
version="1.14.6"
description="ECF JaxRS Student Example Service Client. See https://github.com/ECF/JaxRSProviders">
<feature version="1.14.5">ecf-rs-examples-jaxrs-student</feature>
<bundle>https://raw.githubusercontent.com/ECF/JaxRSProviders/master/build/plugins/com.mycorp.examples.student.client_2.2.1.202202072129.jar
<feature version="1.14.6">ecf-rs-examples-jaxrs-student</feature>
<bundle>https://raw.githubusercontent.com/ECF/JaxRSProviders/master/build/plugins/com.mycorp.examples.student.client_2.2.1.202202112253.jar
</bundle>
</feature>

<feature name="ecf-rs-examples-jaxrs-spacex-launch-client"
version="1.14.5"
version="1.14.6"
description="ECF JaxRS Spacex Launch Example Service Client. See https://github.com/ECF/JaxRSProviders">
<feature version="1.14.5">ecf-rs-examples-jaxrs-spacex-launch</feature>
<bundle>https://raw.githubusercontent.com/ECF/JaxRSProviders/master/build/plugins/org.eclipse.ecf.example.spacex.launch.api.consumer_1.1.0.202202072129.jar
<feature version="1.14.6">ecf-rs-examples-jaxrs-spacex-launch</feature>
<bundle>https://raw.githubusercontent.com/ECF/JaxRSProviders/master/build/plugins/org.eclipse.ecf.example.spacex.launch.api.consumer_1.1.0.202202112253.jar
</bundle>
</feature>
</features>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: ECF Jersey Remote Services Client
Bundle-SymbolicName: org.eclipse.ecf.provider.jersey.client
Bundle-Version: 1.8.1.qualifier
Bundle-Version: 1.8.2.qualifier
Bundle-Vendor: Eclipse.org - ECF
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Expand All @@ -11,6 +11,7 @@ Import-Package: com.fasterxml.jackson.core;version="2.9.2",
com.fasterxml.jackson.jaxrs.base;version="2.9.2",
com.fasterxml.jackson.jaxrs.json;version="2.9.2",
javax.annotation;version="1.2",
javax.inject;version="1.0.0",
javax.ws.rs.client;version="2.0.1",
javax.ws.rs.core;version="2.0.1",
javax.ws.rs.ext;version="2.0.1",
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.ecf.provider.jersey.client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
</parent>
<artifactId>org.eclipse.ecf.provider.jersey.client</artifactId>
<packaging>eclipse-plugin</packaging>
<version>1.8.1-SNAPSHOT</version>
<version>1.8.2-SNAPSHOT</version>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.ecf.example.spacex.launch.consumer.feature"
label="ECF Spacex JAX-RS Launch Consumer Feature"
version="1.14.5.qualifier"
version="1.14.6.qualifier"
provider-name="Eclipse.org - ECF">

<description url="http://www.example.com/description">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
</parent>
<artifactId>org.eclipse.ecf.example.spacex.launch.consumer.feature</artifactId>
<packaging>eclipse-feature</packaging>
<version>1.14.5-SNAPSHOT</version>
<version>1.14.6-SNAPSHOT</version>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.ecf.provider.cxf.client.feature"
label="ECF Remote Services JAX-RS CXF Client Provider"
version="1.14.5.qualifier"
version="1.14.6.qualifier"
provider-name="Eclipse.org - ECF">

<description url="http://www.example.com/description">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
</parent>
<artifactId>org.eclipse.ecf.provider.cxf.client.feature</artifactId>
<packaging>eclipse-feature</packaging>
<version>1.14.5-SNAPSHOT</version>
<version>1.14.6-SNAPSHOT</version>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.ecf.provider.cxf.server.feature"
label="ECF Remote Services JAX-RS CXF Server Provider"
version="1.14.5.qualifier"
version="1.14.6.qualifier"
provider-name="Eclipse.org - ECF">

<description url="http://www.example.com/description">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
</parent>
<artifactId>org.eclipse.ecf.provider.cxf.server.feature</artifactId>
<packaging>eclipse-feature</packaging>
<version>1.14.5-SNAPSHOT</version>
<version>1.14.6-SNAPSHOT</version>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.ecf.provider.jaxrs.examples.student.feature"
label="ECF Remote Services JAX-RS Student Example Feature"
version="1.14.5.qualifier"
version="1.14.6.qualifier"
provider-name="Eclipse.org - ECF">

<description url="http://www.example.com/description">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
</parent>
<artifactId>org.eclipse.ecf.provider.jaxrs.examples.student.feature</artifactId>
<packaging>eclipse-feature</packaging>
<version>1.14.5-SNAPSHOT</version>
<version>1.14.6-SNAPSHOT</version>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.ecf.provider.jersey.client.basicauth.feature"
label="Jersey Client BasicAuth Feature"
version="1.14.5.qualifier"
version="1.14.6.qualifier"
provider-name="%providerName">

<description url="http://www.eclipse.org/ecf">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
</parent>
<artifactId>org.eclipse.ecf.provider.jersey.client.basicauth.feature</artifactId>
<packaging>eclipse-feature</packaging>
<version>1.14.5-SNAPSHOT</version>
<version>1.14.6-SNAPSHOT</version>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.ecf.provider.jersey.client.feature"
label="ECF Remote Services JAX-RS Jersey Client Provider"
version="1.14.5.qualifier"
version="1.14.6.qualifier"
provider-name="%providerName">

<description url="http://www.eclipse.org/ecf">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
</parent>
<artifactId>org.eclipse.ecf.provider.jersey.client.feature</artifactId>
<packaging>eclipse-feature</packaging>
<version>1.14.5-SNAPSHOT</version>
<version>1.14.6-SNAPSHOT</version>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.ecf.provider.jersey.server.basicauth.feature"
label="Jersey Server with BasicAuth Feature"
version="1.14.5.qualifier"
version="1.14.6.qualifier"
provider-name="%providerName">

<description url="http://www.eclipse.org/ecf">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
</parent>
<artifactId>org.eclipse.ecf.provider.jersey.server.basicauth.feature</artifactId>
<packaging>eclipse-feature</packaging>
<version>1.14.5-SNAPSHOT</version>
<version>1.14.6-SNAPSHOT</version>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.ecf.provider.jersey.server.feature"
label="ECF Remote Services JAX-RS Jersey Server Provider"
version="1.14.5.qualifier"
version="1.14.6.qualifier"
provider-name="%providerName">

<description url="http://www.eclipse.org/ecf">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
</parent>
<artifactId>org.eclipse.ecf.provider.jersey.server.feature</artifactId>
<packaging>eclipse-feature</packaging>
<version>1.14.5-SNAPSHOT</version>
<version>1.14.6-SNAPSHOT</version>
</project>

0 comments on commit 060f1ce

Please sign in to comment.