diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/AtomTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/AtomTest.java similarity index 96% rename from lib/client-core/src/test/java/org/apache/olingo/client/core/v4/AtomTest.java rename to lib/client-core/src/test/java/org/apache/olingo/client/core/AtomTest.java index 4618d3be5..9d5346b23 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/AtomTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/AtomTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.v4; +package org.apache.olingo.client.core; import static org.junit.Assert.assertTrue; @@ -31,7 +31,6 @@ import javax.xml.transform.stream.StreamSource; import org.apache.commons.io.IOUtils; import org.apache.olingo.client.api.ODataClient; -import org.apache.olingo.client.core.AtomLinksQualifier; import org.apache.olingo.commons.api.format.ContentType; import org.custommonkey.xmlunit.Diff; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/EntitySetTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/EntitySetTest.java similarity index 97% rename from lib/client-core/src/test/java/org/apache/olingo/client/core/v4/EntitySetTest.java rename to lib/client-core/src/test/java/org/apache/olingo/client/core/EntitySetTest.java index 50af30fc0..70f92cb95 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/EntitySetTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/EntitySetTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.v4; +package org.apache.olingo.client.core; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -29,7 +29,6 @@ import java.net.URI; import org.apache.olingo.client.api.ODataClient; import org.apache.olingo.client.api.domain.ClientEntity; import org.apache.olingo.client.api.domain.ClientEntitySet; -import org.apache.olingo.client.core.AbstractTest; import org.apache.olingo.commons.api.data.EntityCollection; import org.apache.olingo.commons.api.data.ResWrap; import org.apache.olingo.commons.api.format.ContentType; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/EntityTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/EntityTest.java similarity index 99% rename from lib/client-core/src/test/java/org/apache/olingo/client/core/v4/EntityTest.java rename to lib/client-core/src/test/java/org/apache/olingo/client/core/EntityTest.java index 6b691356a..77a9c3947 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/EntityTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/EntityTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.v4; +package org.apache.olingo.client.core; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -38,7 +38,6 @@ import org.apache.olingo.client.api.domain.ClientLinkType; import org.apache.olingo.client.api.domain.ClientProperty; import org.apache.olingo.client.api.domain.ClientValuable; import org.apache.olingo.client.api.domain.ClientValue; -import org.apache.olingo.client.core.AbstractTest; import org.apache.olingo.client.core.EdmEnabledODataClientImpl; import org.apache.olingo.commons.api.data.Entity; import org.apache.olingo.commons.api.data.ResWrap; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/ErrorTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/ErrorTest.java similarity index 95% rename from lib/client-core/src/test/java/org/apache/olingo/client/core/v4/ErrorTest.java rename to lib/client-core/src/test/java/org/apache/olingo/client/core/ErrorTest.java index 917676b46..8ced6a342 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/ErrorTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/ErrorTest.java @@ -16,14 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.v4; +package org.apache.olingo.client.core; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import org.apache.olingo.client.api.ODataClient; import org.apache.olingo.client.api.serialization.ODataDeserializerException; -import org.apache.olingo.client.core.AbstractTest; import org.apache.olingo.commons.api.ex.ODataError; import org.apache.olingo.commons.api.format.ContentType; import org.junit.Test; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/JSONTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/JSONTest.java similarity index 99% rename from lib/client-core/src/test/java/org/apache/olingo/client/core/v4/JSONTest.java rename to lib/client-core/src/test/java/org/apache/olingo/client/core/JSONTest.java index 357745583..11a99ed64 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/JSONTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/JSONTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.v4; +package org.apache.olingo.client.core; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -35,7 +35,6 @@ import org.apache.olingo.client.api.domain.ClientCollectionValue; import org.apache.olingo.client.api.domain.ClientComplexValue; import org.apache.olingo.client.api.domain.ClientEntity; import org.apache.olingo.client.api.domain.ClientValue; -import org.apache.olingo.client.core.AbstractTest; import org.apache.olingo.commons.api.Constants; import org.apache.olingo.commons.api.data.Delta; import org.apache.olingo.commons.api.data.Property; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/MetadataTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/MetadataTest.java similarity index 99% rename from lib/client-core/src/test/java/org/apache/olingo/client/core/v4/MetadataTest.java rename to lib/client-core/src/test/java/org/apache/olingo/client/core/MetadataTest.java index 1f603ad93..2ee68d776 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/MetadataTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/MetadataTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.v4; +package org.apache.olingo.client.core; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -28,7 +28,6 @@ import java.util.List; import org.apache.olingo.client.api.ODataClient; import org.apache.olingo.client.api.edm.xml.XMLMetadata; -import org.apache.olingo.client.core.AbstractTest; import org.apache.olingo.commons.api.Constants; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAction; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/PrimitiveValueTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/PrimitiveValueTest.java similarity index 96% rename from lib/client-core/src/test/java/org/apache/olingo/client/core/v4/PrimitiveValueTest.java rename to lib/client-core/src/test/java/org/apache/olingo/client/core/PrimitiveValueTest.java index d22bb6f16..f46f272a8 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/PrimitiveValueTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/PrimitiveValueTest.java @@ -16,10 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.v4; +package org.apache.olingo.client.core; import org.apache.olingo.client.api.ODataClient; -import org.apache.olingo.client.core.AbstractTest; import org.apache.olingo.client.api.domain.ClientValue; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/PropertyTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/PropertyTest.java similarity index 98% rename from lib/client-core/src/test/java/org/apache/olingo/client/core/v4/PropertyTest.java rename to lib/client-core/src/test/java/org/apache/olingo/client/core/PropertyTest.java index 0ee54717c..a545dc2ee 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/PropertyTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/PropertyTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.v4; +package org.apache.olingo.client.core; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -30,7 +30,6 @@ import org.apache.olingo.client.api.domain.ClientCollectionValue; import org.apache.olingo.client.api.domain.ClientComplexValue; import org.apache.olingo.client.api.domain.ClientProperty; import org.apache.olingo.client.api.domain.ClientValue; -import org.apache.olingo.client.core.AbstractTest; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.client.api.serialization.ODataDeserializerException; import org.apache.olingo.client.api.serialization.ODataSerializerException; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/ServiceDocumentTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/ServiceDocumentTest.java similarity index 96% rename from lib/client-core/src/test/java/org/apache/olingo/client/core/v4/ServiceDocumentTest.java rename to lib/client-core/src/test/java/org/apache/olingo/client/core/ServiceDocumentTest.java index 008b16513..5b7c246af 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/ServiceDocumentTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/ServiceDocumentTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.v4; +package org.apache.olingo.client.core; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -27,7 +27,6 @@ import java.net.URI; import org.apache.olingo.client.api.ODataClient; import org.apache.olingo.client.api.data.ServiceDocument; import org.apache.olingo.client.api.domain.ClientServiceDocument; -import org.apache.olingo.client.core.AbstractTest; import org.apache.olingo.commons.api.data.ResWrap; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.client.api.serialization.ODataDeserializerException; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/uri/v4/FilterFactoryTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/uri/FilterFactoryTest.java similarity index 98% rename from lib/client-core/src/test/java/org/apache/olingo/client/core/uri/v4/FilterFactoryTest.java rename to lib/client-core/src/test/java/org/apache/olingo/client/core/uri/FilterFactoryTest.java index eff892e28..1d26f814d 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/uri/v4/FilterFactoryTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/uri/FilterFactoryTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.uri.v4; +package org.apache.olingo.client.core.uri; import static org.junit.Assert.assertEquals; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/uri/v4/URIBuilderTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/uri/URIBuilderTest.java similarity index 99% rename from lib/client-core/src/test/java/org/apache/olingo/client/core/uri/v4/URIBuilderTest.java rename to lib/client-core/src/test/java/org/apache/olingo/client/core/uri/URIBuilderTest.java index f308921b2..6f8a36315 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/uri/v4/URIBuilderTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/uri/URIBuilderTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.uri.v4; +package org.apache.olingo.client.core.uri; import static org.junit.Assert.assertEquals; diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Accounts_101_expand_MyPaymentInstruments.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/Accounts_101_expand_MyPaymentInstruments.json similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Accounts_101_expand_MyPaymentInstruments.json rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/Accounts_101_expand_MyPaymentInstruments.json diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Accounts_101_expand_MyPaymentInstruments.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/Accounts_101_expand_MyPaymentInstruments.xml similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Accounts_101_expand_MyPaymentInstruments.xml rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/Accounts_101_expand_MyPaymentInstruments.xml diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Advertisements_f89dee73-af9f-4cd4-b330-db93c25ff3c7.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/Advertisements_f89dee73-af9f-4cd4-b330-db93c25ff3c7.json similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Advertisements_f89dee73-af9f-4cd4-b330-db93c25ff3c7.json rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/Advertisements_f89dee73-af9f-4cd4-b330-db93c25ff3c7.json diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Advertisements_f89dee73-af9f-4cd4-b330-db93c25ff3c7.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/Advertisements_f89dee73-af9f-4cd4-b330-db93c25ff3c7.xml similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Advertisements_f89dee73-af9f-4cd4-b330-db93c25ff3c7.xml rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/Advertisements_f89dee73-af9f-4cd4-b330-db93c25ff3c7.xml diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Customer.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/Customer.json similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Customer.json rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/Customer.json diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Customer.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/Customer.xml similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Customer.xml rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/Customer.xml diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Customers.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/Customers.json similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Customers.json rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/Customers.json diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Customers.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/Customers.xml similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Customers.xml rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/Customers.xml diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Employees_3_HomeAddress.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/Employees_3_HomeAddress.json similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Employees_3_HomeAddress.json rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/Employees_3_HomeAddress.json diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Employees_3_HomeAddress.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/Employees_3_HomeAddress.xml similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Employees_3_HomeAddress.xml rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/Employees_3_HomeAddress.xml diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Metadata-With-Capabilities.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/Metadata-With-Capabilities.xml similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Metadata-With-Capabilities.xml rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/Metadata-With-Capabilities.xml diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/PersonDetails_1.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/PersonDetails_1.json similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/PersonDetails_1.json rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/PersonDetails_1.json diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/PersonDetails_1.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/PersonDetails_1.xml similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/PersonDetails_1.xml rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/PersonDetails_1.xml diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Products_5.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/Products_5.json similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Products_5.json rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/Products_5.json diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Products_5.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/Products_5.xml similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Products_5.xml rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/Products_5.xml diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Products_5_CoverColors.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/Products_5_CoverColors.json similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Products_5_CoverColors.json rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/Products_5_CoverColors.json diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Products_5_CoverColors.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/Products_5_CoverColors.xml similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Products_5_CoverColors.xml rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/Products_5_CoverColors.xml diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Products_5_SkinColor.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/Products_5_SkinColor.json similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Products_5_SkinColor.json rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/Products_5_SkinColor.json diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Products_5_SkinColor.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/Products_5_SkinColor.xml similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/Products_5_SkinColor.xml rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/Products_5_SkinColor.xml diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/VipCustomer.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/VipCustomer.json similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/VipCustomer.json rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/VipCustomer.json diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/VipCustomer.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/VipCustomer.xml similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/VipCustomer.xml rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/VipCustomer.xml diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/annotated.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/annotated.json similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/annotated.json rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/annotated.json diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/annotated.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/annotated.xml similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/annotated.xml rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/annotated.xml diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/atom_cleanup.xsl b/lib/client-core/src/test/resources/org/apache/olingo/client/core/atom_cleanup.xsl similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/atom_cleanup.xsl rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/atom_cleanup.xsl diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/collectionOfEntityReferences.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/collectionOfEntityReferences.json similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/collectionOfEntityReferences.json rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/collectionOfEntityReferences.json diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/collectionOfEntityReferences.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/collectionOfEntityReferences.xml similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/collectionOfEntityReferences.xml rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/collectionOfEntityReferences.xml diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/crossjoin.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/crossjoin.json similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/crossjoin.json rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/crossjoin.json diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/delta.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/delta.json similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/delta.json rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/delta.json diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/delta.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/delta.xml similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/delta.xml rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/delta.xml diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/demo-metadata.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/demo-metadata.xml similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/demo-metadata.xml rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/demo-metadata.xml diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entity.collection.complex.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/entity.collection.complex.json similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entity.collection.complex.json rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/entity.collection.complex.json diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entity.collection.primitive.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/entity.collection.primitive.json similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entity.collection.primitive.json rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/entity.collection.primitive.json diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entity.complex.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/entity.complex.json similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entity.complex.json rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/entity.complex.json diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entity.minimal.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/entity.minimal.json similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entity.minimal.json rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/entity.minimal.json diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entity.primitive.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/entity.primitive.json similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entity.primitive.json rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/entity.primitive.json diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entity.withcomplexnavigation.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/entity.withcomplexnavigation.json similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entity.withcomplexnavigation.json rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/entity.withcomplexnavigation.json diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entity.withcomplexnavigation.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/entity.withcomplexnavigation.xml similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entity.withcomplexnavigation.xml rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/entity.withcomplexnavigation.xml diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entityReference.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/entityReference.json similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entityReference.json rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/entityReference.json diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entityReference.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/entityReference.xml similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/entityReference.xml rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/entityReference.xml diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/error.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/error.json similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/error.json rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/error.json diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/error.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/error.xml similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/error.xml rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/error.xml diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/fromdoc1-metadata.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/fromdoc1-metadata.xml similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/fromdoc1-metadata.xml rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/fromdoc1-metadata.xml diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/fromdoc2-metadata.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/fromdoc2-metadata.xml similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/fromdoc2-metadata.xml rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/fromdoc2-metadata.xml diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/fromdoc3-metadata.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/fromdoc3-metadata.xml similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/fromdoc3-metadata.xml rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/fromdoc3-metadata.xml diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/fromdoc4-metadata.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/fromdoc4-metadata.xml similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/fromdoc4-metadata.xml rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/fromdoc4-metadata.xml diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/metadata.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/metadata.xml similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/metadata.xml rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/metadata.xml diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/minimalEntity.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/minimalEntity.json similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/minimalEntity.json rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/minimalEntity.json diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/northwind-metadata.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/northwind-metadata.xml similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/northwind-metadata.xml rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/northwind-metadata.xml diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/olingo390.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/olingo390.json similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/olingo390.json rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/olingo390.json diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/serviceDocument.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/serviceDocument.json similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/serviceDocument.json rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/serviceDocument.json diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/serviceDocument.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/serviceDocument.xml similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/serviceDocument.xml rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/serviceDocument.xml diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/staticservice-metadata.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/staticservice-metadata.xml similarity index 100% rename from lib/client-core/src/test/resources/org/apache/olingo/client/core/v4/staticservice-metadata.xml rename to lib/client-core/src/test/resources/org/apache/olingo/client/core/staticservice-metadata.xml