Apache
/
olingo-odata4
mirror of https://github.com/apache/olingo-odata4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[OLINGO-1351] Fix Netty imports for OSGI and update Netty version

This commit is contained in:
mibo 2019-04-27 15:19:36 +02:00
parent b8ac17e4ae
commit 2032581dc4
4 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ext/karaf/karaf-features/src/main/resources/features.xml
View File

@ -23,8 +23,15 @@
<bundle>mvn:commons-codec/commons-codec/${commons.codec.version}</bundle> <bundle>mvn:commons-codec/commons-codec/${commons.codec.version}</bundle>
<bundle>mvn:org.apache.commons/commons-lang3/${commons.lang3.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: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-core/${jackson.version}</bundle>
<bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/${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> <bundle>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle>

2
lib/server-api/pom.xml
View File

@ -49,7 +49,6 @@
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId> <artifactId>netty-codec-http</artifactId>
<version>4.1.16.Final</version>
</dependency> </dependency>
<!-- Test dependencies --> <!-- Test dependencies -->
<dependency> <dependency>
@ -84,6 +83,7 @@
</Import-Package> </Import-Package>
<!-- workaround due to the current server-api server-core interdependency --> <!-- workaround due to the current server-api server-core interdependency -->
<DynamicImport-Package> <DynamicImport-Package>
org.apache.olingo.netty.server.core,
org.apache.olingo.server.core org.apache.olingo.server.core
</DynamicImport-Package> </DynamicImport-Package>
</instructions> </instructions>

6
pom.xml
View File

@ -76,6 +76,7 @@
<servlet.version>3.1.0</servlet.version> <servlet.version>3.1.0</servlet.version>
<cxf.version>3.0.0</cxf.version> <cxf.version>3.0.0</cxf.version>
<spring.version>4.0.6.RELEASE</spring.version> <spring.version>4.0.6.RELEASE</spring.version>
<netty.version>4.1.35.Final</netty.version>
<velocity.version>1.7</velocity.version> <velocity.version>1.7</velocity.version>
<maven.plugin.api.version>3.2.2</maven.plugin.api.version> <maven.plugin.api.version>3.2.2</maven.plugin.api.version>
@ -111,6 +112,11 @@
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency> <dependency>
<groupId>commons-codec</groupId> <groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId> <artifactId>commons-codec</artifactId>

1
samples/osgi/server/pom.xml
View File

@ -100,6 +100,7 @@ under the License.
</Export-Package> </Export-Package>
<Import-Package> <Import-Package>
org.apache.olingo.server.api*, org.apache.olingo.server.api*,
org.apache.olingo.netty.server.api*,
org.apache.catalina;resolution:=optional, org.apache.catalina;resolution:=optional,
org.apache.catalina.comet;resolution:=optional, org.apache.catalina.comet;resolution:=optional,
org.eclipse.jetty.continuation;resolution:=optional, org.eclipse.jetty.continuation;resolution:=optional,