Apache
/
olingo-odata4
mirror of https://github.com/apache/olingo-odata4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'OLINGO-1600-upgrade' into upgrade/jdk-and-jakarta

This commit is contained in:
mibo 2023-11-06 20:57:26 +01:00
parent 6c8ebc32ad 7b8f05659e
commit 1ab7ecdc41
No known key found for this signature in database
GPG Key ID: FAF8A1C815AB5637
54 changed files with 205 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/android-lib/pom.xml vendored
View File

@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-dist</artifactId>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
dist/client-lib/pom.xml vendored
View File

@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-dist</artifactId>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
dist/javadoc/pom.xml vendored
View File

@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-dist</artifactId>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
dist/pom.xml vendored
View File

@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-parent</artifactId>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
dist/server-lib-ext/pom.xml vendored
View File

@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-dist</artifactId>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
dist/server-lib/pom.xml vendored
View File

@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-dist</artifactId>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
ext/client-android/pom.xml
View File

@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-ext</artifactId>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
ext/client-proxy/pom.xml
View File

@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-ext</artifactId>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
ext/karaf/karaf-features/pom.xml
View File

@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-karaf</artifactId>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<build>

2
ext/karaf/karaf-fit/pom.xml
View File

@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-karaf</artifactId>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<dependencies>

2
ext/karaf/karaf-fit/src/test/java/org/apache/olingo/osgi/itests/server/CarServiceTest.java
View File

@ -96,7 +96,7 @@ public class CarServiceTest extends OlingoOSGiTestSupport {
return new Option[] {
olingoBaseConfig(),
features(olingoUrl, "olingo-server", "olingo-client"),
mavenBundle("org.apache.olingo", "odata-server-osgi-sample", "4.10.0-SNAPSHOT"),
mavenBundle("org.apache.olingo", "odata-server-osgi-sample", "5.0.0-SNAPSHOT-RC01"),
logLevel(LogLevel.INFO)
};
}

2
ext/karaf/pom.xml
View File

@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-ext</artifactId>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
ext/pojogen-maven-plugin/pom.xml
View File

@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-ext</artifactId>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
ext/pom.xml
View File

@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-parent</artifactId>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
fit/pom.xml
View File

@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-parent</artifactId>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<properties>

2
lib/client-api/pom.xml
View File

@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-lib</artifactId>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
lib/client-core/pom.xml
View File

@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-lib</artifactId>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

3
lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/JsonEntityDeserializer.java
View File

@ -226,6 +226,9 @@ public class JsonEntityDeserializer extends JsonDeserializer {
toRemove.add(link.getTitle() + "@" + annotation.getTerm());
}
}
if (tree.get(link.getTitle() + Constants.JSON_TYPE) != null) {
toRemove.add(link.getTitle() + Constants.JSON_TYPE);
}
}
tree.remove(toRemove);

2
lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ODataBinderImpl.java
View File

@ -852,7 +852,7 @@ public class ODataBinderImpl implements ODataBinder {
}
} else if (valuable.isEnum()) {
value = client.getObjectFactory().newEnumValue(type == null ? null : type.toString(),
valuable.asEnum().toString());
valuable.isNull() ? null : valuable.asEnum().toString());
} else if (valuable.isComplex()) {
final ClientComplexValue lcValue =
client.getObjectFactory().newComplexValue(type == null ? null : type.toString());

59
lib/client-core/src/test/java/org/apache/olingo/client/core/JsonDeserializerTest.java Normal file
View File

@ -0,0 +1,59 @@
/*
* 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;
import org.apache.olingo.client.api.data.ResWrap;
import org.apache.olingo.client.api.domain.ClientEntity;
import org.apache.olingo.client.api.domain.ClientLink;
import org.apache.olingo.client.api.serialization.ODataDeserializerException;
import org.apache.olingo.client.core.serialization.ClientODataDeserializerImpl;
import org.apache.olingo.client.core.serialization.ODataBinderImpl;
import org.apache.olingo.commons.api.data.Entity;
import org.apache.olingo.commons.api.format.ContentType;
import org.junit.Test;
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
import static org.junit.Assert.assertEquals;
public class JsonDeserializerTest {
/**
* Without the attached fix this test with the corresponding resource json will throw
* a {@link java.lang.IllegalArgumentException} with the message: 'Cannot build a primitive value for Stream'
* this is because the <streamproptitle>@odata.type key is incorrectly filtered by the previous implementation
*/
@Test
public void testDeserializationStreamProperties() throws ODataDeserializerException {
try (InputStream inputStream = getClass().getResourceAsStream("Employee.json")) {
ClientODataDeserializerImpl clientODataDeserializer =
new ClientODataDeserializerImpl(false, ContentType.JSON_FULL_METADATA);
ResWrap<Entity> entity = clientODataDeserializer.toEntity(inputStream);
ODataBinderImpl oDataBinder = new ODataBinderImpl(ODataClientFactory.getClient());
ClientEntity oDataEntity = oDataBinder.getODataEntity(entity);
List<ClientLink> mediaEditLinks = oDataEntity.getMediaEditLinks();
assertEquals(2, mediaEditLinks.size());
} catch (IOException e) {
throw new RuntimeException(e);
}
}
}

