This is an automated email from the ASF dual-hosted git repository.
mibo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/olingo-odata4.git
The following commit(s) were added to refs/heads/master by this push:
new 2032581 [OLINGO-1351] Fix Netty imports for OSGI and update Netty
version
2032581 is described below
commit 2032581dc4b24bf0f0679bf5bcf7797ac2e5e201
Author: mibo <[email protected]>
AuthorDate: Sat Apr 27 15:19:36 2019 +0200
[OLINGO-1351] Fix Netty imports for OSGI and update Netty version
---
ext/karaf/karaf-features/src/main/resources/features.xml | 9 ++++++++-
lib/server-api/pom.xml | 2 +-
pom.xml | 6 ++++++
samples/osgi/server/pom.xml | 1 +
4 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/ext/karaf/karaf-features/src/main/resources/features.xml
b/ext/karaf/karaf-features/src/main/resources/features.xml
index d4511a8..9736f42 100644
--- a/ext/karaf/karaf-features/src/main/resources/features.xml
+++ b/ext/karaf/karaf-features/src/main/resources/features.xml
@@ -23,8 +23,15 @@
<bundle>mvn:commons-codec/commons-codec/${commons.codec.version}</bundle>
<bundle>mvn:org.apache.commons/commons-lang3/${commons.lang3.version}</bundle>
<bundle>mvn:org.codehaus.woodstox/stax2-api/${woodstox.stax2-api.version}</bundle>
- <bundle>mvn:com.fasterxml/aalto-xml/${aalto-xml.version}</bundle>
+ <bundle>mvn:io.netty/netty-common/${netty.version}</bundle>
+ <bundle>mvn:io.netty/netty-buffer/${netty.version}</bundle>
+ <bundle>mvn:io.netty/netty-resolver/${netty.version}</bundle>
+ <bundle>mvn:io.netty/netty-transport/${netty.version}</bundle>
+ <bundle>mvn:io.netty/netty-codec/${netty.version}</bundle>
+ <bundle>mvn:io.netty/netty-handler/${netty.version}</bundle>
+ <bundle>mvn:io.netty/netty-codec-http/${netty.version}</bundle>
+ <bundle>mvn:com.fasterxml/aalto-xml/${aalto-xml.version}</bundle>
<bundle>mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle>
<bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version}</bundle>
<bundle>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle>
diff --git a/lib/server-api/pom.xml b/lib/server-api/pom.xml
index d8ff842..601ebd4 100644
--- a/lib/server-api/pom.xml
+++ b/lib/server-api/pom.xml
@@ -49,7 +49,6 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
- <version>4.1.16.Final</version>
</dependency>
<!-- Test dependencies -->
<dependency>
@@ -84,6 +83,7 @@
</Import-Package>
<!-- workaround due to the current server-api server-core
interdependency -->
<DynamicImport-Package>
+ org.apache.olingo.netty.server.core,
org.apache.olingo.server.core
</DynamicImport-Package>
</instructions>
diff --git a/pom.xml b/pom.xml
index 0f16b61..c8ed6d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,6 +76,7 @@
<servlet.version>3.1.0</servlet.version>
<cxf.version>3.0.0</cxf.version>
<spring.version>4.0.6.RELEASE</spring.version>
+ <netty.version>4.1.35.Final</netty.version>
<velocity.version>1.7</velocity.version>
<maven.plugin.api.version>3.2.2</maven.plugin.api.version>
@@ -112,6 +113,11 @@
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec-http</artifactId>
+ <version>${netty.version}</version>
+ </dependency>
+ <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>${commons.codec.version}</version>
diff --git a/samples/osgi/server/pom.xml b/samples/osgi/server/pom.xml
index c437c73..774b11c 100644
--- a/samples/osgi/server/pom.xml
+++ b/samples/osgi/server/pom.xml
@@ -100,6 +100,7 @@ under the License.
</Export-Package>
<Import-Package>
org.apache.olingo.server.api*,
+ org.apache.olingo.netty.server.api*,
org.apache.catalina;resolution:=optional,
org.apache.catalina.comet;resolution:=optional,
org.eclipse.jetty.continuation;resolution:=optional,
