From 8aa2d4d7d1f430b4fead56a8cc1a0de74f178a75 Mon Sep 17 00:00:00 2001 From: Aki Yoshida Date: Sat, 18 Apr 2015 18:00:09 +0200 Subject: [PATCH 1/4] [OLINGO-632] make Olingo jars to OSGi bundles Signed-off-by: Michael Bolz --- lib/client-api/pom.xml | 23 +++++++++++++++++++++-- lib/client-core/pom.xml | 18 +++++++++++++++++- lib/commons-api/pom.xml | 22 ++++++++++++++++++++-- lib/commons-core/pom.xml | 23 ++++++++++++++++++++++- lib/server-api/pom.xml | 26 ++++++++++++++++++++++++-- lib/server-core/pom.xml | 18 +++++++++++++++++- pom.xml | 10 ++++++++-- 7 files changed, 129 insertions(+), 11 deletions(-) diff --git a/lib/client-api/pom.xml b/lib/client-api/pom.xml index 3a9adf4ac..1340edf95 100644 --- a/lib/client-api/pom.xml +++ b/lib/client-api/pom.xml @@ -24,7 +24,7 @@ 4.0.0 odata-client-api - jar + bundle ${project.artifactId} @@ -50,5 +50,24 @@ httpclient - + + + + org.apache.felix + maven-bundle-plugin + true + + + + + org.apache.olingo.client.api* + + + * + + + + + + diff --git a/lib/client-core/pom.xml b/lib/client-core/pom.xml index 55acb0c20..ec9e2a904 100644 --- a/lib/client-core/pom.xml +++ b/lib/client-core/pom.xml @@ -24,7 +24,7 @@ 4.0.0 odata-client-core - jar + bundle ${project.artifactId} @@ -77,6 +77,22 @@ + + org.apache.felix + maven-bundle-plugin + true + + + + + org.apache.olingo.client.core* + + + * + + + + diff --git a/lib/commons-api/pom.xml b/lib/commons-api/pom.xml index c28604244..55ca40df9 100644 --- a/lib/commons-api/pom.xml +++ b/lib/commons-api/pom.xml @@ -24,7 +24,7 @@ 4.0.0 odata-commons-api - jar + bundle ${project.artifactId} @@ -55,5 +55,23 @@ test - + + + + org.apache.felix + maven-bundle-plugin + true + + + + org.apache.olingo.commons.api* + + + * + + + + + + diff --git a/lib/commons-core/pom.xml b/lib/commons-core/pom.xml index d5bbcb146..f290e96db 100644 --- a/lib/commons-core/pom.xml +++ b/lib/commons-core/pom.xml @@ -24,7 +24,7 @@ 4.0.0 odata-commons-core - jar + bundle ${project.artifactId} @@ -77,4 +77,25 @@ test + + + + org.apache.felix + maven-bundle-plugin + true + + + + org.apache.olingo.commons.core, + org.apache.olingo.commons.core.edm.provider, + org.apache.olingo.commons.core.edm.primitivetype, + + + * + + + + + + diff --git a/lib/server-api/pom.xml b/lib/server-api/pom.xml index e331f0fb7..393939f77 100644 --- a/lib/server-api/pom.xml +++ b/lib/server-api/pom.xml @@ -24,7 +24,7 @@ 4.0.0 odata-server-api - jar + bundle ${project.artifactId} @@ -51,5 +51,27 @@ junit - + + + + org.apache.felix + maven-bundle-plugin + true + + + + org.apache.olingo.server.api* + + + * + + + + org.apache.olingo.server.core + + + + + + diff --git a/lib/server-core/pom.xml b/lib/server-core/pom.xml index f081ebc1a..1c2d1f57d 100644 --- a/lib/server-core/pom.xml +++ b/lib/server-core/pom.xml @@ -24,7 +24,7 @@ 4.0.0 odata-server-core - jar + bundle ${project.artifactId} @@ -78,6 +78,7 @@ + org.codehaus.mojo build-helper-maven-plugin @@ -114,6 +115,21 @@ src/main/antlr4/org/apache/olingo/server/core/uri/antlr + + org.apache.felix + maven-bundle-plugin + true + + + + org.apache.olingo.server.core + + + * + + + + diff --git a/pom.xml b/pom.xml index 235f30fc6..56dd4bef4 100644 --- a/pom.xml +++ b/pom.xml @@ -80,10 +80,11 @@ 1.7 3.2.2 3.3 - + 2.3.4 4.2.6 2.4.2 - 0.9.9 + + 0.9.8 4.1 @@ -130,6 +131,11 @@ ${antlr.version} + + org.apache.felix + maven-bundle-plugin + ${maven.bundle.plugin.version} + org.apache.httpcomponents httpclient From c536ce35f7030cd7b4ced1ba4118cd53e704f9c2 Mon Sep 17 00:00:00 2001 From: Aki Yoshida Date: Wed, 13 May 2015 17:34:02 +0200 Subject: [PATCH 2/4] [OLINGO-632] adjusted to 4.0.0-SNAPSHOT Signed-off-by: mibo --- lib/commons-core/pom.xml | 1 + pom.xml | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/commons-core/pom.xml b/lib/commons-core/pom.xml index f290e96db..2f0f3191d 100644 --- a/lib/commons-core/pom.xml +++ b/lib/commons-core/pom.xml @@ -87,6 +87,7 @@ org.apache.olingo.commons.core, + org.apache.olingo.commons.core.edm, org.apache.olingo.commons.core.edm.provider, org.apache.olingo.commons.core.edm.primitivetype, diff --git a/pom.xml b/pom.xml index 56dd4bef4..80a9804c0 100644 --- a/pom.xml +++ b/pom.xml @@ -83,8 +83,7 @@ 2.3.4 4.2.6 2.4.2 - - 0.9.8 + 0.9.10 4.1 From 41edf2daf31d9cbafe879f3c8a74582d11f23adc Mon Sep 17 00:00:00 2001 From: Michael Bolz Date: Fri, 29 May 2015 10:11:29 +0200 Subject: [PATCH 3/4] [OLINGO-632] Restricted '*-core' exports --- .../java/org/apache/olingo/fit/v4/AbstractTestITCase.java | 4 ++-- .../org/apache/olingo/fit/v4/ConformanceTestITCase.java | 5 ++--- lib/client-api/pom.xml | 1 - lib/client-core/pom.xml | 6 ++++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java index 402a1e2f1..5339bffee 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java @@ -43,7 +43,6 @@ import org.apache.olingo.client.api.domain.ClientEntity; import org.apache.olingo.client.api.domain.ClientProperty; import org.apache.olingo.client.api.domain.ClientValue; import org.apache.olingo.client.core.ODataClientFactory; -import org.apache.olingo.client.core.domain.ClientEntityImpl; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.format.ContentType; @@ -115,7 +114,8 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase { } protected void createAndDeleteOrder(final String serviceRoot, final ODataFormat format, final int id) { - final ClientEntity order = new ClientEntityImpl( + + final ClientEntity order = getClient().getObjectFactory().newEntity( new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Order")); final ClientProperty orderId = getClient().getObjectFactory().newPrimitiveProperty("OrderID", diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java index e3e9eb870..472928f97 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java @@ -49,7 +49,6 @@ import org.apache.olingo.client.api.domain.ClientEntitySet; import org.apache.olingo.client.api.domain.ClientProperty; import org.apache.olingo.client.api.domain.ClientValue; import org.apache.olingo.client.api.uri.URIBuilder; -import org.apache.olingo.client.core.domain.ClientEntityImpl; import org.apache.olingo.client.core.http.BasicAuthHttpClientFactory; import org.apache.olingo.client.core.http.DefaultHttpClientFactory; import org.apache.olingo.client.core.uri.URIUtils; @@ -87,8 +86,8 @@ public class ConformanceTestITCase extends AbstractTestITCase { */ @Test public void item2() { - final ClientEntity order = - new ClientEntityImpl(new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Order")); + final ClientEntity order = getClient().getObjectFactory().newEntity( + new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Order")); final ClientProperty orderId = getClient().getObjectFactory().newPrimitiveProperty("OrderID", getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(2000)); diff --git a/lib/client-api/pom.xml b/lib/client-api/pom.xml index 1340edf95..4bc7b7958 100644 --- a/lib/client-api/pom.xml +++ b/lib/client-api/pom.xml @@ -58,7 +58,6 @@ true - org.apache.olingo.client.api* diff --git a/lib/client-core/pom.xml b/lib/client-core/pom.xml index ec9e2a904..4e6068cbe 100644 --- a/lib/client-core/pom.xml +++ b/lib/client-core/pom.xml @@ -83,9 +83,11 @@ true - - org.apache.olingo.client.core* + org.apache.olingo.client.core, + org.apache.olingo.client.core.http, + org.apache.olingo.client.core.uri.URIUtils, + org.apache.olingo.client.core.communication.request* * From 0ff0fc1b1618f252394e4af5c23d3cfc4e284c0b Mon Sep 17 00:00:00 2001 From: Michael Bolz Date: Fri, 29 May 2015 14:53:54 +0200 Subject: [PATCH 4/4] [OLINGO-632] Export 'org.apache.olingo.commons.core.serialization' package --- lib/commons-core/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/commons-core/pom.xml b/lib/commons-core/pom.xml index 2f0f3191d..c6d6f98fb 100644 --- a/lib/commons-core/pom.xml +++ b/lib/commons-core/pom.xml @@ -90,6 +90,7 @@ org.apache.olingo.commons.core.edm, org.apache.olingo.commons.core.edm.provider, org.apache.olingo.commons.core.edm.primitivetype, + org.apache.olingo.commons.core.serialization *