Repository: olingo-odata4 Updated Branches: refs/heads/master fcc5564d7 -> 9f8c8b7e0
Revert "[OLINGO-344] fix issued with shaded jars" This reverts commit fcc5564d792bc6dc78f0f5a56454d9cbd86d640a. Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/9f8c8b7e Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/9f8c8b7e Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/9f8c8b7e Branch: refs/heads/master Commit: 9f8c8b7e0663053f1042ae14e328ed22cd607177 Parents: fcc5564 Author: Francesco Chicchiriccò <[email protected]> Authored: Tue Jul 22 11:53:17 2014 +0200 Committer: Francesco Chicchiriccò <[email protected]> Committed: Tue Jul 22 11:53:17 2014 +0200 ---------------------------------------------------------------------- ext/client-core-android/pom.xml | 22 +++++++++- ext/client-proxy-android/pom.xml | 29 ++++++++++--- .../android/http/AndroidHttpClientFactory.java | 44 -------------------- 3 files changed, 44 insertions(+), 51 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/9f8c8b7e/ext/client-core-android/pom.xml ---------------------------------------------------------------------- diff --git a/ext/client-core-android/pom.xml b/ext/client-core-android/pom.xml index b5ac2ee..706ecfa 100644 --- a/ext/client-core-android/pom.xml +++ b/ext/client-core-android/pom.xml @@ -66,7 +66,27 @@ </execution> </executions> <configuration> - <relocations> + <artifactSet> + <includes> + <include>org.apache.olingo:olingo-client-core-android</include> + <include>org.apache.olingo:olingo-client-core</include> + <include>org.apache.olingo:olingo-client-api</include> + <include>org.apache.olingo:olingo-commons-core</include> + <include>org.apache.olingo:olingo-commons-api</include> + <include>org.apache.commons:commons-lang3</include> + <include>org.slf4j:slf4j-api</include> + <include>commons-io:commons-io</include> + <include>com.fasterxml.jackson.core:jackson-core</include> + <include>com.fasterxml.jackson.core:jackson-databind</include> + <include>com.fasterxml.jackson.core:jackson-annotations</include> + <include>com.fasterxml.jackson.dataformat:jackson-dataformat-xml</include> + <include>com.fasterxml.jackson.module:jackson-module-jaxb-annotations</include> + <include>org.codehaus.woodstox:stax2-api</include> + <include>javax.xml.stream:stax-api</include> + <include>com.fasterxml:aalto-xml</include> + </includes> + </artifactSet> + <relocations> <relocation> <pattern>javax.xml.stream</pattern> <shadedPattern>org.apache.olingo.javax.xml.stream</shadedPattern> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/9f8c8b7e/ext/client-proxy-android/pom.xml ---------------------------------------------------------------------- diff --git a/ext/client-proxy-android/pom.xml b/ext/client-proxy-android/pom.xml index 5920c72..90990c2 100644 --- a/ext/client-proxy-android/pom.xml +++ b/ext/client-proxy-android/pom.xml @@ -41,11 +41,6 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.olingo</groupId> - <artifactId>olingo-client-core</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> <groupId>com.google.android</groupId> <artifactId>android</artifactId> <version>${android.platform.version}</version> @@ -71,7 +66,29 @@ </execution> </executions> <configuration> - <relocations> + <artifactSet> + <includes> + <include>org.apache.olingo:olingo-client-proxy-android</include> + <include>org.apache.olingo:olingo-client-proxy</include> + <include>org.apache.olingo:olingo-client-core-android</include> + <include>org.apache.olingo:olingo-client-core</include> + <include>org.apache.olingo:olingo-client-api</include> + <include>org.apache.olingo:olingo-commons-core</include> + <include>org.apache.olingo:olingo-commons-api</include> + <include>org.apache.commons:commons-lang3</include> + <include>org.slf4j:slf4j-api</include> + <include>commons-io:commons-io</include> + <include>com.fasterxml.jackson.core:jackson-core</include> + <include>com.fasterxml.jackson.core:jackson-databind</include> + <include>com.fasterxml.jackson.core:jackson-annotations</include> + <include>com.fasterxml.jackson.dataformat:jackson-dataformat-xml</include> + <include>com.fasterxml.jackson.module:jackson-module-jaxb-annotations</include> + <include>org.codehaus.woodstox:stax2-api</include> + <include>javax.xml.stream:stax-api</include> + <include>com.fasterxml:aalto-xml</include> + </includes> + </artifactSet> + <relocations> <relocation> <pattern>javax.xml.stream</pattern> <shadedPattern>org.apache.olingo.javax.xml.stream</shadedPattern> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/9f8c8b7e/ext/client-proxy-android/src/main/java/org/apache/olingo/client/core/android/http/AndroidHttpClientFactory.java ---------------------------------------------------------------------- diff --git a/ext/client-proxy-android/src/main/java/org/apache/olingo/client/core/android/http/AndroidHttpClientFactory.java b/ext/client-proxy-android/src/main/java/org/apache/olingo/client/core/android/http/AndroidHttpClientFactory.java deleted file mode 100644 index c11a38f..0000000 --- a/ext/client-proxy-android/src/main/java/org/apache/olingo/client/core/android/http/AndroidHttpClientFactory.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * 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. - */ -package org.apache.olingo.client.core.android.http; - -import android.net.http.AndroidHttpClient; -import org.apache.http.client.HttpClient; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.client.core.http.AbstractHttpClientFactory; - -import java.net.URI; - -public class AndroidHttpClientFactory extends AbstractHttpClientFactory { - - private static final long serialVersionUID = -5224104561624556177L; - - @Override - public AndroidHttpClient create(final HttpMethod method, final URI uri) { - return AndroidHttpClient.newInstance(USER_AGENT); - } - - @Override - public void close(final HttpClient httpClient) { - if (httpClient instanceof AndroidHttpClient) { - ((AndroidHttpClient) httpClient).close(); - } - } - -}
