Skip to content

Commit 091b2b4

Browse files
wog48GitHub Enterprise
wog48
authored and
GitHub Enterprise
committed
Defect/issue226 (#301)
* Update version * Adopt correction done for release * Clean-up archetype * Clean-up error * Add test to check Olingo not supporting $expand...($level=; $expand...) * Note thrown runtime exception
1 parent e3fa961 commit 091b2b4

File tree

65 files changed

+284
-176
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+284
-176
lines changed

‎jpa-archetype/odata-jpa-archetype-spring-scp/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.sap.olingo</groupId>
66
<artifactId>odata-jpa-archetype</artifactId>
7-
<version>2.0.0</version>
7+
<version>2.0.1</version>
88
</parent>
99
<artifactId>odata-jpa-archetype-spring-scp</artifactId>
1010
<name>odata-jpa-archetype</name>

‎jpa-archetype/odata-jpa-archetype-spring-scp/src/main/resources/archetype-resources/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<groupId>org.springframework.boot</groupId>
1313
<artifactId>spring-boot-starter-parent</artifactId>
14-
<version>2.7.6</version>
14+
<version>3.1.3</version>
1515
<relativePath />
1616
</parent>
1717

‎jpa-archetype/odata-jpa-archetype-spring-scp/src/main/resources/archetype-resources/src/main/java/config/ProcessorConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import static org.springframework.web.context.WebApplicationContext.SCOPE_REQUEST;
44

5-
import javax.persistence.EntityManagerFactory;
5+
import jakarta.persistence.EntityManagerFactory;
66

77
import org.apache.olingo.commons.api.ex.ODataException;
88
import org.apache.olingo.server.api.debug.DefaultDebugSupport;

‎jpa-archetype/odata-jpa-archetype-spring-scp/src/main/resources/archetype-resources/src/main/java/controller/ODataController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package ${package}.controller;
22

3-
import javax.servlet.http.HttpServletRequest;
4-
import javax.servlet.http.HttpServletResponse;
3+
import jakarta.servlet.http.HttpServletRequest;
4+
import jakarta.servlet.http.HttpServletResponse;
55

66
import org.apache.olingo.commons.api.ex.ODataException;
77
import org.springframework.beans.factory.annotation.Autowired;

‎jpa-archetype/odata-jpa-archetype-spring-scp/src/main/resources/archetype-resources/src/main/java/model/EntityTemplate.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
import java.util.ArrayList;
44
import java.util.Collection;
55

6-
import javax.persistence.CascadeType;
7-
import javax.persistence.Column;
8-
import javax.persistence.Entity;
9-
import javax.persistence.FetchType;
10-
import javax.persistence.GeneratedValue;
11-
import javax.persistence.GenerationType;
12-
import javax.persistence.Id;
13-
import javax.persistence.OneToMany;
14-
import javax.persistence.SequenceGenerator;
15-
import javax.persistence.Table;
6+
import jakarta.persistence.CascadeType;
7+
import jakarta.persistence.Column;
8+
import jakarta.persistence.Entity;
9+
import jakarta.persistence.FetchType;
10+
import jakarta.persistence.GeneratedValue;
11+
import jakarta.persistence.GenerationType;
12+
import jakarta.persistence.Id;
13+
import jakarta.persistence.OneToMany;
14+
import jakarta.persistence.SequenceGenerator;
15+
import jakarta.persistence.Table;
1616

1717
@Entity(name = "${entity-table}")
1818
@Table(schema = "\"${schema}\"", name = "\"${entity-table}\"")

‎jpa-archetype/odata-jpa-archetype-spring-scp/src/main/resources/archetype-resources/src/main/java/model/ValueObjectTemplate.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package ${package}.model;
22

3-
import javax.persistence.Column;
4-
import javax.persistence.Entity;
5-
import javax.persistence.FetchType;
6-
import javax.persistence.Id;
7-
import javax.persistence.IdClass;
8-
import javax.persistence.JoinColumn;
9-
import javax.persistence.ManyToOne;
10-
import javax.persistence.Table;
3+
import jakarta.persistence.Column;
4+
import jakarta.persistence.Entity;
5+
import jakarta.persistence.FetchType;
6+
import jakarta.persistence.Id;
7+
import jakarta.persistence.IdClass;
8+
import jakarta.persistence.JoinColumn;
9+
import jakarta.persistence.ManyToOne;
10+
import jakarta.persistence.Table;
1111

1212
@IdClass(ValueObjectTemplateKey.class)
1313
@Entity(name = "${value-object-table}")

‎jpa-archetype/odata-jpa-archetype-spring/pom.xml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.sap.olingo</groupId>
66
<artifactId>odata-jpa-archetype</artifactId>
7-
<version>2.0.0</version>
7+
<version>2.0.1</version>
88
</parent>
99
<artifactId>odata-jpa-archetype-spring</artifactId>
1010
<name>Archetype - odata-jpa-archetype-spring</name>
@@ -17,7 +17,7 @@
1717
<extension>
1818
<groupId>org.apache.maven.archetype</groupId>
1919
<artifactId>archetype-packaging</artifactId>
20-
<version>3.1.1</version>
20+
<version>3.2.1</version>
2121
</extension>
2222
</extensions>
2323
<pluginManagement>
@@ -26,6 +26,9 @@
2626
<groupId>org.apache.maven.plugins</groupId>
2727
<artifactId>maven-archetype-plugin</artifactId>
2828
<version>3.2.1</version>
29+
<configuration>
30+
<debug>true</debug>
31+
</configuration>
2932
</plugin>
3033
</plugins>
3134
</pluginManagement>

‎jpa-archetype/odata-jpa-archetype-spring/src/main/resources/archetype-resources/pom.xml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@
1212
<parent>
1313
<groupId>org.springframework.boot</groupId>
1414
<artifactId>spring-boot-starter-parent</artifactId>
15-
<version>2.7.6</version>
15+
<version>3.1.3</version>
1616
<relativePath />
1717
</parent>
1818

1919
<properties>
20-
<processor.version>2.0.0</processor.version>
20+
<processor.version>2.0.1</processor.version>
2121
<java.version>17</java.version>
22+
<build.sourceEncoding>UTF-8</build.sourceEncoding>
2223
<eclipselink.version>4.0.2</eclipselink.version>
2324
<jpa.version>3.1.0</jpa.version>
2425
</properties>
@@ -134,6 +135,19 @@
134135
<groupId>org.springframework.boot</groupId>
135136
<artifactId>spring-boot-maven-plugin</artifactId>
136137
</plugin>
138+
<plugin>
139+
<groupId>org.apache.maven.plugins</groupId>
140+
<artifactId>maven-compiler-plugin</artifactId>
141+
<version>3.11.0</version>
142+
<configuration>
143+
<source>${java.version}</source>
144+
<target>${java.version}</target>
145+
<showWarnings>true</showWarnings>
146+
<showDeprecation>true</showDeprecation>
147+
<compilerArgument>-Xlint:unchecked</compilerArgument>
148+
<encoding>${build.sourceEncoding}</encoding>
149+
</configuration>
150+
</plugin>
137151
</plugins>
138152
</build>
139153
</project>

‎jpa-archetype/odata-jpa-archetype-spring/src/main/resources/archetype-resources/src/main/java/config/ProcessorConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import static org.springframework.web.context.WebApplicationContext.SCOPE_REQUEST;
44

5-
import javax.persistence.EntityManagerFactory;
5+
import jakarta.persistence.EntityManagerFactory;
66

77
import org.apache.olingo.commons.api.ex.ODataException;
88
import org.apache.olingo.server.api.debug.DefaultDebugSupport;

‎jpa-archetype/odata-jpa-archetype-spring/src/main/resources/archetype-resources/src/main/java/controller/ODataController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package ${package}.controller;
22

3-
import javax.servlet.http.HttpServletRequest;
4-
import javax.servlet.http.HttpServletResponse;
3+
import jakarta.servlet.http.HttpServletRequest;
4+
import jakarta.servlet.http.HttpServletResponse;
55

66
import org.apache.olingo.commons.api.ex.ODataException;
77
import org.springframework.beans.factory.annotation.Autowired;

0 commit comments

Comments
 (0)