Skip to content

Commit 976b801

Browse files
anders-swansonanders-swanson
committed
refactor modules
Signed-off-by: Anders Swanson <anders.swanson@oracle.com>
1 parent 1a43df8 commit 976b801

File tree

13 files changed

+128
-90
lines changed

13 files changed

+128
-90
lines changed

‎database/starters/oracle-spring-boot-json-data-tools/pom.xml

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- Copyright (c) 2023, 2024, Oracle and/or its affiliates. -->
3+
<!-- Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. -->
4+
<project xmlns="http://maven.apache.org/POM/4.0.0"
5+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
6+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
7+
<modelVersion>4.0.0</modelVersion>
8+
<parent>
9+
<artifactId>oracle-spring-boot-starters</artifactId>
10+
<groupId>com.oracle.database.spring</groupId>
11+
<version>25.2.0</version>
12+
<relativePath>../pom.xml</relativePath>
13+
</parent>
14+
15+
<artifactId>oracle-spring-boot-json-data-tools</artifactId>
16+
<version>25.2.0</version>
17+
18+
<name>Oracle Spring Boot - JSON Data Tools</name>
19+
<description>Spring Boot for Oracle Database JSON Data Tools</description>
20+
<url>https://github.com/oracle/spring-cloud-oracle/tree/main/database/starters/oracle-spring-boot-json-data-tools</url>
21+
22+
<organization>
23+
<name>Oracle America, Inc.</name>
24+
<url>https://www.oracle.com</url>
25+
</organization>
26+
27+
<developers>
28+
<developer>
29+
<name>Oracle</name>
30+
<email>obaas_ww at oracle.com</email>
31+
<organization>Oracle America, Inc.</organization>
32+
<organizationUrl>https://www.oracle.com</organizationUrl>
33+
</developer>
34+
</developers>
35+
36+
<licenses>
37+
<license>
38+
<name>The Universal Permissive License (UPL), Version 1.0</name>
39+
<url>https://oss.oracle.com/licenses/upl/</url>
40+
<distribution>repo</distribution>
41+
</license>
42+
</licenses>
43+
44+
<scm>
45+
<url>https://github.com/oracle/spring-cloud-oracle</url>
46+
<connection>scm:git:https://github.com/oracle/spring-cloud-oracle.git</connection>
47+
<developerConnection>scm:git:git@github.com:oracle/spring-cloud-oracle.git</developerConnection>
48+
</scm>
49+
50+
<dependencies>
51+
<dependency>
52+
<groupId>com.oracle.database.spring</groupId>
53+
<artifactId>oracle-spring-boot-starter-ucp</artifactId>
54+
<version>${project.version}</version>
55+
</dependency>
56+
57+
<dependency>
58+
<groupId>org.springframework.boot</groupId>
59+
<artifactId>spring-boot-starter-jdbc</artifactId>
60+
</dependency>
61+
62+
<dependency>
63+
<groupId>jakarta.json</groupId>
64+
<artifactId>jakarta.json-api</artifactId>
65+
</dependency>
66+
67+
<dependency>
68+
<groupId>org.eclipse.parsson</groupId>
69+
<artifactId>parsson</artifactId>
70+
</dependency>
71+
72+
<dependency>
73+
<groupId>jakarta.json.bind</groupId>
74+
<artifactId>jakarta.json.bind-api</artifactId>
75+
</dependency>
76+
77+
<dependency>
78+
<groupId>org.eclipse</groupId>
79+
<artifactId>yasson</artifactId>
80+
</dependency>
81+
82+
<dependency>
83+
<groupId>org.testcontainers</groupId>
84+
<artifactId>junit-jupiter</artifactId>
85+
<scope>test</scope>
86+
</dependency>
87+
88+
<dependency>
89+
<groupId>org.testcontainers</groupId>
90+
<artifactId>testcontainers</artifactId>
91+
<scope>test</scope>
92+
</dependency>
93+
94+
<dependency>
95+
<groupId>org.testcontainers</groupId>
96+
<artifactId>oracle-free</artifactId>
97+
<scope>test</scope>
98+
</dependency>
99+
100+
<dependency>
101+
<groupId>org.springframework.boot</groupId>
102+
<artifactId>spring-boot-starter-test</artifactId>
103+
<scope>test</scope>
104+
</dependency>
105+
106+
<dependency>
107+
<groupId>org.springframework.boot</groupId>
108+
<artifactId>spring-boot-testcontainers</artifactId>
109+
<scope>test</scope>
110+
</dependency>
111+
112+
<dependency>
113+
<groupId>org.springframework.boot</groupId>
114+
<artifactId>spring-boot-starter-data-jdbc</artifactId>
115+
<scope>test</scope>
116+
</dependency>
117+
118+
<dependency>
119+
<groupId>org.projectlombok</groupId>
120+
<artifactId>lombok</artifactId>
121+
<scope>test</scope>
122+
</dependency>
123+
</dependencies>
124+
</project>

