Repository: olingo-odata2 Updated Branches: refs/heads/OLINGO-JPA-Fixes [created] 67d646dca
[OLINGO-414] Fixed filter for to one navigation Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/67d646dc Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/67d646dc Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/67d646dc Branch: refs/heads/OLINGO-JPA-Fixes Commit: 67d646dca0a4f1ebc82620ac09353ade329be7cd Parents: 5974655 Author: mibo <[email protected]> Authored: Sat Jun 18 07:29:23 2016 +0200 Committer: mibo <[email protected]> Committed: Sat Jun 18 07:29:23 2016 +0200 ---------------------------------------------------------------------- .../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 +- .../processor/core/ODataExpressionParser.java | 52 +++++++------------- 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 +- 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 +- .../main/resources/archetype-resources/pom.xml | 2 +- odata2-sample/cars-jpa-archetype/pom.xml | 2 +- .../main/resources/archetype-resources/pom.xml | 2 +- odata2-sample/cars-service-archetype/pom.xml | 4 +- .../main/resources/archetype-resources/pom.xml | 2 +- odata2-sample/pom.xml | 2 +- odata2-spring/pom.xml | 2 +- pom.xml | 2 +- 34 files changed, 52 insertions(+), 70 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/67d646dc/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 8e671ab..f181005 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.7-RC01</version> + <version>2.0.8-SNAPSHOT</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/67d646dc/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 9aa5e1e..3ea6fe1 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.7-RC01</version> + <version>2.0.8-SNAPSHOT</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/67d646dc/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 c81a6f7..92dc985 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.7-RC01</version> + <version>2.0.8-SNAPSHOT</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/67d646dc/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 bf7eac7..d3ebeb7 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.7-RC01</version> + <version>2.0.8-SNAPSHOT</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/67d646dc/odata2-annotation-processor/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-annotation-processor/pom.xml b/odata2-annotation-processor/pom.xml index 19a913f..21bf5d2 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.7-RC01</version> + <version>2.0.8-SNAPSHOT</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/67d646dc/odata2-dist/janos/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-dist/janos/pom.xml b/odata2-dist/janos/pom.xml index afc43bc..f5630e2 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.7-RC01</version> + <version>2.0.8-SNAPSHOT</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/67d646dc/odata2-dist/javadoc/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-dist/javadoc/pom.xml b/odata2-dist/javadoc/pom.xml index d727712..03ec5d6 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.7-RC01</version> + <version>2.0.8-SNAPSHOT</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/67d646dc/odata2-dist/jpa/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-dist/jpa/pom.xml b/odata2-dist/jpa/pom.xml index c1d60a0..ad634cd 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.7-RC01</version> + <version>2.0.8-SNAPSHOT</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/67d646dc/odata2-dist/lib/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-dist/lib/pom.xml b/odata2-dist/lib/pom.xml index d24df72..1d692a8 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.7-RC01</version> + <version>2.0.8-SNAPSHOT</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/67d646dc/odata2-dist/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-dist/pom.xml b/odata2-dist/pom.xml index 19af37b..a4b9525 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.7-RC01</version> + <version>2.0.8-SNAPSHOT</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/67d646dc/odata2-dist/ref/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-dist/ref/pom.xml b/odata2-dist/ref/pom.xml index 5b877e6..916fc47 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.7-RC01</version> + <version>2.0.8-SNAPSHOT</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/67d646dc/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 7f791f5..e364f10 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.7-RC01</version> + <version>2.0.8-SNAPSHOT</version> <relativePath>../</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/67d646dc/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 5daf3e1..663a631 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.7-RC01</version> + <version>2.0.8-SNAPSHOT</version> <relativePath>../</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/67d646dc/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataExpressionParser.java ---------------------------------------------------------------------- diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataExpressionParser.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataExpressionParser.java index 79905ce..0f4b7ca 100644 --- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataExpressionParser.java +++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataExpressionParser.java @@ -18,41 +18,19 @@ ******************************************************************************/ package org.apache.olingo.odata2.jpa.processor.core; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Iterator; -import java.util.List; - -import org.apache.olingo.odata2.api.edm.EdmException; -import org.apache.olingo.odata2.api.edm.EdmLiteral; -import org.apache.olingo.odata2.api.edm.EdmLiteralKind; -import org.apache.olingo.odata2.api.edm.EdmMapping; -import org.apache.olingo.odata2.api.edm.EdmNavigationProperty; -import org.apache.olingo.odata2.api.edm.EdmProperty; -import org.apache.olingo.odata2.api.edm.EdmSimpleType; -import org.apache.olingo.odata2.api.edm.EdmSimpleTypeException; -import org.apache.olingo.odata2.api.edm.EdmSimpleTypeKind; -import org.apache.olingo.odata2.api.edm.EdmTyped; +import org.apache.olingo.odata2.api.edm.*; import org.apache.olingo.odata2.api.exception.ODataException; import org.apache.olingo.odata2.api.exception.ODataNotImplementedException; import org.apache.olingo.odata2.api.uri.KeyPredicate; -import org.apache.olingo.odata2.api.uri.expression.BinaryExpression; -import org.apache.olingo.odata2.api.uri.expression.BinaryOperator; -import org.apache.olingo.odata2.api.uri.expression.CommonExpression; -import org.apache.olingo.odata2.api.uri.expression.ExpressionKind; -import org.apache.olingo.odata2.api.uri.expression.FilterExpression; -import org.apache.olingo.odata2.api.uri.expression.LiteralExpression; -import org.apache.olingo.odata2.api.uri.expression.MemberExpression; -import org.apache.olingo.odata2.api.uri.expression.MethodExpression; -import org.apache.olingo.odata2.api.uri.expression.MethodOperator; -import org.apache.olingo.odata2.api.uri.expression.OrderByExpression; -import org.apache.olingo.odata2.api.uri.expression.OrderExpression; -import org.apache.olingo.odata2.api.uri.expression.PropertyExpression; -import org.apache.olingo.odata2.api.uri.expression.SortOrder; -import org.apache.olingo.odata2.api.uri.expression.UnaryExpression; +import org.apache.olingo.odata2.api.uri.expression.*; import org.apache.olingo.odata2.jpa.processor.api.exception.ODataJPARuntimeException; import org.apache.olingo.odata2.jpa.processor.api.jpql.JPQLStatement; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Iterator; +import java.util.List; + /** * This class contains utility methods for parsing the filter expressions built by core library from user OData Query. * @@ -441,14 +419,18 @@ public class ODataExpressionParser { private static String getPropertyName(final CommonExpression whereExpression) throws EdmException, ODataJPARuntimeException { - EdmTyped edmProperty = ((PropertyExpression) whereExpression).getEdmProperty(); + EdmTyped edmProperty = ((PropertyExpression) whereExpression).getEdmProperty(); + EdmMapping mapping; if (edmProperty instanceof EdmNavigationProperty) { - throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.FILTER_ON_NAVIGATION_NOT_SUPPORTED, null); + EdmNavigationProperty edmNavigationProperty = (EdmNavigationProperty) edmProperty; + mapping = edmNavigationProperty.getMapping(); + } else if(edmProperty instanceof EdmProperty) { + EdmProperty property = (EdmProperty) edmProperty; + mapping = property.getMapping(); + } else { + throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL, null); } - EdmProperty property = ((EdmProperty) edmProperty); - EdmMapping mapping = property.getMapping(); - String name = mapping != null ? mapping.getInternalName() : property.getName(); - return name; + return mapping != null ? mapping.getInternalName() : edmProperty.getName(); } } http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/67d646dc/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 1dbf32d..c94ce49 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.7-RC01</version> + <version>2.0.8-SNAPSHOT</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/67d646dc/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 342d3a3..3aa5e69 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.7-RC01</version> + <version>2.0.8-SNAPSHOT</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/67d646dc/odata2-jpa-processor/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-jpa-processor/pom.xml b/odata2-jpa-processor/pom.xml index 92b1d24..2873e26 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.7-RC01</version> + <version>2.0.8-SNAPSHOT</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/67d646dc/odata2-lib/odata-annotation/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-lib/odata-annotation/pom.xml b/odata2-lib/odata-annotation/pom.xml index 8ffd567..c8a65e6 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.7-RC01</version> + <version>2.0.8-SNAPSHOT</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/67d646dc/odata2-lib/odata-api/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-lib/odata-api/pom.xml b/odata2-lib/odata-api/pom.xml index 4d07455..7993a75 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.7-RC01</version> + <version>2.0.8-SNAPSHOT</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/67d646dc/odata2-lib/odata-core/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-lib/odata-core/pom.xml b/odata2-lib/odata-core/pom.xml index f5470e7..aa22e95 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.7-RC01</version> + <version>2.0.8-SNAPSHOT</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/67d646dc/odata2-lib/odata-fit/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-lib/odata-fit/pom.xml b/odata2-lib/odata-fit/pom.xml index 5af96b8..f4174d1 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.7-RC01</version> + <version>2.0.8-SNAPSHOT</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/67d646dc/odata2-lib/odata-ref/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-lib/odata-ref/pom.xml b/odata2-lib/odata-ref/pom.xml index 75efa52..2442b7e 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.7-RC01</version> + <version>2.0.8-SNAPSHOT</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/67d646dc/odata2-lib/odata-testutil/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-lib/odata-testutil/pom.xml b/odata2-lib/odata-testutil/pom.xml index 7fef62b..49f4660 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.7-RC01</version> + <version>2.0.8-SNAPSHOT</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/67d646dc/odata2-lib/odata-web/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-lib/odata-web/pom.xml b/odata2-lib/odata-web/pom.xml index e2bc4f2..fb0bec1 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.7-RC01</version> + <version>2.0.8-SNAPSHOT</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/67d646dc/odata2-lib/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-lib/pom.xml b/odata2-lib/pom.xml index 01239d1..32161f5 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.7-RC01</version> + <version>2.0.8-SNAPSHOT</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/67d646dc/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 3a72029..4c91fda 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.7-RC01</version> + <version>2.0.8-SNAPSHOT</version> <packaging>maven-archetype</packaging> <parent> <groupId>org.apache.olingo</groupId> <artifactId>olingo-odata2-sample</artifactId> - <version>2.0.7-RC01</version> + <version>2.0.8-SNAPSHOT</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/67d646dc/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 065fc19..541c03e 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>2.0.7-RC01</version.olingo> + <version.olingo>2.0.8-SNAPSHOT</version.olingo> </properties> <build> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/67d646dc/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 1d2379c..9eb7644 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.7-RC01</version> + <version>2.0.8-SNAPSHOT</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/67d646dc/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 66fe249..4f651df 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 @@ -23,7 +23,7 @@ <version.eclipselink>2.5.1</version.eclipselink> <version.javax.persistence>2.0.5</version.javax.persistence> <version.hsqldb>2.3.2</version.hsqldb> - <version.olingo>2.0.7-RC01</version.olingo> + <version.olingo>2.0.8-SNAPSHOT</version.olingo> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/67d646dc/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 c154b49..05ee1ff 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.7-RC01</version> + <version>2.0.8-SNAPSHOT</version> <packaging>maven-archetype</packaging> <parent> <groupId>org.apache.olingo</groupId> <artifactId>olingo-odata2-sample</artifactId> - <version>2.0.7-RC01</version> + <version>2.0.8-SNAPSHOT</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/67d646dc/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 554ff43..afa621d 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>2.0.7-RC01</version.olingo> + <version.olingo>2.0.8-SNAPSHOT</version.olingo> </properties> <build> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/67d646dc/odata2-sample/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-sample/pom.xml b/odata2-sample/pom.xml index aca079a..db899a7 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.7-RC01</version> + <version>2.0.8-SNAPSHOT</version> <relativePath>..</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/67d646dc/odata2-spring/pom.xml ---------------------------------------------------------------------- diff --git a/odata2-spring/pom.xml b/odata2-spring/pom.xml index d0550b3..54bd4b1 100755 --- a/odata2-spring/pom.xml +++ b/odata2-spring/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.olingo</groupId> <artifactId>olingo-odata2-parent</artifactId> - <version>2.0.7-SNAPSHOT</version> + <version>2.0.8-SNAPSHOT</version> </parent> <dependencies> http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/67d646dc/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 0e39e39..dd58057 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ <groupId>org.apache.olingo</groupId> <artifactId>olingo-odata2-parent</artifactId> - <version>2.0.7-RC01</version> + <version>2.0.8-SNAPSHOT</version> <packaging>pom</packaging> <name>${project.artifactId}</name>
