Merge remote-tracking branch 'public/release/2.x.x' into

release/update-2.x.x
SAP · Dec 15, 2024 · e249639 · e249639
2 parents 39ed843 + 9bd2b43
commit e249639
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -103,8 +103,13 @@ Detailed information including third-party components and their licensing/copyri
 |2.1.1| - Fix for issue [#292](https://github.com/SAP/olingo-jpa-processor-v4/issues/292)|No|
 |2.1.3| - Fix for issue [#319](https://github.com/SAP/olingo-jpa-processor-v4/issues/319)<br> - Fix for issue [#325](https://github.com/SAP/olingo-jpa-processor-v4/issues/325)<br> - Fix for issue [#327](https://github.com/SAP/olingo-jpa-processor-v4/issues/327)<br> - Fix for issue [#331](https://github.com/SAP/olingo-jpa-processor-v4/issues/331)<br> - Fix of en issue with $orderby and _to one_ navigation properties |No|
 <<<<<<< HEAD
+<<<<<<< HEAD
 |2.2.0| - Fix for issue [#378](https://github.com/SAP/olingo-jpa-processor-v4/issues/378)<br> - Fix for issue [#361](https://github.com/SAP/olingo-jpa-processor-v4/issues/361)<br> - Fix for issue [#352](https://github.com/SAP/olingo-jpa-processor-v4/issues/352)<br> - Fix for issue [#307](https://github.com/SAP/olingo-jpa-processor-v4/issues/307) <br> - Enhancement according to [#314](https://github.com/SAP/olingo-jpa-processor-v4/issues/314)|No|
 |2.3.0| - Add support for handling multiple API version. Issue [#308](https://github.com/SAP/olingo-jpa-processor-v4/issues/308)<br>  - Fix for issue [#359](https://github.com/SAP/olingo-jpa-processor-v4/issues/359)<br> - Fix for issue [#406](https://github.com/SAP/olingo-jpa-processor-v4/issues/406)<br>  - Fix for issue [#397](https://github.com/SAP/olingo-jpa-processor-v4/issues/397)|No|
 |2.3.1| - Issue [#424](https://github.com/SAP/olingo-jpa-processor-v4/issues/424)<br>  - Issue [#407](https://github.com/SAP/olingo-jpa-processor-v4/issues/407)<br> - Issue [#285](https://github.com/SAP/olingo-jpa-processor-v4/issues/285)<br> |No|
 =======
 >>>>>>> refs/remotes/public/update-2.x.x
+=======
+|2.2.0| - Fix for issue [#378](https://github.com/SAP/olingo-jpa-processor-v4/issues/378)<br>  - Fix for issue [#378](https://github.com/SAP/olingo-jpa-processor-v4/issues/378)<br> - Fix for issue [#361](https://github.com/SAP/olingo-jpa-processor-v4/issues/361)<br> - Fix for issue [#352](https://github.com/SAP/olingo-jpa-processor-v4/issues/352)<br> - Fix for issue [#307](https://github.com/SAP/olingo-jpa-processor-v4/issues/307) <br> - Enhancement according to [#314](https://github.com/SAP/olingo-jpa-processor-v4/issues/314)|No|
+|2.3.0| - Add support for handling multiple API version. Issue [#308](https://github.com/SAP/olingo-jpa-processor-v4/issues/308)<br>  - Fix for issue [#359](https://github.com/SAP/olingo-jpa-processor-v4/issues/359)<br> - Fix for issue [#406](https://github.com/SAP/olingo-jpa-processor-v4/issues/406)<br>  - Fix for issue [#397](https://github.com/SAP/olingo-jpa-processor-v4/issues/397)|No|
+>>>>>>> refs/remotes/public/release/2.x.x
diff --git a/jpa-archetype/odata-jpa-archetype-spring/src/main/resources/archetype-resources/pom.xml b/jpa-archetype/odata-jpa-archetype-spring/src/main/resources/archetype-resources/pom.xml
@@ -15,7 +15,7 @@
 		<version>3.2.3</version>
 		<relativePath />
 	</parent>
-
+
 	<properties>
 		<processor.version>2.3.1</processor.version>
 		<java.version>17</java.version>

diff --git a/jpa-archetype/pom.xml b/jpa-archetype/pom.xml
@@ -2,14 +2,14 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.sap.olingo</groupId>
+    <groupId>com.sap.olingo</groupId>
     <artifactId>odata-jpa-archetype</artifactId>
     <version>2.3.1</version>
     <packaging>pom</packaging>
     <url>https://github.com/SAP/olingo-jpa-processor-v4</url>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.build.source>17</project.build.source>
     </properties>
 

diff --git a/jpa/.gitignore b/jpa/.gitignore
@@ -11,4 +11,4 @@ target/
 *.log
 /old.project
 /Scripts/
-/.dbeaver/
+/.dbeaver/
diff --git a/jpa/odata-jpa-coverage/pom.xml b/jpa/odata-jpa-coverage/pom.xml
@@ -3,8 +3,8 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.sap.olingo</groupId>
-        <artifactId>odata-jpa</artifactId>
-        <version>2.3.1</version>
+        <artifactId>odata-jpa</artifactId>
+        <version>2.3.1</version>
     </parent>
 
     <artifactId>odata-jpa-coverage</artifactId>

diff --git a/jpa/odata-jpa-processor-cb/pom.xml b/jpa/odata-jpa-processor-cb/pom.xml
@@ -4,8 +4,8 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.sap.olingo</groupId>
-        <artifactId>odata-jpa</artifactId>
-        <version>2.3.1</version>
+        <artifactId>odata-jpa</artifactId>
+        <version>2.3.1</version>
     </parent>
 
     <artifactId>odata-jpa-processor-cb</artifactId>

diff --git a/jpa/odata-jpa-processor-ext/pom.xml b/jpa/odata-jpa-processor-ext/pom.xml
@@ -3,8 +3,8 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.sap.olingo</groupId>
-        <artifactId>odata-jpa</artifactId>
-        <version>2.3.1</version>
+        <artifactId>odata-jpa</artifactId>
+        <version>2.3.1</version>
     </parent>
     <artifactId>odata-jpa-processor-ext</artifactId>
     <name>odata-jpa-processor-ext</name>

diff --git a/jpa/odata-jpa-processor/pom.xml b/jpa/odata-jpa-processor/pom.xml
@@ -6,8 +6,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
         <groupId>com.sap.olingo</groupId>
-        <artifactId>odata-jpa</artifactId>
-        <version>2.3.1</version>
+        <artifactId>odata-jpa</artifactId>
+        <version>2.3.1</version>
 	</parent>
 
 	<artifactId>odata-jpa-processor</artifactId>

diff --git a/...processor/src/main/java/com/sap/olingo/jpa/processor/core/api/JPAODataServiceContext.java b/...processor/src/main/java/com/sap/olingo/jpa/processor/core/api/JPAODataServiceContext.java
@@ -105,8 +105,8 @@ public ErrorProcessor getErrorProcessor() {
   public JPAODataDatabaseOperations getOperationConverter() {
     return operationConverter;
   }
-
-  @Override
+
+  @Override
   public JPAODataPagingProvider getPagingProvider() {
     return pagingProvider;
   }

diff --git a/.../main/java/com/sap/olingo/jpa/processor/core/processor/JPANavigationRequestProcessor.java b/.../main/java/com/sap/olingo/jpa/processor/core/processor/JPANavigationRequestProcessor.java
@@ -212,9 +212,9 @@ JPAETagValidationResult validateEntityTag(final JPAConvertibleResult result, fin
     }
     return JPAETagValidationResult.SUCCESS;
   }
-
+
   private boolean isRootResultEmpty(final JPAConvertibleResult result) {
-    if (result instanceof final JPAExpandResult expandResult) {
+    if (result instanceof final JPAExpandResult expandResult) {
       return expandResult.getResult(ROOT_RESULT_KEY).isEmpty();
     }
     return false;

diff --git a/jpa/odata-jpa-spring-support/pom.xml b/jpa/odata-jpa-spring-support/pom.xml
@@ -3,9 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>com.sap.olingo</groupId>
+        <groupId>com.sap.olingo</groupId>
         <artifactId>odata-jpa</artifactId>
-        <version>2.3.1</version>
+        <version>2.3.1</version>
     </parent>
 
     <artifactId>odata-jpa-spring-support</artifactId>