Skip to content

Commit 9f09f58

Browse files
jfiallijfialli
committed
Enh 37238346 - [37238325->25.03] Move JpaCacheLoader/Store from TopLink to Coherence produced coherence-jpa module (main->ce-main)
Remote remote.full on coherence-ce/main success, changes 112912, synced @112913, job.9.20241213013337.16468 [git-p4: depot-paths = "//dev/coherence-ce/main/": change = 112917]
1 parent 72ec65e commit 9f09f58

File tree

26 files changed

+1937
-2
lines changed

26 files changed

+1937
-2
lines changed

‎prj/coherence-bom/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,11 @@
191191
<artifactId>coherence-jcache</artifactId>
192192
<version>${project.version}</version>
193193
</dependency>
194+
<dependency>
195+
<groupId>${coherence.group.id}</groupId>
196+
<artifactId>coherence-jpa</artifactId>
197+
<version>${project.version}</version>
198+
</dependency>
194199
<dependency>
195200
<groupId>${coherence.group.id}</groupId>
196201
<artifactId>coherence-json</artifactId>

‎prj/coherence-dependencies/pom.xml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@
152152
<eclipse.mp.config.version>3.1</eclipse.mp.config.version>
153153
<!-- NOTE: this version should ideally be in sync' with that used by Helidon microprofile -->
154154
<eclipse.mp.health.version>4.0.1</eclipse.mp.health.version>
155+
<eclipselink.version>3.0.4</eclipselink.version>
155156
<!-- NOTE: this version should ideally be in sync' with that used by Helidon microprofile -->
156157
<eclipse.mp.metrics.version>5.1.1</eclipse.mp.metrics.version>
157158
<fastutil.version>8.5.14</fastutil.version>
@@ -214,6 +215,7 @@
214215
<!-- Helidon version.lib.jakarta.jsonb-api -->
215216
<jakarta.json.bind.version>3.0.1</jakarta.json.bind.version>
216217
<jakarta.json.impl.version>2.0.1</jakarta.json.impl.version>
218+
<jakarta.persistence.version>3.2.0</jakarta.persistence.version>
217219
<jakarta.resource.version>2.1.0</jakarta.resource.version>
218220
<jakarta.servlet.version>4.0.4</jakarta.servlet.version>
219221
<jakarta.servlet.jsp.version>2.3.6</jakarta.servlet.jsp.version>
@@ -387,6 +389,20 @@
387389
<version>${jhdf.version}</version>
388390
</dependency>
389391

392+
<!-- EclipseLink -->
393+
<dependency>
394+
<groupId>org.eclipse.persistence</groupId>
395+
<artifactId>eclipselink</artifactId>
396+
<version>${eclipselink.version}</version>
397+
</dependency>
398+
399+
<!-- EclipseLink jakarta.persistence -->
400+
<dependency>
401+
<groupId>jakarta.persistence</groupId>
402+
<artifactId>jakarta.persistence-api</artifactId>
403+
<version>${jakarta.persistence.version}</version>
404+
</dependency>
405+
390406
<!-- Eclipse MicroProfile -->
391407
<dependency>
392408
<groupId>org.eclipse.microprofile.config</groupId>
@@ -444,6 +460,13 @@
444460
<scope>import</scope>
445461
</dependency>
446462

463+
<!-- hsqldb -->
464+
<dependency>
465+
<groupId>org.hsqldb</groupId>
466+
<artifactId>hsqldb</artifactId>
467+
<version>${hsqldb.version}</version>
468+
</dependency>
469+
447470
<!-- jackson -->
448471
<dependency>
449472
<groupId>com.fasterxml.jackson.core</groupId>
@@ -813,6 +836,11 @@
813836
<artifactId>jaxb-impl</artifactId>
814837
<version>${jaxb-impl.version}</version>
815838
</dependency>
839+
<dependency>
840+
<groupId>com.sun.xml.bind</groupId>
841+
<artifactId>jaxb-xjc</artifactId>
842+
<version>${jaxb-impl.version}</version>
843+
</dependency>
816844
<dependency>
817845
<groupId>jakarta.xml.bind</groupId>
818846
<artifactId>jakarta.xml.bind-api</artifactId>

‎prj/coherence-javadoc/pom.xml‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,12 @@
101101
<version>${project.version}</version>
102102
</dependency>
103103

104+
<dependency>
105+
<groupId>${coherence.group.id}</groupId>
106+
<artifactId>coherence-jpa</artifactId>
107+
<version>${project.version}</version>
108+
</dependency>
109+
104110
<dependency>
105111
<groupId>${coherence.group.id}</groupId>
106112
<artifactId>coherence-discovery</artifactId>
@@ -480,7 +486,10 @@
480486
<resource>
481487
<directory>../coherence-java-client/src/main/java</directory>
482488
</resource>
483-
<resource>
489+
<resource>
490+
<directory>../coherence-jpa/src/main/java</directory>
491+
</resource>
492+
<resource>
484493
<directory>../coherence-discovery/src/main/java</directory>
485494
</resource>
486495
</resources>
@@ -537,6 +546,8 @@
537546

