[OLINGO-231] Fixed merge problems and changed version
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/387cdd2a Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/387cdd2a Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/387cdd2a Branch: refs/heads/OLINGO-231_PocForAndroid Commit: 387cdd2af45cf385e56129b1a4df5fc8646cb6af Parents: 46d83c8 Author: mibo <[email protected]> Authored: Wed Jul 20 21:24:14 2016 +0200 Committer: mibo <[email protected]> Committed: Wed Jul 20 21:24:14 2016 +0200 ---------------------------------------------------------------------- odata2-android/pom.xml | 10 +++--- .../android/xml/AtomEntryProducerTest.java | 33 +++----------------- .../android/xml/AtomFeedProducerTest.java | 16 +++++----- .../annotation-processor-api/pom.xml | 2 +- .../annotation-processor-core/pom.xml | 2 +- .../annotation-processor-ref/pom.xml | 2 +- .../annotation-processor-web/pom.xml | 2 +- odata2-annotation-processor/pom.xml | 2 +- odata2-dist/janos/pom.xml | 2 +- odata2-dist/javadoc/pom.xml | 2 +- odata2-dist/jpa/pom.xml | 2 +- odata2-dist/lib/pom.xml | 2 +- odata2-dist/pom.xml | 2 +- odata2-dist/ref/pom.xml | 2 +- odata2-jpa-processor/jpa-api/pom.xml | 2 +- odata2-jpa-processor/jpa-core/pom.xml | 2 +- odata2-jpa-processor/jpa-ref/pom.xml | 2 +- odata2-jpa-processor/jpa-web/pom.xml | 2 +- odata2-jpa-processor/pom.xml | 2 +- odata2-lib/odata-annotation/pom.xml | 2 +- odata2-lib/odata-api/pom.xml | 2 +- odata2-lib/odata-core/pom.xml | 2 +- .../core/ep/consumer/XmlEntryConsumer.java | 2 +- odata2-lib/odata-fit/pom.xml | 2 +- odata2-lib/odata-ref/pom.xml | 2 +- odata2-lib/odata-testutil/pom.xml | 2 +- odata2-lib/odata-web/pom.xml | 2 +- odata2-lib/pom.xml | 2 +- odata2-sample/cars-annotation-archetype/pom.xml | 4 +-- odata2-sample/cars-jpa-archetype/pom.xml | 2 +- odata2-sample/cars-service-archetype/pom.xml | 4 +-- odata2-sample/pom.xml | 2 +- pom.xml | 16 +++++----- 33 files changed, 56 insertions(+), 81 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/387cdd2a/odata2-android/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-android/pom.xml b/odata2-android/pom.xml index 614f558..af3adea 100644 --- a/odata2-android/pom.xml +++ b/odata2-android/pom.xml @@ -7,9 +7,9 @@ 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 @@ -21,11 +21,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"; xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> <modelVersion>4.0.0</modelVersion> - + <parent> <groupId>org.apache.olingo</groupId> <artifactId>olingo-odata2-parent</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>2.0.0-android-01</version> <relativePath>..</relativePath> </parent> @@ -78,7 +78,7 @@ </plugin> </plugins> </build> - + <dependencies> <dependency> <groupId>com.google.android</groupId> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/387cdd2a/odata2-android/src/test/java/org/apache/olingo/odata2/android/xml/AtomEntryProducerTest.java ---------------------------------------------------------------------- diff --git a/odata2-android/src/test/java/org/apache/olingo/odata2/android/xml/AtomEntryProducerTest.java b/odata2-android/src/test/java/org/apache/olingo/odata2/android/xml/AtomEntryProducerTest.java index 5f1ee53..bcbb32e 100644 --- a/odata2-android/src/test/java/org/apache/olingo/odata2/android/xml/AtomEntryProducerTest.java +++ b/odata2-android/src/test/java/org/apache/olingo/odata2/android/xml/AtomEntryProducerTest.java @@ -307,7 +307,7 @@ public class AtomEntryProducerTest extends AndroidTestBase { XMLStreamException, ODataException { AtomEntityProvider ser = createAtomEntityProvider(); EntityProviderWriteProperties properties = - EntityProviderWriteProperties.serviceRoot(BASE_URI).mediaResourceMimeType("abc").build(); + EntityProviderWriteProperties.serviceRoot(BASE_URI).build(); ODataResponse response = ser.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), employeeData, properties); @@ -317,7 +317,7 @@ public class AtomEntryProducerTest extends AndroidTestBase { assertXpathEvaluatesTo(BASE_URI.toASCIIString(), "/a:entry/@xml:base", xmlString); assertXpathExists("/a:entry/a:content", xmlString); - assertXpathEvaluatesTo("abc", "/a:entry/a:content/@type", xmlString); + assertXpathEvaluatesTo("application/octet-stream", "/a:entry/a:content/@type", xmlString); assertXpathEvaluatesTo("Employees('1')/$value", "/a:entry/a:content/@src", xmlString); assertXpathExists("/a:entry/m:properties", xmlString); } @@ -354,7 +354,7 @@ public class AtomEntryProducerTest extends AndroidTestBase { XMLStreamException, ODataException { AtomEntityProvider ser = createAtomEntityProvider(); EntityProviderWriteProperties properties = - EntityProviderWriteProperties.serviceRoot(BASE_URI).mediaResourceMimeType("abc").build(); + EntityProviderWriteProperties.serviceRoot(BASE_URI).build(); ODataResponse response = ser.writeEntry(MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"), employeeData, properties); @@ -369,8 +369,6 @@ public class AtomEntryProducerTest extends AndroidTestBase { // verify one navigation link assertXpathExists("/a:entry/a:link[@title='ne_Manager']", xmlString); - // verify content - assertXpathExists("/a:entry/a:content[@type='abc']", xmlString); // verify properties assertXpathExists("/a:entry/m:properties", xmlString); assertXpathEvaluatesTo("9", "count(/a:entry/m:properties/*)", xmlString); @@ -388,7 +386,7 @@ public class AtomEntryProducerTest extends AndroidTestBase { XMLStreamException, ODataException { AtomEntityProvider ser = createAtomEntityProvider(); EntityProviderWriteProperties properties = - EntityProviderWriteProperties.serviceRoot(BASE_URI).mediaResourceMimeType("abc").build(); + EntityProviderWriteProperties.serviceRoot(BASE_URI).build(); EdmEntitySet employeeEntitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"); ODataResponse response = ser.writeEntry(employeeEntitySet, employeeData, properties); String xmlString = verifyResponse(response); @@ -411,7 +409,7 @@ public class AtomEntryProducerTest extends AndroidTestBase { XMLStreamException, ODataException { AtomEntityProvider ser = createAtomEntityProvider(); EntityProviderWriteProperties properties = - EntityProviderWriteProperties.serviceRoot(BASE_URI).mediaResourceMimeType("abc").build(); + EntityProviderWriteProperties.serviceRoot(BASE_URI).build(); EdmEntitySet employeeEntitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"); // set "keepInContent" to false for EntryDate @@ -765,7 +763,6 @@ public class AtomEntryProducerTest extends AndroidTestBase { EdmMapping mapping = employeesSet.getEntityType().getMapping(); when(mapping.getMediaResourceSourceKey()).thenReturn(mediaResourceSourceKey); when(mapping.getMediaResourceMimeTypeKey()).thenReturn(mediaResourceMimeTypeKey); - when(mapping.getMimeType()).thenReturn(null); ODataResponse response = ser.writeEntry(employeesSet, localEmployeeData, DEFAULT_PROPERTIES); String xmlString = verifyResponse(response); @@ -823,26 +820,6 @@ public class AtomEntryProducerTest extends AndroidTestBase { assertXpathNotExists("/a:entry/a:content[@src=\"http://localhost:8080/images/image1\"]";, xmlString); } - @Test - public void assureGetMimeTypeWinsOverGetMediaResourceMimeTypeKey() throws Exception { - // Keep this test till version 1.2 - AtomEntityProvider ser = createAtomEntityProvider(); - Map<String, Object> localEmployeeData = new HashMap<String, Object>(employeeData); - String mediaResourceMimeTypeKey = "~type"; - localEmployeeData.put(mediaResourceMimeTypeKey, "wrong"); - String originalMimeTypeKey = "~originalType"; - localEmployeeData.put(originalMimeTypeKey, "right"); - EdmEntitySet employeesSet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Employees"); - EdmMapping mapping = employeesSet.getEntityType().getMapping(); - when(mapping.getMediaResourceMimeTypeKey()).thenReturn(mediaResourceMimeTypeKey); - when(mapping.getMimeType()).thenReturn(originalMimeTypeKey); - ODataResponse response = ser.writeEntry(employeesSet, localEmployeeData, DEFAULT_PROPERTIES); - String xmlString = verifyResponse(response); - - assertXpathExists("/a:entry/a:content[@type=\"right\"]", xmlString); - assertXpathNotExists("/a:entry/a:content[@type=\"wrong\"]", xmlString); - } - private void verifyTagOrdering(final String xmlString, final String... toCheckTags) { XMLUnitHelper.verifyTagOrdering(xmlString, toCheckTags); } http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/387cdd2a/odata2-android/src/test/java/org/apache/olingo/odata2/android/xml/AtomFeedProducerTest.java ---------------------------------------------------------------------- diff --git a/odata2-android/src/test/java/org/apache/olingo/odata2/android/xml/AtomFeedProducerTest.java b/odata2-android/src/test/java/org/apache/olingo/odata2/android/xml/AtomFeedProducerTest.java index eaef473..7274438 100644 --- a/odata2-android/src/test/java/org/apache/olingo/odata2/android/xml/AtomFeedProducerTest.java +++ b/odata2-android/src/test/java/org/apache/olingo/odata2/android/xml/AtomFeedProducerTest.java @@ -79,7 +79,7 @@ public class AtomFeedProducerTest extends AndroidTestBase { public void testFeedNamespaces() throws Exception { AtomEntityProvider ser = createAtomEntityProvider(); EntityProviderWriteProperties properties = - EntityProviderWriteProperties.serviceRoot(BASE_URI).mediaResourceMimeType("mediatype").build(); + EntityProviderWriteProperties.serviceRoot(BASE_URI).build(); ODataResponse response = ser.writeFeed(view.getTargetEntitySet(), roomsData, properties); String xmlString = verifyResponse(response); @@ -91,7 +91,7 @@ public class AtomFeedProducerTest extends AndroidTestBase { public void testSelfLink() throws Exception { AtomEntityProvider ser = createAtomEntityProvider(); EntityProviderWriteProperties properties = - EntityProviderWriteProperties.serviceRoot(BASE_URI).mediaResourceMimeType("mediatype").build(); + EntityProviderWriteProperties.serviceRoot(BASE_URI).build(); ODataResponse response = ser.writeFeed(view.getTargetEntitySet(), roomsData, properties); String xmlString = verifyResponse(response); @@ -105,7 +105,7 @@ public class AtomFeedProducerTest extends AndroidTestBase { String customLink = "Test"; AtomEntityProvider ser = createAtomEntityProvider(); EntityProviderWriteProperties properties = - EntityProviderWriteProperties.serviceRoot(BASE_URI).mediaResourceMimeType("mediatype").selfLink( + EntityProviderWriteProperties.serviceRoot(BASE_URI).selfLink( new URI(customLink)).build(); ODataResponse response = ser.writeFeed(view.getTargetEntitySet(), roomsData, properties); String xmlString = verifyResponse(response); @@ -119,7 +119,7 @@ public class AtomFeedProducerTest extends AndroidTestBase { public void testFeedMandatoryParts() throws Exception { AtomEntityProvider ser = createAtomEntityProvider(); EntityProviderWriteProperties properties = - EntityProviderWriteProperties.serviceRoot(BASE_URI).mediaResourceMimeType("mediatype").build(); + EntityProviderWriteProperties.serviceRoot(BASE_URI).build(); ODataResponse response = ser.writeFeed(view.getTargetEntitySet(), roomsData, properties); String xmlString = verifyResponse(response); @@ -148,7 +148,6 @@ public class AtomFeedProducerTest extends AndroidTestBase { AtomEntityProvider ser = createAtomEntityProvider(); EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI) - .mediaResourceMimeType("mediatype") .inlineCount(Integer.valueOf(103)) .inlineCountType(InlineCount.ALLPAGES) .build(); @@ -165,7 +164,7 @@ public class AtomFeedProducerTest extends AndroidTestBase { AtomEntityProvider ser = createAtomEntityProvider(); EntityProviderWriteProperties properties = - EntityProviderWriteProperties.serviceRoot(BASE_URI).mediaResourceMimeType("mediatype").build(); + EntityProviderWriteProperties.serviceRoot(BASE_URI).build(); ODataResponse response = ser.writeFeed(view.getTargetEntitySet(), roomsData, properties); String xmlString = verifyResponse(response); @@ -178,7 +177,6 @@ public class AtomFeedProducerTest extends AndroidTestBase { AtomEntityProvider ser = createAtomEntityProvider(); EntityProviderWriteProperties properties = EntityProviderWriteProperties.serviceRoot(BASE_URI) - .mediaResourceMimeType("mediatype") .nextLink("http://thisisanextlink";) .build(); ODataResponse response = ser.writeFeed(view.getTargetEntitySet(), roomsData, properties); @@ -192,7 +190,7 @@ public class AtomFeedProducerTest extends AndroidTestBase { public void testInlineCountInvalid() throws Exception { AtomEntityProvider ser = createAtomEntityProvider(); EntityProviderWriteProperties properties = - EntityProviderWriteProperties.serviceRoot(BASE_URI).mediaResourceMimeType("mediatype").inlineCountType( + EntityProviderWriteProperties.serviceRoot(BASE_URI).inlineCountType( InlineCount.ALLPAGES).build(); ser.writeFeed(view.getTargetEntitySet(), roomsData, properties); } @@ -203,7 +201,7 @@ public class AtomFeedProducerTest extends AndroidTestBase { AtomEntityProvider ser = createAtomEntityProvider(); EntityProviderWriteProperties properties = - EntityProviderWriteProperties.serviceRoot(BASE_URI).mediaResourceMimeType("mediatype").build(); + EntityProviderWriteProperties.serviceRoot(BASE_URI).build(); ODataResponse response = ser.writeFeed(view.getTargetEntitySet(), roomsData, properties); String xmlString = verifyResponse(response); http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/387cdd2a/odata2-annotation-processor/annotation-processor-api/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-annotation-processor/annotation-processor-api/pom.xml b/odata2-annotation-processor/annotation-processor-api/pom.xml index 1b39e30..e9d6c0a 100644 --- a/odata2-annotation-processor/annotation-processor-api/pom.xml +++ b/odata2-annotation-processor/annotation-processor-api/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.apache.olingo</groupId> <artifactId>olingo-odata2-annotation-processor</artifactId> - <version>2.0.0</version> + <version>2.0.0-android-01</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/387cdd2a/odata2-annotation-processor/annotation-processor-core/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-annotation-processor/annotation-processor-core/pom.xml b/odata2-annotation-processor/annotation-processor-core/pom.xml index d367282..6b7673b 100644 --- a/odata2-annotation-processor/annotation-processor-core/pom.xml +++ b/odata2-annotation-processor/annotation-processor-core/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.olingo</groupId> <artifactId>olingo-odata2-annotation-processor</artifactId> - <version>2.0.0</version> + <version>2.0.0-android-01</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/387cdd2a/odata2-annotation-processor/annotation-processor-ref/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-annotation-processor/annotation-processor-ref/pom.xml b/odata2-annotation-processor/annotation-processor-ref/pom.xml index 8e05f59..8df914c 100644 --- a/odata2-annotation-processor/annotation-processor-ref/pom.xml +++ b/odata2-annotation-processor/annotation-processor-ref/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.olingo</groupId> <artifactId>olingo-odata2-annotation-processor</artifactId> - <version>2.0.0</version> + <version>2.0.0-android-01</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/387cdd2a/odata2-annotation-processor/annotation-processor-web/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-annotation-processor/annotation-processor-web/pom.xml b/odata2-annotation-processor/annotation-processor-web/pom.xml index 17d85bc..55ca614 100644 --- a/odata2-annotation-processor/annotation-processor-web/pom.xml +++ b/odata2-annotation-processor/annotation-processor-web/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.olingo</groupId> <artifactId>olingo-odata2-annotation-processor</artifactId> - <version>2.0.0</version> + <version>2.0.0-android-01</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/387cdd2a/odata2-annotation-processor/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-annotation-processor/pom.xml b/odata2-annotation-processor/pom.xml index a3f3bfd..4beb88e 100644 --- a/odata2-annotation-processor/pom.xml +++ b/odata2-annotation-processor/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.olingo</groupId> <artifactId>olingo-odata2-parent</artifactId> - <version>2.0.0</version> + <version>2.0.0-android-01</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/387cdd2a/odata2-dist/janos/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-dist/janos/pom.xml b/odata2-dist/janos/pom.xml index 220ac80..79bcc00 100644 --- a/odata2-dist/janos/pom.xml +++ b/odata2-dist/janos/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.apache.olingo</groupId> <artifactId>olingo-odata2-dist</artifactId> - <version>2.0.0</version> + <version>2.0.0-android-01</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/387cdd2a/odata2-dist/javadoc/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-dist/javadoc/pom.xml b/odata2-dist/javadoc/pom.xml index eb9487d..e812170 100644 --- a/odata2-dist/javadoc/pom.xml +++ b/odata2-dist/javadoc/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.apache.olingo</groupId> <artifactId>olingo-odata2-dist</artifactId> - <version>2.0.0</version> + <version>2.0.0-android-01</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/387cdd2a/odata2-dist/jpa/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-dist/jpa/pom.xml b/odata2-dist/jpa/pom.xml index 7a40638..80dfec3 100644 --- a/odata2-dist/jpa/pom.xml +++ b/odata2-dist/jpa/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.apache.olingo</groupId> <artifactId>olingo-odata2-dist</artifactId> - <version>2.0.0</version> + <version>2.0.0-android-01</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/387cdd2a/odata2-dist/lib/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-dist/lib/pom.xml b/odata2-dist/lib/pom.xml index 60b3bea..a8d6552 100644 --- a/odata2-dist/lib/pom.xml +++ b/odata2-dist/lib/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.apache.olingo</groupId> <artifactId>olingo-odata2-dist</artifactId> - <version>2.0.0</version> + <version>2.0.0-android-01</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/387cdd2a/odata2-dist/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-dist/pom.xml b/odata2-dist/pom.xml index dcf28d1..8ac1c7e 100644 --- a/odata2-dist/pom.xml +++ b/odata2-dist/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.apache.olingo</groupId> <artifactId>olingo-odata2-parent</artifactId> - <version>2.0.0</version> + <version>2.0.0-android-01</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/387cdd2a/odata2-dist/ref/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-dist/ref/pom.xml b/odata2-dist/ref/pom.xml index 2c3de83..cccf740 100644 --- a/odata2-dist/ref/pom.xml +++ b/odata2-dist/ref/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.apache.olingo</groupId> <artifactId>olingo-odata2-dist</artifactId> - <version>2.0.0</version> + <version>2.0.0-android-01</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/387cdd2a/odata2-jpa-processor/jpa-api/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-jpa-processor/jpa-api/pom.xml b/odata2-jpa-processor/jpa-api/pom.xml index 7903559..efa4490 100644 --- a/odata2-jpa-processor/jpa-api/pom.xml +++ b/odata2-jpa-processor/jpa-api/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.olingo</groupId> <artifactId>olingo-odata2-jpa-processor</artifactId> - <version>2.0.0</version> + <version>2.0.0-android-01</version> <relativePath>../</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/387cdd2a/odata2-jpa-processor/jpa-core/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-jpa-processor/jpa-core/pom.xml b/odata2-jpa-processor/jpa-core/pom.xml index fc7cff1..40eea4f 100644 --- a/odata2-jpa-processor/jpa-core/pom.xml +++ b/odata2-jpa-processor/jpa-core/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.olingo</groupId> <artifactId>olingo-odata2-jpa-processor</artifactId> - <version>2.0.0</version> + <version>2.0.0-android-01</version> <relativePath>../</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/387cdd2a/odata2-jpa-processor/jpa-ref/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-jpa-processor/jpa-ref/pom.xml b/odata2-jpa-processor/jpa-ref/pom.xml index f67db2a..9cf29e4 100644 --- a/odata2-jpa-processor/jpa-ref/pom.xml +++ b/odata2-jpa-processor/jpa-ref/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.apache.olingo</groupId> <artifactId>olingo-odata2-jpa-processor</artifactId> - <version>2.0.0</version> + <version>2.0.0-android-01</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/387cdd2a/odata2-jpa-processor/jpa-web/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-jpa-processor/jpa-web/pom.xml b/odata2-jpa-processor/jpa-web/pom.xml index 5c326e7..7f1d690 100644 --- a/odata2-jpa-processor/jpa-web/pom.xml +++ b/odata2-jpa-processor/jpa-web/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.olingo</groupId> <artifactId>olingo-odata2-jpa-processor</artifactId> - <version>2.0.0</version> + <version>2.0.0-android-01</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/387cdd2a/odata2-jpa-processor/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-jpa-processor/pom.xml b/odata2-jpa-processor/pom.xml index 962b752..f256759 100644 --- a/odata2-jpa-processor/pom.xml +++ b/odata2-jpa-processor/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.olingo</groupId> <artifactId>olingo-odata2-parent</artifactId> - <version>2.0.0</version> + <version>2.0.0-android-01</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/387cdd2a/odata2-lib/odata-annotation/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-lib/odata-annotation/pom.xml b/odata2-lib/odata-annotation/pom.xml index ec7edd5..25ad644 100644 --- a/odata2-lib/odata-annotation/pom.xml +++ b/odata2-lib/odata-annotation/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.apache.olingo</groupId> <artifactId>olingo-odata2-lib</artifactId> - <version>2.0.0</version> + <version>2.0.0-android-01</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/387cdd2a/odata2-lib/odata-api/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-lib/odata-api/pom.xml b/odata2-lib/odata-api/pom.xml index d315de5..c817be6 100644 --- a/odata2-lib/odata-api/pom.xml +++ b/odata2-lib/odata-api/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.apache.olingo</groupId> <artifactId>olingo-odata2-lib</artifactId> - <version>2.0.0</version> + <version>2.0.0-android-01</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/387cdd2a/odata2-lib/odata-core/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-lib/odata-core/pom.xml b/odata2-lib/odata-core/pom.xml index 4a59835..a187feb 100644 --- a/odata2-lib/odata-core/pom.xml +++ b/odata2-lib/odata-core/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.apache.olingo</groupId> <artifactId>olingo-odata2-lib</artifactId> - <version>2.0.0</version> + <version>2.0.0-android-01</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/387cdd2a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntryConsumer.java ---------------------------------------------------------------------- diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntryConsumer.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntryConsumer.java index d911326..344577b 100644 --- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntryConsumer.java +++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntryConsumer.java @@ -212,7 +212,7 @@ public class XmlEntryConsumer { setETag(reader); } - private void setETag(final XMLStreamReader reader) { + private void setETag(final XMLStreamReader reader) throws XMLStreamException { final String etag = reader.getAttributeValue(Edm.NAMESPACE_M_2007_08, FormatXml.M_ETAG); entryMetadata.setEtag(etag); } http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/387cdd2a/odata2-lib/odata-fit/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-lib/odata-fit/pom.xml b/odata2-lib/odata-fit/pom.xml index f4b9086..8cb2dc1 100644 --- a/odata2-lib/odata-fit/pom.xml +++ b/odata2-lib/odata-fit/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.apache.olingo</groupId> <artifactId>olingo-odata2-lib</artifactId> - <version>2.0.0</version> + <version>2.0.0-android-01</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/387cdd2a/odata2-lib/odata-ref/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-lib/odata-ref/pom.xml b/odata2-lib/odata-ref/pom.xml index 1280ef4..77f2ac2 100644 --- a/odata2-lib/odata-ref/pom.xml +++ b/odata2-lib/odata-ref/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.apache.olingo</groupId> <artifactId>olingo-odata2-lib</artifactId> - <version>2.0.0</version> + <version>2.0.0-android-01</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/387cdd2a/odata2-lib/odata-testutil/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-lib/odata-testutil/pom.xml b/odata2-lib/odata-testutil/pom.xml index 292bfbb..1d22897 100644 --- a/odata2-lib/odata-testutil/pom.xml +++ b/odata2-lib/odata-testutil/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.olingo</groupId> <artifactId>olingo-odata2-lib</artifactId> - <version>2.0.0</version> + <version>2.0.0-android-01</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/387cdd2a/odata2-lib/odata-web/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-lib/odata-web/pom.xml b/odata2-lib/odata-web/pom.xml index dc3f69d..2d611a3 100644 --- a/odata2-lib/odata-web/pom.xml +++ b/odata2-lib/odata-web/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.apache.olingo</groupId> <artifactId>olingo-odata2-lib</artifactId> - <version>2.0.0</version> + <version>2.0.0-android-01</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/387cdd2a/odata2-lib/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-lib/pom.xml b/odata2-lib/pom.xml index 88c2fb8..ab4dcf1 100644 --- a/odata2-lib/pom.xml +++ b/odata2-lib/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.olingo</groupId> <artifactId>olingo-odata2-parent</artifactId> - <version>2.0.0</version> + <version>2.0.0-android-01</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/387cdd2a/odata2-sample/cars-annotation-archetype/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-sample/cars-annotation-archetype/pom.xml b/odata2-sample/cars-annotation-archetype/pom.xml index aed56e4..a5810fd 100644 --- a/odata2-sample/cars-annotation-archetype/pom.xml +++ b/odata2-sample/cars-annotation-archetype/pom.xml @@ -16,13 +16,13 @@ <groupId>org.apache.olingo</groupId> <artifactId>olingo-odata2-sample-cars-annotation-archetype</artifactId> <name>${project.artifactId}</name> - <version>2.0.0</version> + <version>2.0.0-android-01</version> <packaging>maven-archetype</packaging> <parent> <groupId>org.apache.olingo</groupId> <artifactId>olingo-odata2-sample</artifactId> - <version>2.0.0</version> + <version>2.0.0-android-01</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/387cdd2a/odata2-sample/cars-jpa-archetype/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-sample/cars-jpa-archetype/pom.xml b/odata2-sample/cars-jpa-archetype/pom.xml index ed63eb3..7e85c8b 100644 --- a/odata2-sample/cars-jpa-archetype/pom.xml +++ b/odata2-sample/cars-jpa-archetype/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.olingo</groupId> <artifactId>olingo-odata2-sample</artifactId> - <version>2.0.0</version> + <version>2.0.0-android-01</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/387cdd2a/odata2-sample/cars-service-archetype/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-sample/cars-service-archetype/pom.xml b/odata2-sample/cars-service-archetype/pom.xml index 31fcce5..783ded7 100644 --- a/odata2-sample/cars-service-archetype/pom.xml +++ b/odata2-sample/cars-service-archetype/pom.xml @@ -24,14 +24,14 @@ <groupId>org.apache.olingo</groupId> <artifactId>olingo-odata2-sample-cars-service-archetype</artifactId> <name>${project.artifactId}</name> - <version>2.0.0</version> + <version>2.0.0-android-01</version> <packaging>maven-archetype</packaging> <parent> <groupId>org.apache.olingo</groupId> <artifactId>olingo-odata2-sample</artifactId> - <version>2.0.0</version> + <version>2.0.0-android-01</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/387cdd2a/odata2-sample/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-sample/pom.xml b/odata2-sample/pom.xml index afa0d71..a919e97 100644 --- a/odata2-sample/pom.xml +++ b/odata2-sample/pom.xml @@ -15,7 +15,7 @@ <parent> <groupId>org.apache.olingo</groupId> <artifactId>olingo-odata2-parent</artifactId> - <version>2.0.0</version> + <version>2.0.0-android-01</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/387cdd2a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index cdfae6c..4d66b0a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- 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 +<!-- 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. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> @@ -12,7 +12,7 @@ <groupId>org.apache.olingo</groupId> <artifactId>olingo-odata2-parent</artifactId> - <version>2.0.0</version> + <version>2.0.0-android-01</version> <packaging>pom</packaging> <name>${project.artifactId}</name> @@ -426,7 +426,7 @@ <url>https://oss.sonatype.org/content/groups/staging</url> </repository> </repositories> - + <dependencyManagement> <dependencies> <dependency>
