Repository: olingo-odata2 Updated Branches: refs/heads/OLINGO-231_PocForAndroid cb1ba4685 -> 387cdd2af
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/46d83c8e/odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/EdmTestProvider.java ---------------------------------------------------------------------- diff --git a/odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/EdmTestProvider.java b/odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/EdmTestProvider.java index 6aafaaa..3119aca 100644 --- a/odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/EdmTestProvider.java +++ b/odata2-lib/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/EdmTestProvider.java @@ -259,7 +259,7 @@ public class EdmTestProvider extends EdmProvider { .setHasStream(true) .setKey(getKey("EmployeeId")) .setNavigationProperties(navigationProperties) - .setMapping(new Mapping().setMimeType("getImageType")); + .setMapping(new Mapping().setMediaResourceMimeTypeKey("getImageType")); } else if (ENTITY_TYPE_1_BASE.getName().equals(edmFQName.getName())) { final List<Property> properties = new ArrayList<Property>(); @@ -309,7 +309,7 @@ public class EdmTestProvider extends EdmProvider { .setBaseType(ENTITY_TYPE_1_1) .setHasStream(true) .setNavigationProperties(navigationProperties) - .setMapping(new Mapping().setMimeType("getImageType")); + .setMapping(new Mapping().setMediaResourceMimeTypeKey("getImageType")); } else if (ENTITY_TYPE_1_5.getName().equals(edmFQName.getName())) { final List<Property> properties = new ArrayList<Property>(); @@ -343,7 +343,7 @@ public class EdmTestProvider extends EdmProvider { new CustomizableFeedMappings().setFcTargetPath(EdmTargetPath.SYNDICATION_AUTHORURI)) .setMapping(new Mapping().setInternalName("getImageUri"))); properties.add(new SimpleProperty().setName("Image").setType(EdmSimpleTypeKind.Binary) - .setMapping(new Mapping().setMimeType("getType"))); + .setMapping(new Mapping().setMediaResourceMimeTypeKey("getType"))); properties.add(new SimpleProperty().setName("BinaryData").setType(EdmSimpleTypeKind.Binary) .setFacets(new Facets().setNullable(true)) .setMimeType("image/jpeg")); @@ -359,7 +359,7 @@ public class EdmTestProvider extends EdmProvider { .setProperties(properties) .setHasStream(true) .setKey(getKey("Id", "Type")) - .setMapping(new Mapping().setMimeType("getType")); + .setMapping(new Mapping().setMediaResourceMimeTypeKey("getType")); } } http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/46d83c8e/odata2-lib/odata-web/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-lib/odata-web/pom.xml b/odata2-lib/odata-web/pom.xml index 0f6e5e7..dc3f69d 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>1.3.0-SNAPSHOT</version> + <version>2.0.0</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/46d83c8e/odata2-lib/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-lib/pom.xml b/odata2-lib/pom.xml index 933db60..88c2fb8 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>1.3.0-SNAPSHOT</version> + <version>2.0.0</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/46d83c8e/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 d565f61..aed56e4 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>1.3.0-SNAPSHOT</version> + <version>2.0.0</version> <packaging>maven-archetype</packaging> <parent> <groupId>org.apache.olingo</groupId> <artifactId>olingo-odata2-sample</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>2.0.0</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/46d83c8e/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml b/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml index 73e58d6..6ae10dd 100644 --- a/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml +++ b/odata2-sample/cars-annotation-archetype/src/main/resources/archetype-resources/pom.xml @@ -32,7 +32,7 @@ <version.servlet-api>2.5</version.servlet-api> <version.jaxrs-api>2.0-m10</version.jaxrs-api> <version.slf4j>1.7.1</version.slf4j> - <version.olingo>1.3.0-SNAPSHOT</version.olingo> + <version.olingo>2.0.0</version.olingo> </properties> <build> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/46d83c8e/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 6089703..ed63eb3 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>1.3.0-SNAPSHOT</version> + <version>2.0.0</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/46d83c8e/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/pom.xml b/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/pom.xml index 39628c0..fc307b7 100644 --- a/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/pom.xml +++ b/odata2-sample/cars-jpa-archetype/src/main/resources/archetype-resources/pom.xml @@ -20,7 +20,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <version.cxf>2.7.6</version.cxf> - <version.olingo>1.3.0-SNAPSHOT</version.olingo> + <version.olingo>2.0.0</version.olingo> <version.eclipselink>2.5.1</version.eclipselink> <version.javax.persistence>2.0.5</version.javax.persistence> </properties> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/46d83c8e/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 e6f434e..31fcce5 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>1.3.0-SNAPSHOT</version> + <version>2.0.0</version> <packaging>maven-archetype</packaging> <parent> <groupId>org.apache.olingo</groupId> <artifactId>olingo-odata2-sample</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>2.0.0</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/46d83c8e/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml b/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml index 83e7237..bff8d75 100644 --- a/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml +++ b/odata2-sample/cars-service-archetype/src/main/resources/archetype-resources/pom.xml @@ -20,7 +20,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <version.cxf>2.7.6</version.cxf> <version.slf4j>1.7.1</version.slf4j> - <version.olingo>1.3.0-SNAPSHOT</version.olingo> + <version.olingo>2.0.0</version.olingo> </properties> <build> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/46d83c8e/odata2-sample/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-sample/pom.xml b/odata2-sample/pom.xml index ce867ab..afa0d71 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>1.3.0-SNAPSHOT</version> + <version>2.0.0</version> <relativePath>..</relativePath> </parent> @@ -24,4 +24,4 @@ <module>cars-annotation-archetype</module> <module>cars-jpa-archetype</module> </modules> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/46d83c8e/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 3460f2b..cdfae6c 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ <groupId>org.apache.olingo</groupId> <artifactId>olingo-odata2-parent</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>2.0.0</version> <packaging>pom</packaging> <name>${project.artifactId}</name>