19
lib/client-core/src/test/resources/org/apache/olingo/client/core/Employee.json Normal file
View File

@ -0,0 +1,19 @@
{
"@odata.context": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/$metadata#Employees/$entity",
"@odata.etag": "W/\"f557984846c2e312e155c9e8bede6186c4be9094b4edec2f5f32fe2a813f0cf1\"",
"@odata.id": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Employees(1)",
"Id@odata.type": "#Int64",
"Id": 1,
"FirstName": "Paul",
"LastName": "Mayor",
"DateOfBirth@odata.type": "#Date",
"DateOfBirth": "1973-08-17",
"Picture@odata.type": "#Stream",
"Picture@odata.mediaEtag": "W/\"32d1efc04f8aa14e828fa67d5161fa3664366e089b187402732a7c054ea2bc26\"",
"Picture@odata.mediaContentType": "image/jpeg",
"Picture@odata.mediaEditLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Employees(1)/Picture",
"Thumbnail@odata.type": "#Stream",
"Thumbnail@odata.mediaEtag": "W/\"7234c31b74af36899934883c9ff09ab0c70f8d0efdab9ac1a90010074f812931\"",
"Thumbnail@odata.mediaContentType": "image/jpeg",
"Thumbnail@odata.mediaEditLink": "http://odatae2etest.azurewebsites.net/javatest/DefaultService/Employees(1)/Thumbnail"
}

2
lib/commons-api/pom.xml
View File

@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-lib</artifactId>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
lib/commons-core/pom.xml
View File

@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-lib</artifactId>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

10
lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTypeInfo.java
View File

