Increasing Olingo and Jackson version

SAP · Oct 5, 2021 · 05f214a · 05f214a
1 parent d5d9faf
commit 05f214a
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 65 deletions.
diff --git a/jpa/odata-jpa-metadata/pom.xml b/jpa/odata-jpa-metadata/pom.xml
@@ -63,6 +63,11 @@
 			<artifactId>jackson-dataformat-yaml</artifactId>
 			<version>${jackson.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+			<version>${jackson.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>net.oneandone.reflections8</groupId>
 			<artifactId>reflections8</artifactId>
@@ -77,7 +82,7 @@
 			<groupId>com.google.code.findbugs</groupId>
 			<artifactId>jsr305</artifactId>
 			<version>3.0.2</version>
-		</dependency>		
+		</dependency>
 	</dependencies>
 	<build>
 	</build>

diff --git a/...sor/src/test/java/com/sap/olingo/jpa/processor/core/util/EdmNavigationPropertyDouble.java b/...sor/src/test/java/com/sap/olingo/jpa/processor/core/util/EdmNavigationPropertyDouble.java
@@ -7,6 +7,7 @@
 import org.apache.olingo.commons.api.edm.EdmAnnotation;
 import org.apache.olingo.commons.api.edm.EdmEntityType;
 import org.apache.olingo.commons.api.edm.EdmNavigationProperty;
+import org.apache.olingo.commons.api.edm.EdmOnDelete;
 import org.apache.olingo.commons.api.edm.EdmReferentialConstraint;
 import org.apache.olingo.commons.api.edm.EdmTerm;
 
@@ -77,4 +78,10 @@ public List<EdmReferentialConstraint> getReferentialConstraints() {
     return null;
   }
 
+  @Override
+  public EdmOnDelete getOnDelete() {
+    fail();
+    return null;
+  }
+
 }
diff --git a/...jpa-processor/src/test/java/com/sap/olingo/jpa/processor/core/util/EdmPropertyDouble.java b/...jpa-processor/src/test/java/com/sap/olingo/jpa/processor/core/util/EdmPropertyDouble.java
@@ -115,4 +115,10 @@ public EdmType getTypeWithAnnotations() {
     return null;
   }
 
+  @Override
+  public String getScaleAsString() {
+    fail();
+    return null;
+  }
+
 }
diff --git a/jpa/odata-jpa-test/pom.xml b/jpa/odata-jpa-test/pom.xml
@@ -16,7 +16,7 @@
 	<url>https://github.com/SAP/olingo-jpa-processor-v4</url>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<hibernate.version>5.4.4.Final</hibernate.version>
+        <hibernate.version>5.4.4.Final</hibernate.version>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -72,7 +72,7 @@
 		<dependency>
 			<groupId>org.apache.derby</groupId>
 			<artifactId>derby</artifactId>
-			<version>10.12.1.1</version>
+			<version>10.14.2.0</version>
 		</dependency>
 	</dependencies>
 	<profiles>

diff --git a/jpa/pom.xml b/jpa/pom.xml
@@ -15,8 +15,8 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.build.source>1.8</project.build.source>
 		<maven.complier.version>3.8.0</maven.complier.version>
-		<odata.version>4.7.1</odata.version>
-		<jackson.version>2.9.8</jackson.version>
+		<odata.version>4.8.0</odata.version>
+        <jackson.version>2.12.5</jackson.version>
 		<powermock.version>1.7.1</powermock.version>
 		<coveralls.version>4.3.0</coveralls.version>
 	</properties>
@@ -39,66 +39,6 @@
 				<exclude.regex></exclude.regex>
 			</properties>
 		</profile>
-		<profile>
-			<id>vulas</id>
-			<activation>
-				<property>
-					<name>vulas</name>
-				</property>
-			</activation>
-			<properties>
-				<vulas.version>3.1.9</vulas.version>
-				<vulas.shared.backend.serviceUrl>http://localhost:8033/backend/</vulas.shared.backend.serviceUrl>
-				<vulas.core.space.token>8DCFB02D5B94AD17C76ED1A5F48DEAED</vulas.core.space.token>
-				<vulas.core.appContext.group>${project.groupId}</vulas.core.appContext.group>
-				<vulas.core.appContext.artifact>${project.artifactId}</vulas.core.appContext.artifact>
-				<vulas.core.appContext.version>${project.version}</vulas.core.appContext.version>
-			</properties>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>com.sap.research.security.vulas</groupId>
-						<artifactId>plugin-maven</artifactId>
-						<version>${vulas.version}</version>
-						<configuration>
-							<layeredConfiguration>
-								<vulas.shared.backend.serviceUrl>${vulas.shared.backend.serviceUrl}</vulas.shared.backend.serviceUrl>
-								<vulas.core.space.token>${vulas.core.space.token}</vulas.core.space.token>
-
-								<vulas.core.appContext.group>${vulas.core.appContext.group}</vulas.core.appContext.group>
-								<vulas.core.appContext.artifact>${vulas.core.appContext.artifact}</vulas.core.appContext.artifact>
-								<vulas.core.appContext.version>${vulas.core.appContext.version}</vulas.core.appContext.version>
-
-								<vulas.shared.tmpDir>${project.build.directory}/vulas/tmp</vulas.shared.tmpDir>
-								<vulas.core.uploadDir>${project.build.directory}/vulas/upload</vulas.core.uploadDir>
-								<vulas.core.app.sourceDir>${project.build.directory}/classes,${project.basedir}/src/main/java,${project.basedir}/src/main/python</vulas.core.app.sourceDir>
-
-								<!-- vulas:instr : Instruments JAR/WAR files found in source dir, 
-									and writes to target dir. Files in include dir are put into /WEB-INF/lib 
-									of output WARs. Files in lib dir are part of the class path when instrumenting. -->
-								<vulas.core.instr.sourceDir>${project.build.directory}</vulas.core.instr.sourceDir>
-								<vulas.core.instr.targetDir>${project.build.directory}/vulas/target</vulas.core.instr.targetDir>
-								<vulas.core.instr.includeDir>${project.build.directory}/vulas/include</vulas.core.instr.includeDir>
-								<vulas.core.instr.libDir>${project.build.directory}/vulas/lib</vulas.core.instr.libDir>
-								<vulas.core.instr.writeCode>false</vulas.core.instr.writeCode>
-								<vulas.core.instr.instrumentorsChoosen>com.sap.psr.vulas.monitor.trace.SingleTraceInstrumentor</vulas.core.instr.instrumentorsChoosen>
-								<vulas.core.instr.searchRecursive>false</vulas.core.instr.searchRecursive>
-								<vulas.core.monitor.periodicUpload.enabled>false</vulas.core.monitor.periodicUpload.enabled>
-								<vulas.core.instr.maxStacktraces>10</vulas.core.instr.maxStacktraces>
-
-								<!-- vulas:a2c/t2c : Performs static call graph analysis -->
-								<vulas.reach.wala.callgraph.reflection>NO_FLOW_TO_CASTS_NO_METHOD_INVOKE</vulas.reach.wala.callgraph.reflection>
-								<vulas.reach.timeout>60</vulas.reach.timeout>
-
-								<!-- vulas:report -->
-								<vulas.report.exceptionExcludeBugs></vulas.report.exceptionExcludeBugs>
-								<vulas.report.reportDir>${project.build.directory}/vulas/report</vulas.report.reportDir>
-							</layeredConfiguration>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
 	</profiles>
 
 	<modules>