538547
<include>com/oracle/coherence/concurrent/**/*.java</include>
539548

549+
<include>com/oracle/coherence/jpa/**/*.java</include>
550+
540551
<include>com/oracle/coherence/mp/**/*.java</include>
541552

542553
<include>com/oracle/coherence/grpc/**/*.java</include>
@@ -794,6 +805,10 @@
794805
<title>gRPC</title>
795806
<packages>com.oracle.coherence.grpc*</packages>
796807
</group>
808+
<group>
809+
<title>JPA Integration</title>
810+
<packages>com.oracle.coherence.jpa*</packages>
811+
</group>
797812
<group>
798813
<title>Repository API</title>
799814
<packages>com.oracle.coherence.repository*</packages>

‎prj/coherence-jpa/pom.xml‎

Lines changed: 129 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,129 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Copyright (c) 2000, 2024, Oracle and/or its affiliates.
4+
~
5+
~ Licensed under the Universal Permissive License v 1.0 as shown at
6+
~ https://oss.oracle.com/licenses/upl.
7+
-->
8+
<project xmlns="http://maven.apache.org/POM/4.0.0"
9+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
11+
<modelVersion>4.0.0</modelVersion>
12+
13+
<parent>
14+
<groupId>com.oracle.coherence.ce</groupId>
15+
<artifactId>main</artifactId>
16+
<version>${revision}</version>
17+
<relativePath>../pom.xml</relativePath>
18+
</parent>
19+
20+
<artifactId>coherence-jpa</artifactId>
21+
<name>Coherence JPA Integration</name>
22+
23+
<properties>
24+
<module.name>com.oracle.coherence.jpa</module.name>
25+
26+
<!-- this module should be published -->
27+
<maven.deploy.skip>false</maven.deploy.skip>
28+
</properties>
29+
30+
<dependencies>
31+
<dependency>
32+
<groupId>${coherence.group.id}</groupId>
33+
<artifactId>coherence</artifactId>
34+
<version>${project.version}</version>
35+
</dependency>
36+
<dependency>
37+
<groupId>jakarta.persistence</groupId>
38+
<artifactId>jakarta.persistence-api</artifactId>
39+
</dependency>
40+
</dependencies>
41+
42+
<build>
43+
<plugins>
44+
<plugin>
45+
<artifactId>maven-compiler-plugin</artifactId>
46+
<executions>
47+
<execution>
48+
<id>compile-java21</id>
49+
<phase>compile</phase>
50+
<goals>
51+
<goal>compile</goal>
52+
</goals>
53+
<configuration>
54+
<release>21</release>
55+
<compileSourceRoots>
56+
<compileSourceRoot>${project.basedir}/src/main/java21</compileSourceRoot>
57+
</compileSourceRoots>
58+
<multiReleaseOutput>true</multiReleaseOutput>
59+
</configuration>
60+
</execution>
61+
</executions>
62+
</plugin>
63+
64+
<!-- flatten POM to remove build-specific content -->
65+
<plugin>
66+
<groupId>org.codehaus.mojo</groupId>
67+
<artifactId>flatten-maven-plugin</artifactId>
68+
</plugin>
69+
70+
<plugin>
71+
<artifactId>maven-jar-plugin</artifactId>
72+
<configuration>
73+
<archive>
74+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
75+
</archive>
76+
</configuration>
77+
</plugin>
78+
<plugin>
79+
<groupId>org.apache.felix</groupId>
80+
<artifactId>maven-bundle-plugin</artifactId>
81+
<executions>
82+
<execution>
83+
<id>manifest</id>
84+
<phase>process-classes</phase>
85+
<goals>
86+
<goal>manifest</goal>
87+
</goals>
88+
<configuration>
89+
<instructions>
90+
<Export-Package>com.oracle.coherence.jpa.*</Export-Package>
91+
<Import-Package>
92+
com.tangosol.net.cache;version="[${project.version.short},${project.version.next.short})",com.tangosol.util;version="[${project.version.short},${project.version.next.short})",jakarta.persistence;version="[3.1.0,4.0)"
93+
</Import-Package>
94+
</instructions>
95+
</configuration>
96+
</execution>
97+
</executions>
98+
</plugin>
99+
100+
<!-- create module descriptor (module-info) -->
101+
<plugin>
102+
<groupId>com.oracle.coherence.moditect</groupId>
103+
<artifactId>moditect-maven-plugin</artifactId>
104+
<executions>
105+
<execution>
106+
<id>add-module-info</id>
107+
<phase>package</phase>
108+
<goals>
109+
<goal>add-module-info</goal>
110+
</goals>
111+
<configuration>
112+
<module>
113+
<moduleInfo>
114+
<name>${module.name}</name>
115+
<open>true</open>
116+
<exports>
117+
*;
118+
</exports>
119+
</moduleInfo>
120+
</module>
121+
</configuration>
122+
</execution>
123+
</executions>
124+
</plugin>
125+
126+
</plugins>
127+
</build>
128+
129+
</project>

0 commit comments

Comments
 (0)