‎database/starters/oracle-spring-boot-starter-json-collections/src/main/java/com/oracle/spring/json/JsonCollectionsAutoConfiguration.java renamed to ‎database/starters/oracle-spring-boot-json-data-tools/src/main/java/com/oracle/spring/json/JsonCollectionsAutoConfiguration.java

File renamed without changes.

‎database/starters/oracle-spring-boot-starter-json-collections/src/main/java/com/oracle/spring/json/jsonb/JSONB.java renamed to ‎database/starters/oracle-spring-boot-json-data-tools/src/main/java/com/oracle/spring/json/jsonb/JSONB.java

File renamed without changes.

‎database/starters/oracle-spring-boot-starter-json-collections/src/main/java/com/oracle/spring/json/jsonb/JSONBRowMapper.java renamed to ‎database/starters/oracle-spring-boot-json-data-tools/src/main/java/com/oracle/spring/json/jsonb/JSONBRowMapper.java

File renamed without changes.

‎database/starters/oracle-spring-boot-starter-json-collections/src/main/resources/META-INF/spring.factories renamed to ‎database/starters/oracle-spring-boot-json-data-tools/src/main/resources/META-INF/spring.factories

File renamed without changes.

‎database/starters/oracle-spring-boot-starter-json-collections/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports renamed to ‎database/starters/oracle-spring-boot-json-data-tools/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

File renamed without changes.

‎database/starters/oracle-spring-boot-starter-json-collections/src/test/java/com/oracle/spring/json/JsonCollectionsIT.java renamed to ‎database/starters/oracle-spring-boot-json-data-tools/src/test/java/com/oracle/spring/json/JsonCollectionsIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33
package com.oracle.spring.json;
44

5-
import javax.sql.DataSource;
65
import java.sql.PreparedStatement;
76
import java.time.Duration;
87
import java.util.List;
@@ -12,6 +11,7 @@
1211
import com.oracle.spring.json.jsonb.JSONBRowMapper;
1312
import com.oracle.spring.json.test.Student;
1413
import com.oracle.spring.json.test.StudentDetails;
14+
import javax.sql.DataSource;
1515
import oracle.jdbc.OracleTypes;
1616
import oracle.ucp.jdbc.PoolDataSource;
1717
import oracle.ucp.jdbc.PoolDataSourceFactory;

‎database/starters/oracle-spring-boot-starter-json-collections/src/test/java/com/oracle/spring/json/jsonb/JSONBTest.java renamed to ‎database/starters/oracle-spring-boot-json-data-tools/src/test/java/com/oracle/spring/json/jsonb/JSONBTest.java

File renamed without changes.

‎database/starters/oracle-spring-boot-starter-json-collections/src/test/java/com/oracle/spring/json/test/Student.java renamed to ‎database/starters/oracle-spring-boot-json-data-tools/src/test/java/com/oracle/spring/json/test/Student.java

File renamed without changes.

‎database/starters/oracle-spring-boot-starter-json-collections/src/test/java/com/oracle/spring/json/test/StudentDetails.java renamed to ‎database/starters/oracle-spring-boot-json-data-tools/src/test/java/com/oracle/spring/json/test/StudentDetails.java

File renamed without changes.

‎database/starters/oracle-spring-boot-json-relational-duality-views/pom.xml

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -50,41 +50,15 @@
5050
<dependencies>
5151
<dependency>
5252
<groupId>com.oracle.database.spring</groupId>
53-
<artifactId>oracle-spring-boot-starter-ucp</artifactId>
53+
<artifactId>oracle-spring-boot-json-data-tools</artifactId>
5454
<version>${project.version}</version>
5555
</dependency>
5656

