This is an automated email from the ASF dual-hosted git repository.
mibo pushed a commit to branch OLINGO-1604-release
in repository https://gitbox.apache.org/repos/asf/olingo-odata2.git
The following commit(s) were added to refs/heads/OLINGO-1604-release by this
push:
new 66c0a914 [OLINGO-1604] Fixed some dependencies
66c0a914 is described below
commit 66c0a9142d75d11a38549d9f5eb9b5ab0e4a185a
Author: mibo <[email protected]>
AuthorDate: Sat Sep 23 10:40:11 2023 +0200
[OLINGO-1604] Fixed some dependencies
---
.../core/jpql/JPQLBuilderFactoryTest.java | 28 ++++++++++++++++++++++
.../olingo/odata2/fit/ref/AbstractRefTest.java | 6 ++---
.../odata2/testutil/mock/EdmTestProvider.java | 10 ++++----
pom.xml | 7 +++---
4 files changed, 40 insertions(+), 11 deletions(-)
diff --git
a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/jpql/JPQLBuilderFactoryTest.java
b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/jpql/JPQLBuilderFactoryTest.java
index 7e12349a..6af0e310 100644
---
a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/jpql/JPQLBuilderFactoryTest.java
+++
b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/jpql/JPQLBuilderFactoryTest.java
@@ -30,9 +30,12 @@ import java.util.Locale;
import java.util.Map;
import javax.persistence.Cache;
+import javax.persistence.EntityGraph;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import javax.persistence.PersistenceUnitUtil;
+import javax.persistence.Query;
+import javax.persistence.SynchronizationType;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.metamodel.Metamodel;
@@ -341,6 +344,21 @@ public class JPQLBuilderFactoryTest {
return null;
}
+ @Override
+ public void addNamedQuery(String s, Query query) {
+
+ }
+
+ @Override
+ public <T> T unwrap(Class<T> aClass) {
+ return null;
+ }
+
+ @Override
+ public <T> void addNamedEntityGraph(String s, EntityGraph<T> entityGraph) {
+
+ }
+
@Override
public Metamodel getMetamodel() {
return null;
@@ -362,6 +380,16 @@ public class JPQLBuilderFactoryTest {
return em;
}
+ @Override
+ public EntityManager createEntityManager(SynchronizationType
synchronizationType) {
+ return null;
+ }
+
+ @Override
+ public EntityManager createEntityManager(SynchronizationType
synchronizationType, Map map) {
+ return null;
+ }
+
@Override
public EntityManager createEntityManager() {
return em;
diff --git
a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefTest.java
b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefTest.java
index 6a8fad16..39699874 100644
---
a/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefTest.java
+++
b/odata2-lib/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefTest.java
@@ -22,8 +22,6 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import java.net.URI;
-
import org.apache.commons.codec.binary.Base64;
import org.apache.http.HttpEntityEnclosingRequest;
import org.apache.http.HttpHeaders;
@@ -50,6 +48,8 @@ import org.apache.olingo.odata2.testutil.helper.StringHelper;
import org.apache.olingo.odata2.testutil.server.ServletType;
import org.junit.Ignore;
+import java.net.URI;
+
/**
* Abstract base class for tests employing the reference scenario.
*
@@ -104,7 +104,7 @@ public class AbstractRefTest extends AbstractFitTest {
httpMethod == ODataHttpMethod.DELETE ? new HttpDelete() :
httpMethod == ODataHttpMethod.POST ? new HttpPost() :
httpMethod == ODataHttpMethod.PUT ? new HttpPut() : new
HttpPatch();
- request.setURI(URI.create(getEndpoint() + uri));
+ request.setURI(URI.create(getEndpoint().toString() + uri));
if (additionalHeader != null) {
request.addHeader(additionalHeader, additionalHeaderValue);
}
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 3119aca7..d33a6196 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
@@ -187,17 +187,17 @@ public class EdmTestProvider extends EdmProvider {
schema.setAnnotationElements(schemaElements);
schemas.add(schema);
- schema = new Schema();
- schema.setNamespace(NAMESPACE_2);
+ Schema schemaNamespace2 = new Schema();
+ schemaNamespace2.setNamespace(NAMESPACE_2);
- schema.setEntityTypes(Arrays.asList(getEntityType(ENTITY_TYPE_2_1)));
+
schemaNamespace2.setEntityTypes(Arrays.asList(getEntityType(ENTITY_TYPE_2_1)));
entityContainer = new EntityContainer();
entityContainer.setName(ENTITY_CONTAINER_2);
entityContainer.setEntitySets(Arrays.asList(getEntitySet(ENTITY_CONTAINER_2,
ENTITY_SET_2_1)));
- schema.setEntityContainers(Arrays.asList(entityContainer));
+ schemaNamespace2.setEntityContainers(Arrays.asList(entityContainer));
- schemas.add(schema);
+ schemas.add(schemaNamespace2);
return schemas;
}
diff --git a/pom.xml b/pom.xml
index e95ecea1..5a2de1af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,17 +56,18 @@
<!-- <jsr311.version>1.1.1</jsr311.version> -->
<joda.version>2.1</joda.version>
<cxf.version>2.7.18</cxf.version>
- <jetty.version>7.6.21.v20160908</jetty.version>
+<!-- <jetty.version>7.6.21.v20160908</jetty.version>-->
+ <jetty.version>8.0.4.v20111024</jetty.version>
<!-- Newer version causes test issues
(https://issues.apache.org/jira/browse/OLINGO-1607) -->
<!--
ServiceResolutionTest.testBaseUriWithEncoding:293->validateServiceRoot:298 -->
- <httpclient.version>4.5.7</httpclient.version>
+ <httpclient.version>4.5.6</httpclient.version>
<httpcore.version>4.4.16</httpcore.version>
<slf4j.version>1.7.36</slf4j.version>
<log4j.version>1.2.17</log4j.version>
<commonscodec.version>1.6</commonscodec.version>
<commonslang.version>3.1</commonslang.version>
<gson.version>2.9.1</gson.version>
- <hsqldb.version>2.7.2</hsqldb.version>
+ <hsqldb.version>2.5.2</hsqldb.version>
<antlr.version>3.4</antlr.version>
