Skip to content
This repository has been archived by the owner on Nov 18, 2022. It is now read-only.

Commit

Permalink
Update to Jersey 2.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
hstaudacher committed Dec 30, 2013
1 parent 58fc818 commit dbb48a1
Show file tree
Hide file tree
Showing 128 changed files with 45 additions and 17 deletions.
2 changes: 1 addition & 1 deletion build/com.eclipsesource.jaxrs.build/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<classifier>${project.parent.relativePath}/../com.eclipsesource.jaxrs.connector.target/Equinox-4.4-jersey2.3.1</classifier>
<classifier>${project.parent.relativePath}/../com.eclipsesource.jaxrs.connector.target/Equinox-4.4-jersey2.5.0</classifier>
</artifact>
</target>
<environments>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?><target name="Equinox 3.8" sequenceNumber="24">
<?pde version="3.8"?><target name="Equinox 3.8" sequenceNumber="26">
<locations>
<location path="${project_loc:com.eclipsesource.jaxrs.connector.target}/eclipselink/bundles" type="Directory"/>
<location path="${project_loc:com.eclipsesource.jaxrs.connector.target}/eclipselink/source-bundles" type="Directory"/>
<location path="${project_loc:com.eclipsesource.jaxrs.connector.target}/jersey2.3.1/source-bundles" type="Directory"/>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="com.eclipsesource.osgi.additionals.feature.group" version="1.19.0.201305291433"/>
<repository location="http://hstaudacher.github.com/osgi-additionals"/>
</location>
<location path="${project_loc:com.eclipsesource.jaxrs.connector.target}/jersey2.3.1/bundles" type="Directory"/>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.sdk.feature.group" version="4.4.0.v20131212-1946"/>
<unit id="org.eclipse.equinox.compendium.sdk.feature.group" version="3.10.0.v20131126-2331"/>
<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.10.0.v20131210-2136"/>
<unit id="org.eclipse.equinox.serverside.sdk.feature.group" version="3.10.0.v20131211-1531"/>
<repository location="http://download.eclipse.org/eclipse/updates/4.4milestones"/>
</location>
<location path="${project_loc:com.eclipsesource.jaxrs.connector.target}/jersey2.5.0/bundles" type="Directory"/>
<location path="${project_loc:com.eclipsesource.jaxrs.connector.target}/jersey2.5.0/source-bundles" type="Directory"/>
</locations>
</target>
14 changes: 14 additions & 0 deletions build/com.eclipsesource.jaxrs.connector.target/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -203,4 +203,18 @@
version="0.0.0"
unpack="false"/>

<plugin
id="javassist.source"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.glassfish.hk2.external.aopalliance-repackaged.source"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

</feature>
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.
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.
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 modified build/com.eclipsesource.jaxrs.connector.target/p2/artifacts.jar
Binary file not shown.
Binary file modified build/com.eclipsesource.jaxrs.connector.target/p2/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.
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.
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.
Binary file not shown.
14 changes: 14 additions & 0 deletions build/com.eclipsesource.jaxrs.jersey.runtime.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -157,4 +157,18 @@
version="0.0.0"
unpack="false"/>

<plugin
id="org.glassfish.hk2.external.aopalliance-repackaged"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="javassist"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

