Rename properties file to prevent name clashes (#305)

* Rename properties file to prevent name clashes * Update dependency, resolve conflict with Olingo
SAP · Nov 27, 2023 · 7b8bc8f · 7b8bc8f
1 parent 9fa771b
commit 7b8bc8f
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 9 deletions.
diff --git a/...lel/src/main/java/com/sap/olingo/jpa/processor/core/exception/ODataJPABatchException.java b/...lel/src/main/java/com/sap/olingo/jpa/processor/core/exception/ODataJPABatchException.java
@@ -6,10 +6,10 @@
 
 public class ODataJPABatchException extends ODataJPAProcessException { // NOSONAR
   /**
-   * 
+   *
    */
   private static final long serialVersionUID = 8492368933922574285L;
-  private static final String BUNDLE_NAME = "processor-exceptions-i18n";
+  private static final String BUNDLE_NAME = "batch-parallel-exceptions-i18n";
 
   public enum MessageKeys implements ODataJPAMessageKey {
     UNSUPPORTED_BATCH_PARTS;

diff --git a/...rces/processor-exceptions-i18n.properties → ...batch-parallel-exceptions-i18n.properties b/...rces/processor-exceptions-i18n.properties → ...batch-parallel-exceptions-i18n.properties
diff --git a/.../java/com/sap/olingo/jpa/processor/core/processor/JPAODataParallelBatchProcessorTest.java b/.../java/com/sap/olingo/jpa/processor/core/processor/JPAODataParallelBatchProcessorTest.java
@@ -98,6 +98,8 @@ void testBuildGroupsThrowsExceptionOnNonChangeSetWithMultipleEntries() {
     final ODataJPABatchException act = Assertions.assertThrows(ODataJPABatchException.class, () -> cut.buildGroups(
         requests));
     Assertions.assertEquals(HttpStatusCode.INTERNAL_SERVER_ERROR.getStatusCode(), act.getStatusCode());
+    Assertions.assertNotNull(act.getMessage());
+    Assertions.assertFalse(act.getMessage().contains("No message text found"));
   }
 
   @Test

diff --git a/jpa/odata-jpa-processor/pom.xml b/jpa/odata-jpa-processor/pom.xml
@@ -44,6 +44,12 @@
 			<groupId>org.apache.olingo</groupId>
 			<artifactId>odata-server-core</artifactId>
 			<version>${odata.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>com.fasterxml.jackson.core</groupId>
+					<artifactId>jackson-core</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>jakarta.persistence</groupId>
@@ -76,6 +82,11 @@
 			<artifactId>jackson-dataformat-xml</artifactId>
 			<version>${jackson.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+			<version>${jackson.version}</version>
+		</dependency>		
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-annotations</artifactId>

diff --git a/jpa/pom.xml b/jpa/pom.xml
@@ -13,17 +13,17 @@
 		<project.build.source>17</project.build.source>
 		<project.build.target>17</project.build.target>
 		<maven.complier.version>3.8.0</maven.complier.version>
-		<odata.version>4.9.0</odata.version>
-		<jackson.version>2.14.1</jackson.version>
+		<odata.version>4.10.0</odata.version>
+		<jackson.version>2.16.0</jackson.version>
 		<powermock.version>1.7.1</powermock.version>
 		<coveralls.version>4.3.0</coveralls.version>
 		<jpa.version>3.1.0</jpa.version>
 		<processor.version>2.0.1</processor.version>
-		<spring-jcl.version>6.0.11</spring-jcl.version>
-		<junit.version>5.9.1</junit.version>
-		<junit-platform.version>1.9.1</junit-platform.version>
-		<mockito.version>5.5.0</mockito.version>
-		<jacoco.version>0.8.10</jacoco.version>
+		<spring-jcl.version>6.0.14</spring-jcl.version>
+		<junit.version>5.10.1</junit.version>
+		<junit-platform.version>1.10.1</junit-platform.version>
+		<mockito.version>5.7.0</mockito.version>
+		<jacoco.version>0.8.11</jacoco.version>
 		<sonar.coverage.jacoco.xmlReportPaths>
 			${project.basedir}/odata-jpa-coverage/target/site/jacoco-aggregate/jacoco.xml,
 			${project.basedir}/../odata-jpa-coverage/target/site/jacoco-aggregate/jacoco.xml