mirror of
https://github.com/apache/olingo-odata4.git
synced 2025-03-04 15:49:12 +00:00
[OLINGO-649] Fixed compile errors after beta-03
This commit is contained in:
parent
db47760e35
commit
0c511f80b2
1
pom.xml
1
pom.xml
@ -565,6 +565,7 @@
|
||||
<exclude>**/nb-configuration.xml</exclude>
|
||||
<exclude>**/.externalToolBuilders/**</exclude>
|
||||
<exclude>**/maven-eclipse.xml</exclude>
|
||||
<exclude>**/*.iml</exclude>
|
||||
<exclude>**/ref/**</exclude>
|
||||
<exclude>**/server-ref/**</exclude>
|
||||
<exclude>**/dependency-reduced-pom.xml</exclude>
|
||||
|
@ -44,6 +44,14 @@
|
||||
<skip>true</skip>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
<!-- Disable checkstyle for sample -->
|
||||
<plugin>
|
||||
<artifactId>maven-checkstyle-plugin</artifactId>
|
||||
<configuration>
|
||||
<skip>true</skip>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
|
@ -23,7 +23,7 @@ import org.apache.http.client.CookieStore;
|
||||
import org.apache.http.impl.client.BasicCookieStore;
|
||||
import org.apache.http.impl.client.DefaultHttpClient;
|
||||
import org.apache.http.impl.cookie.BasicClientCookie;
|
||||
import org.apache.olingo.client.api.http.HttpMethod;
|
||||
import org.apache.olingo.commons.api.http.HttpMethod;
|
||||
import org.apache.olingo.client.core.http.DefaultHttpClientFactory;
|
||||
|
||||
/**
|
||||
|
@ -39,7 +39,7 @@ import org.apache.http.message.BasicLineParser;
|
||||
import org.apache.http.params.CoreProtocolPNames;
|
||||
import org.apache.http.params.HttpParams;
|
||||
import org.apache.http.util.CharArrayBuffer;
|
||||
import org.apache.olingo.client.api.http.HttpMethod;
|
||||
import org.apache.olingo.commons.api.http.HttpMethod;
|
||||
import org.apache.olingo.client.core.http.AbstractHttpClientFactory;
|
||||
|
||||
/**
|
||||
|
@ -23,7 +23,7 @@ import org.apache.http.HttpVersion;
|
||||
import org.apache.http.impl.client.DefaultHttpClient;
|
||||
import org.apache.http.params.CoreProtocolPNames;
|
||||
import org.apache.http.params.HttpConnectionParams;
|
||||
import org.apache.olingo.client.api.http.HttpMethod;
|
||||
import org.apache.olingo.commons.api.http.HttpMethod;
|
||||
import org.apache.olingo.client.core.http.DefaultHttpClientFactory;
|
||||
|
||||
/**
|
||||
|
@ -23,7 +23,7 @@ import org.apache.http.HttpVersion;
|
||||
import org.apache.http.client.methods.HttpUriRequest;
|
||||
import org.apache.http.params.CoreProtocolPNames;
|
||||
import org.apache.http.params.HttpConnectionParams;
|
||||
import org.apache.olingo.client.api.http.HttpMethod;
|
||||
import org.apache.olingo.commons.api.http.HttpMethod;
|
||||
import org.apache.olingo.client.core.http.DefaultHttpUriRequestFactory;
|
||||
|
||||
/**
|
||||
|
@ -27,7 +27,7 @@ import org.apache.http.HttpResponse;
|
||||
import org.apache.http.HttpResponseInterceptor;
|
||||
import org.apache.http.impl.client.DefaultHttpClient;
|
||||
import org.apache.http.protocol.HttpContext;
|
||||
import org.apache.olingo.client.api.http.HttpMethod;
|
||||
import org.apache.olingo.commons.api.http.HttpMethod;
|
||||
import org.apache.olingo.client.core.http.DefaultHttpClientFactory;
|
||||
|
||||
/**
|
||||
|
@ -30,7 +30,7 @@ import org.apache.http.client.HttpRequestRetryHandler;
|
||||
import org.apache.http.impl.client.DefaultHttpClient;
|
||||
import org.apache.http.protocol.ExecutionContext;
|
||||
import org.apache.http.protocol.HttpContext;
|
||||
import org.apache.olingo.client.api.http.HttpMethod;
|
||||
import org.apache.olingo.commons.api.http.HttpMethod;
|
||||
import org.apache.olingo.client.core.http.DefaultHttpClientFactory;
|
||||
|
||||
/**
|
||||
|
@ -28,7 +28,7 @@ import org.apache.http.conn.ssl.TrustStrategy;
|
||||
import org.apache.http.impl.client.DefaultHttpClient;
|
||||
import org.apache.http.impl.conn.BasicClientConnectionManager;
|
||||
import org.apache.http.params.CoreProtocolPNames;
|
||||
import org.apache.olingo.client.api.http.HttpMethod;
|
||||
import org.apache.olingo.commons.api.http.HttpMethod;
|
||||
import org.apache.olingo.client.core.http.AbstractHttpClientFactory;
|
||||
import org.apache.olingo.commons.api.ODataRuntimeException;
|
||||
|
||||
|
@ -22,7 +22,7 @@ import java.net.URI;
|
||||
import org.apache.http.client.UserTokenHandler;
|
||||
import org.apache.http.impl.client.DefaultHttpClient;
|
||||
import org.apache.http.protocol.HttpContext;
|
||||
import org.apache.olingo.client.api.http.HttpMethod;
|
||||
import org.apache.olingo.commons.api.http.HttpMethod;
|
||||
import org.apache.olingo.client.core.http.DefaultHttpClientFactory;
|
||||
|
||||
/**
|
||||
|
Loading…
x
Reference in New Issue
Block a user