@ -109,7 +109,15 @@ public class EdmTypeInfo {
fullQualifiedName = new FullQualifiedName(namespace, typeName);
primitiveType = EdmPrimitiveTypeKind.getByName(typeName);
try {
if (namespace.equals("Edm")) {
primitiveType = EdmPrimitiveTypeKind.valueOf(typeName);
} else {
primitiveType = EdmPrimitiveTypeKind.valueOf(namespace + "." + typeName);
}
} catch (final IllegalArgumentException e) {
primitiveType = null;
}
if (primitiveType == null && edm != null) {
typeDefinition = edm.getTypeDefinition(fullQualifiedName);

2
lib/pom.xml
View File

@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-parent</artifactId>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
lib/server-api/pom.xml
View File

@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-lib</artifactId>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
lib/server-core-ext/pom.xml
View File

@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-lib</artifactId>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<dependencies>

2
lib/server-core/pom.xml
View File

@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-lib</artifactId>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

11
lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializer.java
View File

@ -37,6 +37,7 @@ import org.apache.olingo.commons.api.data.AbstractEntityCollection;
import org.apache.olingo.commons.api.data.ComplexValue;
import org.apache.olingo.commons.api.data.ContextURL;
import org.apache.olingo.commons.api.data.Entity;
import org.apache.olingo.commons.api.data.EntityCollection;
import org.apache.olingo.commons.api.data.EntityIterator;
import org.apache.olingo.commons.api.data.Link;
import org.apache.olingo.commons.api.data.Linked;
@ -654,12 +655,18 @@ public class ODataJsonSerializer extends AbstractODataSerializer {
json.writeStartArray();
json.writeEndArray();
} else {
final EntityCollection inlineEntitySet = navigationLink.getInlineEntitySet();
if (innerCount != null && innerCount.getValue()) {
writeInlineCount(property.getName(), navigationLink.getInlineEntitySet().getCount(), json);
writeInlineCount(property.getName(), inlineEntitySet.getCount(), json);
}
json.writeFieldName(property.getName());
writeEntitySet(metadata, property.getType(), navigationLink.getInlineEntitySet(), innerExpand, toDepth,
writeEntitySet(metadata, property.getType(), inlineEntitySet, innerExpand, toDepth,
innerSelect, writeOnlyRef, ancestors, name, json);
final URI nextLink = inlineEntitySet.getNext();
if (nextLink != null) {
json.writeStringField(navigationLink.getTitle() + constants.getNextLink(), nextLink.toASCIIString());
}
}
}
} else {

2
lib/server-tecsvc/pom.xml
View File

@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-lib</artifactId>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
lib/server-test/pom.xml
View File

@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-lib</artifactId>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

42
lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java
View File

@ -25,9 +25,11 @@ import java.io.InputStream;
import java.net.URI;
import java.nio.ByteBuffer;
import java.nio.channels.WritableByteChannel;
import java.nio.charset.Charset;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Iterator;
@ -92,6 +94,7 @@ import org.apache.olingo.server.tecsvc.MetadataETagSupport;
import org.apache.olingo.server.tecsvc.data.DataProvider;
import org.apache.olingo.server.tecsvc.provider.EdmTechProvider;
import org.hamcrest.CoreMatchers;
import org.hamcrest.Matcher;
import org.junit.Assert;
import org.junit.Test;
import org.mockito.Mockito;
@ -1700,6 +1703,45 @@ public class ODataJsonSerializerTest {
resultString);
}
@Test
public void expandWithNextLink() throws Exception {
final EdmEntitySet edmEntitySet = entityContainer.getEntitySet("ESTwoPrim");
final EdmEntityType entityType = edmEntitySet.getEntityType();
final EdmEntitySet innerEntitySet = entityContainer.getEntitySet("ESAllPrim");
final Entity entity = data.readAll(edmEntitySet).getEntities().get(0);
final EntityCollection innerEntities = data.readAll(innerEntitySet);
innerEntities.setNext(URI.create("/next"));
final ExpandItem expandItem = ExpandSelectMock.mockExpandItem(edmEntitySet, "NavPropertyETAllPrimMany");
final List<ExpandItem> expandItems = new ArrayList<>();
expandItems.add(expandItem);
final ExpandOption expandOption = ExpandSelectMock.mockExpandOption(expandItems);
final Link link = new Link();
link.setTitle("NavPropertyETAllPrimMany");
link.setInlineEntitySet(innerEntities);
entity.getNavigationLinks().add(link);
final ContextURL build = ContextURL.with().entitySet(edmEntitySet)
.selectList(helper.buildContextURLSelectList(entityType, expandOption, null))
.suffix(Suffix.ENTITY).build();
final String resultString = IOUtils.toString(serializerV401
.entity(metadata, entityType, entity,
EntitySerializerOptions.with()
.contextURL(build)
.expand(expandOption)
.build()).getContent(), Charset.defaultCharset());
final Matcher<String> stringMatcher = CoreMatchers.endsWith("}],"
+ "\"NavPropertyETAllPrimMany@nextLink\":\"/next\"}");
final boolean matchResult = stringMatcher.matches(resultString);
Assert.assertTrue(matchResult);
}
@Test
public void primitiveProperty() throws Exception {
final EdmEntitySet edmEntitySet = entityContainer.getEntitySet("ESAllPrim");

2
pom.xml
View File

@ -25,7 +25,7 @@
<groupId>org.apache.olingo</groupId>
<artifactId>odata-parent</artifactId>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Olingo-OData</name>

2
samples/client/pom.xml
View File

@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-samples</artifactId>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
samples/osgi/server/pom.xml
View File

@ -30,7 +30,7 @@ under the License.
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-samples</artifactId>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>

2
samples/pom.xml
View File

@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-parent</artifactId>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

2
samples/server/pom.xml
View File

@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-samples</artifactId>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

4
samples/tutorials/p0_all/pom.xml
View File

@ -25,7 +25,7 @@
<groupId>my.group.id</groupId>
<artifactId>DemoService</artifactId>
<packaging>war</packaging>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<name>${project.artifactId} Webapp</name>
@ -35,7 +35,7 @@
<properties>
<javax.version>2.5</javax.version>
<odata.version>4.10.0-SNAPSHOT</odata.version>
<odata.version>5.0.0-SNAPSHOT</odata.version>
<slf4j.version>1.7.7</slf4j.version>
</properties>

4
samples/tutorials/p10_media/pom.xml
View File

@ -25,7 +25,7 @@
<groupId>my.group.id</groupId>
<artifactId>DemoService-Media</artifactId>
<packaging>war</packaging>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<name>${project.artifactId}-Webapp</name>
@ -35,7 +35,7 @@
<properties>
<javax.version>2.5</javax.version>
<odata.version>4.10.0-SNAPSHOT</odata.version>
<odata.version>5.0.0-SNAPSHOT</odata.version>
<slf4j.version>1.7.7</slf4j.version>
</properties>

4
samples/tutorials/p11_batch/pom.xml
View File

@ -25,13 +25,13 @@
<groupId>my.group.id</groupId>
<artifactId>DemoService-Batch</artifactId>
<packaging>war</packaging>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<name>${project.artifactId}-Webapp</name>
<properties>
<javax.version>2.5</javax.version>
<odata.version>4.10.0-SNAPSHOT</odata.version>
<odata.version>5.0.0-SNAPSHOT</odata.version>
<slf4j.version>1.7.7</slf4j.version>
<project.source>17</project.source>
<compiler.plugin.version>3.2</compiler.plugin.version>

4
samples/tutorials/p12_deep_insert/pom.xml
View File

@ -25,7 +25,7 @@
<groupId>my.group.id</groupId>
<artifactId>DemoService-DeepInsert</artifactId>
<packaging>war</packaging>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<name>${project.artifactId}-Webapp</name>
@ -35,7 +35,7 @@
<properties>
<javax.version>2.5</javax.version>
<odata.version>4.10.0-SNAPSHOT</odata.version>
<odata.version>5.0.0-SNAPSHOT</odata.version>
<slf4j.version>1.7.7</slf4j.version>
</properties>

4
samples/tutorials/p12_deep_insert_preparation/pom.xml
View File

@ -25,7 +25,7 @@
<groupId>my.group.id</groupId>
<artifactId>DemoService-DeepInsertPreparation</artifactId>
<packaging>war</packaging>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<name>${project.artifactId}-Webapp</name>
@ -35,7 +35,7 @@
<properties>
<javax.version>2.5</javax.version>
<odata.version>4.10.0-SNAPSHOT</odata.version>
<odata.version>5.0.0-SNAPSHOT</odata.version>
<slf4j.version>1.7.7</slf4j.version>
</properties>

4
samples/tutorials/p1_read/pom.xml
View File

@ -25,7 +25,7 @@
<groupId>my.group.id</groupId>
<artifactId>DemoService-Read</artifactId>
<packaging>war</packaging>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<name>${project.artifactId}-Webapp</name>
@ -35,7 +35,7 @@
<properties>
<javax.version>2.5</javax.version>
<odata.version>4.10.0-SNAPSHOT</odata.version>
<odata.version>5.0.0-SNAPSHOT</odata.version>
<slf4j.version>1.7.7</slf4j.version>
</properties>

4
samples/tutorials/p2_readep/pom.xml
View File

@ -9,7 +9,7 @@
<groupId>my.group.id</groupId>
<artifactId>DemoService-ReadEp</artifactId>
<packaging>war</packaging>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<name>${project.artifactId}-Webapp</name>
@ -19,7 +19,7 @@
<properties>
<javax.version>2.5</javax.version>
<odata.version>4.10.0-SNAPSHOT</odata.version>
<odata.version>5.0.0-SNAPSHOT</odata.version>
<slf4j.version>1.7.7</slf4j.version>
</properties>

4
samples/tutorials/p3_write/pom.xml
View File

@ -25,7 +25,7 @@
<groupId>my.group.id</groupId>
<artifactId>DemoService-Write</artifactId>
<packaging>war</packaging>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<name>${project.artifactId}-Webapp</name>
@ -35,7 +35,7 @@
<properties>
<javax.version>2.5</javax.version>
<odata.version>4.10.0-SNAPSHOT</odata.version>
<odata.version>5.0.0-SNAPSHOT</odata.version>
<slf4j.version>1.7.7</slf4j.version>
</properties>

4
samples/tutorials/p4_navigation/pom.xml
View File

@ -25,7 +25,7 @@
<groupId>my.group.id</groupId>
<artifactId>DemoService-Navigation</artifactId>
<packaging>war</packaging>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<name>${project.artifactId}-Webapp</name>
@ -35,7 +35,7 @@
<properties>
<javax.version>2.5</javax.version>
<odata.version>4.10.0-SNAPSHOT</odata.version>
<odata.version>5.0.0-SNAPSHOT</odata.version>
<slf4j.version>1.7.7</slf4j.version>
</properties>

4
samples/tutorials/p5_queryoptions-tcs/pom.xml
View File

@ -25,7 +25,7 @@
<groupId>my.group.id</groupId>
<artifactId>DemoService-QueryOptions-TCS</artifactId>
<packaging>war</packaging>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<name>${project.artifactId}-Webapp</name>
@ -35,7 +35,7 @@
<properties>
<javax.version>2.5</javax.version>
<odata.version>4.10.0-SNAPSHOT</odata.version>
<odata.version>5.0.0-SNAPSHOT</odata.version>
<slf4j.version>1.7.7</slf4j.version>
</properties>

4
samples/tutorials/p6_queryoptions-es/pom.xml
View File

@ -25,7 +25,7 @@
<groupId>my.group.id</groupId>
<artifactId>DemoService-QueryOptions-ES</artifactId>
<packaging>war</packaging>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<name>${project.artifactId}-Webapp</name>
@ -35,7 +35,7 @@
<properties>
<javax.version>2.5</javax.version>
<odata.version>4.10.0-SNAPSHOT</odata.version>
<odata.version>5.0.0-SNAPSHOT</odata.version>
<slf4j.version>1.7.7</slf4j.version>
</properties>

4
samples/tutorials/p7_queryoptions-o/pom.xml
View File

@ -25,7 +25,7 @@
<groupId>my.group.id</groupId>
<artifactId>DemoService-QueryOptions-O</artifactId>
<packaging>war</packaging>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<name>${project.artifactId}-Webapp</name>
@ -35,7 +35,7 @@
<properties>
<javax.version>2.5</javax.version>
<odata.version>4.10.0-SNAPSHOT</odata.version>
<odata.version>5.0.0-SNAPSHOT</odata.version>
<slf4j.version>1.7.7</slf4j.version>
</properties>

4
samples/tutorials/p8_queryoptions-f/pom.xml
View File

@ -25,7 +25,7 @@
<groupId>my.group.id</groupId>
<artifactId>DemoService-QueryOptions-F</artifactId>
<packaging>war</packaging>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<name>${project.artifactId} Webapp</name>
@ -35,7 +35,7 @@
<properties>
<javax.version>2.5</javax.version>
<odata.version>4.10.0-SNAPSHOT</odata.version>
<odata.version>5.0.0-SNAPSHOT</odata.version>
<slf4j.version>1.7.7</slf4j.version>
</properties>

4
samples/tutorials/p9_action/pom.xml
View File

@ -25,7 +25,7 @@
<groupId>my.group.id</groupId>
<artifactId>DemoService-Action</artifactId>
<packaging>war</packaging>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<name>${project.artifactId}-Webapp</name>
@ -35,7 +35,7 @@
<properties>
<javax.version>2.5</javax.version>
<odata.version>4.10.0-SNAPSHOT</odata.version>
<odata.version>5.0.0-SNAPSHOT</odata.version>
<slf4j.version>1.7.7</slf4j.version>
</properties>

4
samples/tutorials/p9_action_preparation/pom.xml
View File

@ -25,7 +25,7 @@
<groupId>my.group.id</groupId>
<artifactId>DemoService-ActionPreparation</artifactId>
<packaging>war</packaging>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<name>${project.artifactId}-Webapp</name>
@ -35,7 +35,7 @@
<properties>
<javax.version>2.5</javax.version>
<odata.version>4.10.0-SNAPSHOT</odata.version>
<odata.version>5.0.0-SNAPSHOT</odata.version>
<slf4j.version>1.7.7</slf4j.version>
</properties>

4
samples/tutorials/pe_streaming/pom.xml
View File

@ -9,7 +9,7 @@
<groupId>my.group.id</groupId>
<artifactId>DemoService-Streaming</artifactId>
<packaging>war</packaging>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<name>${project.artifactId}-Webapp</name>
@ -19,7 +19,7 @@
<properties>
<javax.version>2.5</javax.version>
<odata.version>4.10.0-SNAPSHOT</odata.version>
<odata.version>5.0.0-SNAPSHOT</odata.version>
<slf4j.version>1.7.7</slf4j.version>
</properties>

2
samples/tutorials/pom.xml
View File

@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-samples</artifactId>
<version>4.10.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>