57-
<dependency>
58-
<groupId>org.springframework.boot</groupId>
59-
<artifactId>spring-boot-starter-jdbc</artifactId>
60-
</dependency>
61-
6257
<dependency>
6358
<groupId>org.springframework.boot</groupId>
6459
<artifactId>spring-boot-starter-data-jpa</artifactId>
6560
</dependency>
6661

67-
68-
<dependency>
69-
<groupId>jakarta.json</groupId>
70-
<artifactId>jakarta.json-api</artifactId>
71-
</dependency>
72-
73-
<dependency>
74-
<groupId>org.eclipse.parsson</groupId>
75-
<artifactId>parsson</artifactId>
76-
</dependency>
77-
78-
<dependency>
79-
<groupId>jakarta.json.bind</groupId>
80-
<artifactId>jakarta.json.bind-api</artifactId>
81-
</dependency>
82-
83-
<dependency>
84-
<groupId>org.eclipse</groupId>
85-
<artifactId>yasson</artifactId>
86-
</dependency>
87-
8862
<dependency>
8963
<groupId>org.testcontainers</groupId>
9064
<artifactId>junit-jupiter</artifactId>

‎database/starters/oracle-spring-boot-starter-json-collections/pom.xml

Lines changed: 1 addition & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -50,69 +50,8 @@
5050
<dependencies>
5151
<dependency>
5252
<groupId>com.oracle.database.spring</groupId>
53-
<artifactId>oracle-spring-boot-starter-ucp</artifactId>
53+
<artifactId>oracle-spring-boot-json-data-tools</artifactId>
5454
<version>${project.version}</version>
5555
</dependency>
56-
57-
<dependency>
58-
<groupId>org.springframework.boot</groupId>
59-
<artifactId>spring-boot-starter-jdbc</artifactId>
60-
</dependency>
61-
62-
<dependency>
63-
<groupId>jakarta.json</groupId>
64-
<artifactId>jakarta.json-api</artifactId>
65-
</dependency>
66-
67-
<dependency>
68-
<groupId>org.eclipse.parsson</groupId>
69-
<artifactId>parsson</artifactId>
70-
</dependency>
71-
72-
<dependency>
73-
<groupId>jakarta.json.bind</groupId>
74-
<artifactId>jakarta.json.bind-api</artifactId>
75-
</dependency>
76-
77-
<dependency>
78-
<groupId>org.eclipse</groupId>
79-
<artifactId>yasson</artifactId>
80-
</dependency>
81-
82-
<dependency>
83-
<groupId>org.testcontainers</groupId>
84-
<artifactId>junit-jupiter</artifactId>
85-
<scope>test</scope>
86-
</dependency>
87-
88-
<dependency>
89-
<groupId>org.testcontainers</groupId>
90-
<artifactId>testcontainers</artifactId>
91-
<scope>test</scope>
92-
</dependency>
93-
94-
<dependency>
95-
<groupId>org.testcontainers</groupId>
96-
<artifactId>oracle-free</artifactId>
97-
<scope>test</scope>
98-
</dependency>
99-
100-
<dependency>
101-
<groupId>org.springframework.boot</groupId>
102-
<artifactId>spring-boot-starter-test</artifactId>
103-
<scope>test</scope>
104-
</dependency>
105-
106-
<dependency>
107-
<groupId>org.springframework.boot</groupId>
108-
<artifactId>spring-boot-starter-data-jdbc</artifactId>
109-
<scope>test</scope>
110-
</dependency>
111-
112-
<dependency>
113-
<groupId>org.projectlombok</groupId>
114-
<artifactId>lombok</artifactId>
115-
<scope>test</scope>
116-
</dependency>
11756
</dependencies>
11857
</project>

‎database/starters/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454

5555
<modules>
5656
<module>oracle-spring-boot-json-relational-duality-views</module>
57+
<module>oracle-spring-boot-json-data-tools</module>
5758
<module>oracle-spring-boot-starter-ucp</module>
5859
<module>oracle-spring-boot-starter-wallet</module>
5960
<module>oracle-spring-boot-starter-aqjms</module>

0 commit comments

Comments
 (0)