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

[OLINGO-1211] Fix imports and bundling

This commit is contained in:
mibo 2019-04-26 19:58:49 +02:00
parent 3395683b5a
commit 50dec8d5d2
3 changed files with 46 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,14 +46,16 @@
<version>2.5</version> <version>2.5</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
<version>4.1.16.Final</version>
</dependency>
<!-- Test dependencies -->
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
</dependency> <scope>test</scope>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<version>4.1.16.Final</version>
</dependency> </dependency>
</dependencies> </dependencies>
@ -74,7 +76,8 @@
<configuration> <configuration>
<instructions> <instructions>
<Export-Package> <Export-Package>
org.apache.olingo.server.api* org.apache.olingo.server.api*,
org.apache.olingo.netty.server.api*
</Export-Package> </Export-Package>
<Import-Package> <Import-Package>
* *

25
lib/server-api/src/main/java/org/apache/olingo/netty/server/api/package-info.java Normal file
View File

@ -0,0 +1,25 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* 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
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
/**
* Netty handler for Olingo Server API
* <p>
* The netty package is used to condense all Netty related parts used in Olingo.
*
*/
package org.apache.olingo.netty.server.api;

18
lib/server-core/pom.xml
View File

@ -51,11 +51,6 @@
<version>2.5</version> <version>2.5</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
@ -75,14 +70,21 @@
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
</dependency> </dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
<version>4.1.16.Final</version>
</dependency>
<!-- Test dependencies -->
<dependency> <dependency>
<groupId>org.mockito</groupId> <groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId> <artifactId>mockito-all</artifactId>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>commons-io</groupId>
<artifactId>netty-all</artifactId> <artifactId>commons-io</artifactId>
<version>4.1.16.Final</version> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>