Skip to content

Commit

Permalink
Enh 37238346 - [37238325->25.03] Move JpaCacheLoader/Store from TopLi…
Browse files Browse the repository at this point in the history
…nk 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]
  • Loading branch information
jfialli committed Dec 13, 2024
1 parent 72ec65e commit 9f09f58
Show file tree
Hide file tree
Showing 26 changed files with 1,937 additions and 2 deletions.
5 changes: 5 additions & 0 deletions prj/coherence-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,11 @@
<artifactId>coherence-jcache</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${coherence.group.id}</groupId>
<artifactId>coherence-jpa</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${coherence.group.id}</groupId>
<artifactId>coherence-json</artifactId>
Expand Down
28 changes: 28 additions & 0 deletions prj/coherence-dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@
<eclipse.mp.config.version>3.1</eclipse.mp.config.version>
<!-- NOTE: this version should ideally be in sync' with that used by Helidon microprofile -->
<eclipse.mp.health.version>4.0.1</eclipse.mp.health.version>
<eclipselink.version>3.0.4</eclipselink.version>
<!-- NOTE: this version should ideally be in sync' with that used by Helidon microprofile -->
<eclipse.mp.metrics.version>5.1.1</eclipse.mp.metrics.version>
<fastutil.version>8.5.14</fastutil.version>
Expand Down Expand Up @@ -214,6 +215,7 @@
<!-- Helidon version.lib.jakarta.jsonb-api -->
<jakarta.json.bind.version>3.0.1</jakarta.json.bind.version>
<jakarta.json.impl.version>2.0.1</jakarta.json.impl.version>
<jakarta.persistence.version>3.2.0</jakarta.persistence.version>
<jakarta.resource.version>2.1.0</jakarta.resource.version>
<jakarta.servlet.version>4.0.4</jakarta.servlet.version>
<jakarta.servlet.jsp.version>2.3.6</jakarta.servlet.jsp.version>
Expand Down Expand Up @@ -387,6 +389,20 @@
<version>${jhdf.version}</version>
</dependency>

<!-- EclipseLink -->
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>eclipselink</artifactId>
<version>${eclipselink.version}</version>
</dependency>

<!-- EclipseLink jakarta.persistence -->
<dependency>
<groupId>jakarta.persistence</groupId>
<artifactId>jakarta.persistence-api</artifactId>
<version>${jakarta.persistence.version}</version>
</dependency>

<!-- Eclipse MicroProfile -->
<dependency>
<groupId>org.eclipse.microprofile.config</groupId>
Expand Down Expand Up @@ -444,6 +460,13 @@
<scope>import</scope>
</dependency>

<!-- hsqldb -->
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>${hsqldb.version}</version>
</dependency>

<!-- jackson -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down Expand Up @@ -813,6 +836,11 @@
<artifactId>jaxb-impl</artifactId>
<version>${jaxb-impl.version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-xjc</artifactId>
<version>${jaxb-impl.version}</version>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
Expand Down
17 changes: 16 additions & 1 deletion prj/coherence-javadoc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,12 @@
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>${coherence.group.id}</groupId>
<artifactId>coherence-jpa</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>${coherence.group.id}</groupId>
<artifactId>coherence-discovery</artifactId>
Expand Down Expand Up @@ -480,7 +486,10 @@
<resource>
<directory>../coherence-java-client/src/main/java</directory>
</resource>
<resource>
<resource>
<directory>../coherence-jpa/src/main/java</directory>
</resource>
<resource>
<directory>../coherence-discovery/src/main/java</directory>
</resource>
</resources>
Expand Down Expand Up @@ -537,6 +546,8 @@

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

<include>com/oracle/coherence/jpa/**/*.java</include>

<include>com/oracle/coherence/mp/**/*.java</include>

<include>com/oracle/coherence/grpc/**/*.java</include>
Expand Down Expand Up @@ -794,6 +805,10 @@
<title>gRPC</title>
<packages>com.oracle.coherence.grpc*</packages>
</group>
<group>
<title>JPA Integration</title>
<packages>com.oracle.coherence.jpa*</packages>
</group>
<group>
<title>Repository API</title>
<packages>com.oracle.coherence.repository*</packages>
Expand Down
129 changes: 129 additions & 0 deletions prj/coherence-jpa/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2000, 2024, Oracle and/or its affiliates.
~
~ Licensed under the Universal Permissive License v 1.0 as shown at
~ https://oss.oracle.com/licenses/upl.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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>

<parent>
<groupId>com.oracle.coherence.ce</groupId>
<artifactId>main</artifactId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>coherence-jpa</artifactId>
<name>Coherence JPA Integration</name>

<properties>
<module.name>com.oracle.coherence.jpa</module.name>

<!-- this module should be published -->
<maven.deploy.skip>false</maven.deploy.skip>
</properties>

<dependencies>
<dependency>
<groupId>${coherence.group.id}</groupId>
<artifactId>coherence</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>jakarta.persistence</groupId>
<artifactId>jakarta.persistence-api</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
<id>compile-java21</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<release>21</release>
<compileSourceRoots>
<compileSourceRoot>${project.basedir}/src/main/java21</compileSourceRoot>
</compileSourceRoots>
<multiReleaseOutput>true</multiReleaseOutput>
</configuration>
</execution>
</executions>
</plugin>

<!-- flatten POM to remove build-specific content -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
</plugin>

<plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<executions>
<execution>
<id>manifest</id>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
<configuration>
<instructions>
<Export-Package>com.oracle.coherence.jpa.*</Export-Package>
<Import-Package>
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)"
</Import-Package>
</instructions>
</configuration>
</execution>
</executions>
</plugin>

<!-- create module descriptor (module-info) -->
<plugin>
<groupId>com.oracle.coherence.moditect</groupId>
<artifactId>moditect-maven-plugin</artifactId>
<executions>
<execution>
<id>add-module-info</id>
<phase>package</phase>
<goals>
<goal>add-module-info</goal>
</goals>
<configuration>
<module>
<moduleInfo>
<name>${module.name}</name>
<open>true</open>
<exports>
*;
</exports>
</moduleInfo>
</module>
</configuration>
</execution>
</executions>
</plugin>

</plugins>
</build>

</project>
Loading

0 comments on commit 9f09f58

Please sign in to comment.