</feature>
6 changes: 3 additions & 3 deletions bundles/com.eclipsesource.jaxrs.consumer/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ Import-Package: com.google.common.collect;version="[14.0.0,14.1.0)",
org.glassfish.hk2.osgiresourcelocator;version="[1.0.1,1.1.0)",
org.glassfish.hk2.utilities;version="2.1.41",
org.glassfish.hk2.utilities.cache;version="2.1.41",
org.glassfish.jersey.client;version="[2.3.0,2.4.0)",
org.glassfish.jersey.message.internal;version="[2.3.0,2.4.0)",
org.glassfish.jersey.process;version="[2.3.0,2.4.0)",
org.glassfish.jersey.client;version="[2.3.0,3.0.0)",
org.glassfish.jersey.message.internal;version="[2.3.0,3.0.0)",
org.glassfish.jersey.process;version="[2.3.0,3.0.0)",
org.jvnet.hk2.external.generator;version="[2.2.0,2.3.0)",
org.osgi.framework;version="[1.3.0,2.0.0)"
Bundle-Activator: com.eclipsesource.jaxrs.consumer.internal.Activator
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ Import-Package: javax.servlet;version="[2.3.0,4.0.0)",
javax.ws.rs;version="[2.0.0,3.0.0)",
javax.ws.rs.core;version="[2.0.0,3.0.0)",
javax.ws.rs.ext;version="[2.0.0,3.0.0)",
org.glassfish.jersey.internal;version="[2.3.0,2.4.0)",
org.glassfish.jersey.server;version="[2.3.0,2.4.0)",
org.glassfish.jersey.servlet;version="[2.3.0,2.4.0)",
org.glassfish.jersey.internal;version="[2.3.0,3.0.0)",
org.glassfish.jersey.server;version="[2.3.0,3.0.0)",
org.glassfish.jersey.servlet;version="[2.3.0,3.0.0)",
org.osgi.framework;version="[1.6.0,2.0.0)",
org.osgi.service.cm;version="[1.4.0,2.0.0)",
org.osgi.service.http;version="[1.2.0,2.0.0)",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.ignoreApp=true&#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Dorg.eclipse.rwt.clientLibraryVariant=DEBUG&#10;-Dorg.eclipse.equinox.http.jetty.log.stderr.threshold=info&#10;-Dorg.osgi.service.http.port=9090&#10;-Dorg.eclipse.equinox.http.jetty.autostart=true"/>
<stringAttribute key="pde.version" value="3.3"/>
<booleanAttribute key="show_selected_only" value="true"/>
<stringAttribute key="target_bundles" value="com.google.guava@default:default,javax.annotation-api@default:default,javax.servlet-api@default:default,javax.validation.api@default:default,javax.ws.rs-api@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.eclipse.equinox.cm@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.glassfish.hk2.api@default:default,org.glassfish.hk2.external.asm-all-repackaged@default:default,org.glassfish.hk2.external.cglib@default:default,org.glassfish.hk2.external.javax.inject@default:default,org.glassfish.hk2.locator@default:default,org.glassfish.hk2.osgi-resource-locator@default:default,org.glassfish.hk2.utils@default:default,org.glassfish.jersey.containers.jersey-container-servlet-core@default:default,org.glassfish.jersey.containers.jersey-container-servlet@default:default,org.glassfish.jersey.core.jersey-client@default:default,org.glassfish.jersey.core.jersey-common@default:default,org.glassfish.jersey.core.jersey-server@default:default"/>
<stringAttribute key="target_bundles" value="com.google.guava@default:default,javassist@default:default,javax.annotation-api@default:default,javax.servlet-api@default:default,javax.validation.api@default:default,javax.ws.rs-api@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.eclipse.equinox.cm@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.glassfish.hk2.api@default:default,org.glassfish.hk2.external.aopalliance-repackaged@default:default,org.glassfish.hk2.external.asm-all-repackaged@default:default,org.glassfish.hk2.external.cglib@default:default,org.glassfish.hk2.external.javax.inject@default:default,org.glassfish.hk2.locator@default:default,org.glassfish.hk2.osgi-resource-locator@default:default,org.glassfish.hk2.utils@default:default,org.glassfish.jersey.containers.jersey-container-servlet-core@default:default,org.glassfish.jersey.containers.jersey-container-servlet@default:default,org.glassfish.jersey.core.jersey-client@default:default,org.glassfish.jersey.core.jersey-common@default:default,org.glassfish.jersey.core.jersey-server@default:default"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
<booleanAttribute key="useDefaultConfigArea" value="true"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.ignoreApp=true&#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Dorg.osgi.service.http.port=9090&#13;&#10;-Dorg.eclipse.rwt.clientLibraryVariant=DEBUG&#10;-Dorg.eclipse.equinox.http.jetty.log.stderr.threshold=info"/>
<stringAttribute key="pde.version" value="3.3"/>
<booleanAttribute key="show_selected_only" value="true"/>
<stringAttribute key="target_bundles" value="com.google.guava*14.0.1@default:default,javax.annotation-api@default:default,javax.servlet-api@default:default,javax.validation.api@default:default,javax.ws.rs-api@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.eclipse.equinox.cm@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.http.jetty*3.0.1.v20121109-203239@default:default,org.eclipse.equinox.http.servlet*1.1.300.v20120912-130548@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util*8.1.3.v20120522@default:default,org.eclipse.jetty.util*9.0.3.v20130506@default:default,org.eclipse.osgi*3.8.2.v20130124-134944@-1:true,org.eclipse.osgi.services@default:default,org.glassfish.hk2.api@default:default,org.glassfish.hk2.external.asm-all-repackaged@default:default,org.glassfish.hk2.external.cglib@default:default,org.glassfish.hk2.external.javax.inject@default:default,org.glassfish.hk2.locator@default:default,org.glassfish.hk2.osgi-resource-locator@default:default,org.glassfish.hk2.utils@default:default,org.glassfish.jersey.containers.jersey-container-servlet-core@default:default,org.glassfish.jersey.core.jersey-client@default:default,org.glassfish.jersey.core.jersey-common@default:default,org.glassfish.jersey.core.jersey-server@default:default"/>
<stringAttribute key="target_bundles" value="com.google.guava@default:default,javassist@default:default,javax.annotation-api@default:default,javax.servlet-api@default:default,javax.validation.api@default:default,javax.ws.rs-api@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.eclipse.equinox.cm@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.glassfish.hk2.api@default:default,org.glassfish.hk2.external.aopalliance-repackaged@default:default,org.glassfish.hk2.external.asm-all-repackaged@default:default,org.glassfish.hk2.external.cglib@default:default,org.glassfish.hk2.external.javax.inject@default:default,org.glassfish.hk2.locator@default:default,org.glassfish.hk2.osgi-resource-locator@default:default,org.glassfish.hk2.utils@default:default,org.glassfish.jersey.containers.jersey-container-servlet-core@default:default,org.glassfish.jersey.core.jersey-client@default:default,org.glassfish.jersey.core.jersey-common@default:default,org.glassfish.jersey.core.jersey-server@default:default"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
<booleanAttribute key="useDefaultConfigArea" value="true"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.ignoreApp=true&#13;&#10;-Dosgi.noShutdown=true"/>
<stringAttribute key="pde.version" value="3.3"/>
<booleanAttribute key="show_selected_only" value="true"/>
<stringAttribute key="target_bundles" value="com.google.guava*14.0.1@default:default,javax.annotation-api@default:default,javax.ws.rs-api@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds*1.4.1.v20120926-201320@1:true,org.eclipse.equinox.util*1.0.400.v20120522-2049@default:default,org.eclipse.equinox.util*1.0.400.v20120917-192807@default:default,org.eclipse.osgi*3.8.2.v20130124-134944@-1:true,org.eclipse.osgi.services@default:default,org.glassfish.hk2.api@default:default,org.glassfish.hk2.external.asm-all-repackaged@default:default,org.glassfish.hk2.external.cglib@default:default,org.glassfish.hk2.external.javax.inject@default:default,org.glassfish.hk2.locator@default:default,org.glassfish.hk2.osgi-resource-locator@default:default,org.glassfish.hk2.utils@default:default,org.glassfish.jersey.core.jersey-client@default:default,org.glassfish.jersey.core.jersey-common@default:default"/>
<stringAttribute key="target_bundles" value="com.google.guava@default:default,javassist@default:default,javax.annotation-api@default:default,javax.ws.rs-api@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds,org.eclipse.equinox.util,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.glassfish.hk2.api@default:default,org.glassfish.hk2.external.aopalliance-repackaged@default:default,org.glassfish.hk2.external.asm-all-repackaged@default:default,org.glassfish.hk2.external.cglib@default:default,org.glassfish.hk2.external.javax.inject@default:default,org.glassfish.hk2.locator@default:default,org.glassfish.hk2.osgi-resource-locator@default:default,org.glassfish.hk2.utils@default:default,org.glassfish.jersey.core.jersey-client@default:default,org.glassfish.jersey.core.jersey-common@default:default"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
<booleanAttribute key="useDefaultConfigArea" value="true"/>
<stringAttribute key="workspace_bundles" value="com.eclipsesource.jaxrs.consumer.example.caller@default:default,com.eclipsesource.jaxrs.consumer.example@default:default,com.eclipsesource.jaxrs.consumer@default:default"/>
<stringAttribute key="workspace_bundles" value="com.eclipsesource.jaxrs.consumer,com.eclipsesource.jaxrs.consumer.example,com.eclipsesource.jaxrs.consumer.example.caller"/>
</launchConfiguration>
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.ignoreApp=true&#13;&#10;-Dosgi.noShutdown=true&#13;&#10;-Dorg.osgi.service.http.port=9090&#13;&#10;-Dorg.eclipse.rwt.clientLibraryVariant=DEBUG&#10;-Dorg.eclipse.equinox.http.jetty.log.stderr.threshold=info"/>
<stringAttribute key="pde.version" value="3.3"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="target_bundles" value="com.google.guava@default:default,javax.annotation-api@default:default,javax.servlet-api@default:default,javax.validation.api@default:default,javax.ws.rs-api@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.eclipse.equinox.cm@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.glassfish.hk2.api@default:default,org.glassfish.hk2.external.asm-all-repackaged@default:default,org.glassfish.hk2.external.cglib@default:default,org.glassfish.hk2.external.javax.inject@default:default,org.glassfish.hk2.locator@default:default,org.glassfish.hk2.osgi-resource-locator@default:default,org.glassfish.hk2.utils@default:default,org.glassfish.jersey.containers.jersey-container-servlet-core@default:default,org.glassfish.jersey.core.jersey-client@default:default,org.glassfish.jersey.core.jersey-common@default:default,org.glassfish.jersey.core.jersey-server@default:default"/>
<booleanAttribute key="show_selected_only" value="true"/>
<stringAttribute key="target_bundles" value="com.google.guava@default:default,javassist@default:default,javax.annotation-api@default:default,javax.servlet-api@default:default,javax.validation.api@default:default,javax.ws.rs-api@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.eclipse.equinox.cm@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.glassfish.hk2.api@default:default,org.glassfish.hk2.external.aopalliance-repackaged@default:default,org.glassfish.hk2.external.asm-all-repackaged@default:default,org.glassfish.hk2.external.cglib@default:default,org.glassfish.hk2.external.javax.inject@default:default,org.glassfish.hk2.locator@default:default,org.glassfish.hk2.osgi-resource-locator@default:default,org.glassfish.hk2.utils@default:default,org.glassfish.jersey.containers.jersey-container-servlet-core@default:default,org.glassfish.jersey.core.jersey-client@default:default,org.glassfish.jersey.core.jersey-common@default:default,org.glassfish.jersey.core.jersey-server@default:default"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
<booleanAttribute key="useDefaultConfigArea" value="true"/>
Expand Down
Loading

0 comments on commit dbb48a1

Please sign in to comment.