This is an automated email from the ASF dual-hosted git repository. lahirujayathilake pushed a commit to branch cybershuttle-dev in repository https://gitbox.apache.org/repos/asf/airavata.git
commit aeba3818915a10d9df96c0ceceea837df9983f95 Author: yasith <[email protected]> AuthorDate: Mon Mar 17 06:48:34 2025 +0000 bump all jdk deps to 17. get devcontainer to working state. add launch.json for vscode integration. add openjpa runtimeoptimization tag to persistence.xml. bump mysql connector to 8.0.31. add dns tags to keystore generation script (browser https compatibility), move keystores to top-level and add build-time copy to project resources. fix Serializable warning in UserPK.java --- .devcontainer/devcontainer.json | 14 +++-------- .vscode/launch.json | 26 +++++++++++++++++++++ .../airavata-client-sdks/airavata-cpp-sdk/pom.xml | 2 +- .../airavata-client-sdks/airavata-php-sdk/pom.xml | 2 +- .../profile-service-commons/pom.xml | 9 ++++--- .../src/main/resources/META-INF/persistence.xml | 1 + .../profile-service/profile-tenant-core/pom.xml | 2 +- .../profile-service/profile-user-core/pom.xml | 5 ++-- keystores/airavata.jks | Bin 2832 -> 2848 bytes keystores/client_truststore.jks | Bin 2323 -> 2351 bytes keystores/generate_keystore.sh | 3 ++- modules/agent-framework/agent-service/pom.xml | 8 +++---- modules/agent-framework/pom.xml | 5 ++-- .../metadata-analyzer/pom.xml | 4 ++-- .../metascheduler-core/pom.xml | 4 ++-- modules/airavata-metascheduler/pom.xml | 4 ++-- .../process-scheduler/pom.xml | 4 ++-- .../computer-resource-monitoring-service/pom.xml | 4 ++-- .../credential-store-service/pom.xml | 1 + modules/distribution/pom.xml | 2 +- modules/ide-integration/pom.xml | 11 +++++---- .../app/tests/selenium/pom.xml | 6 ++--- modules/registry/registry-core/pom.xml | 5 ++-- .../registry/core/entities/expcatalog/UserPK.java | 4 +++- .../src/main/resources/META-INF/persistence.xml | 20 ++++++++++++++++ modules/server/pom.xml | 6 ++--- .../sharing-registry/sharing-data-migrator/pom.xml | 6 ++--- .../sharing-registry-server/pom.xml | 15 ++++++------ .../src/main/resources/META-INF/persistence.xml | 5 ++++ .../sharing-registry-stubs/pom.xml | 3 +-- pom.xml | 10 ++++---- 31 files changed, 118 insertions(+), 73 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 14159f731f..d87d85aeac 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -20,16 +20,8 @@ } }, // Use 'forwardPorts' to make a list of ports inside the container available locally. - "forwardPorts": [ - 18080, - 8443, - 13306, - 5672, - 15672, - 12181, - 9092, - 22222 - ], + // TODO mention the ports used all airavata services + "forwardPorts": [], // Use 'postCreateCommand' to run commands after the container is created. "postCreateCommand": "mise install -y [email protected] && mise use -g [email protected] && echo 'export PATH=$PATH:~/.local/share/mise/installs/maven/3.9.9/bin' >> ~/.bashrc", // Configure tool-specific properties. @@ -37,6 +29,7 @@ "vscode": { "extensions": [ "esbenp.prettier-vscode", + "eamodio.gitlens", "foxundermoon.shell-format", "golang.go", "lkrms.inifmt", @@ -51,5 +44,4 @@ } // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root. // "remoteUser": "root" - } \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000000..317c8693e0 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,26 @@ +{ + "configurations": [ + { + "type": "java", + "name": "Start API Server", + "request": "launch", + "cwd": "${workspaceFolder}/modules/ide-integration", + "mainClass": "org.apache.airavata.ide.integration.APIServerStarter", + "vmArgs": "-javaagent:/home/vscode/.m2/repository/org/apache/openjpa/openjpa/3.2.2/openjpa-3.2.2.jar", + }, + { + "type": "java", + "name": "Start Job Engine", + "request": "launch", + "cwd": "${workspaceFolder}/modules/ide-integration", + "mainClass": "org.apache.airavata.ide.integration.JobEngineStarter" + }, + { + "type": "java", + "name": "Start Job Monitor", + "request": "launch", + "cwd": "${workspaceFolder}/modules/ide-integration", + "mainClass": "org.apache.airavata.ide.integration.JobMonitorStarter" + } + ], +} \ No newline at end of file diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/pom.xml b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/pom.xml index b4a846e35c..fe7cffd281 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/pom.xml +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/pom.xml @@ -43,7 +43,7 @@ <executions> <execution> <id>unpack</id> - <phase>compile</phase> + <phase>package</phase> <goals> <goal>unpack</goal> </goals> diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/pom.xml b/airavata-api/airavata-client-sdks/airavata-php-sdk/pom.xml index b2686aee96..91052cc17b 100644 --- a/airavata-api/airavata-client-sdks/airavata-php-sdk/pom.xml +++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/pom.xml @@ -43,7 +43,7 @@ <executions> <execution> <id>unpack</id> - <phase>compile</phase> + <phase>package</phase> <goals> <goal>unpack</goal> </goals> diff --git a/airavata-services/profile-service/profile-service-commons/pom.xml b/airavata-services/profile-service/profile-service-commons/pom.xml index 370ad62cd9..046b9cb1a8 100644 --- a/airavata-services/profile-service/profile-service-commons/pom.xml +++ b/airavata-services/profile-service/profile-service-commons/pom.xml @@ -36,7 +36,7 @@ <derby.version>10.11.1.1</derby.version> <surefire.version>2.18.1</surefire.version> <skipTests>true</skipTests> - <mysql.connector.version>5.1.34</mysql.connector.version> + <mysql.connector.version>8.0.31</mysql.connector.version> </properties> <dependencies> @@ -90,9 +90,9 @@ <artifactId>maven-compiler-plugin</artifactId> <version>3.8.0</version> <configuration> - <!--<source>1.8</source>--> - <!--<target>1.8</target>--> - <release>11</release> + <!--<source>17</source>--> + <!--<target>17</target>--> + <release>17</release> </configuration> </plugin> <plugin> @@ -108,7 +108,6 @@ <executions> <execution> <id>enhancer</id> - <phase>process-classes</phase> <goals> <goal>enhance</goal> </goals> diff --git a/airavata-services/profile-service/profile-service-commons/src/main/resources/META-INF/persistence.xml b/airavata-services/profile-service/profile-service-commons/src/main/resources/META-INF/persistence.xml index 08c9bed003..c470f63de7 100644 --- a/airavata-services/profile-service/profile-service-commons/src/main/resources/META-INF/persistence.xml +++ b/airavata-services/profile-service/profile-service-commons/src/main/resources/META-INF/persistence.xml @@ -29,6 +29,7 @@ <exclude-unlisted-classes>true</exclude-unlisted-classes> <properties> + <property name="openjpa.RuntimeOptimization" value="true" /> <property name="openjpa.jdbc.MappingDefaults" value="ForeignKeyDeleteAction=cascade, JoinForeignKeyDeleteAction=cascade" /> </properties> diff --git a/airavata-services/profile-service/profile-tenant-core/pom.xml b/airavata-services/profile-service/profile-tenant-core/pom.xml index 464d4eeff1..baeb2f7c7c 100644 --- a/airavata-services/profile-service/profile-tenant-core/pom.xml +++ b/airavata-services/profile-service/profile-tenant-core/pom.xml @@ -36,7 +36,7 @@ <derby.version>10.11.1.1</derby.version> <surefire.version>2.18.1</surefire.version> <skipTests>false</skipTests> - <mysql.connector.version>5.1.34</mysql.connector.version> + <mysql.connector.version>8.0.31</mysql.connector.version> </properties> <dependencies> diff --git a/airavata-services/profile-service/profile-user-core/pom.xml b/airavata-services/profile-service/profile-user-core/pom.xml index eebf3f3f38..72f0bb5100 100644 --- a/airavata-services/profile-service/profile-user-core/pom.xml +++ b/airavata-services/profile-service/profile-user-core/pom.xml @@ -36,7 +36,7 @@ <derby.version>10.11.1.1</derby.version> <surefire.version>2.18.1</surefire.version> <skipTests>false</skipTests> - <mysql.connector.version>5.1.34</mysql.connector.version> + <mysql.connector.version>8.0.31</mysql.connector.version> </properties> <dependencies> @@ -54,7 +54,7 @@ <artifactId>maven-compiler-plugin</artifactId> <version>3.8.0</version> <configuration> - <release>11</release> + <release>17</release> <compilerArgs> <arg>--add-opens=java.base/java.lang=ALL-UNNAMED</arg> </compilerArgs> @@ -74,7 +74,6 @@ <executions> <execution> <id>enhancer</id> - <phase>process-classes</phase> <goals> <goal>enhance</goal> </goals> diff --git a/keystores/airavata.jks b/keystores/airavata.jks index 3a65bad801..a199d39600 100644 Binary files a/keystores/airavata.jks and b/keystores/airavata.jks differ diff --git a/keystores/client_truststore.jks b/keystores/client_truststore.jks index ea85617d83..d163c6d4f1 100644 Binary files a/keystores/client_truststore.jks and b/keystores/client_truststore.jks differ diff --git a/keystores/generate_keystore.sh b/keystores/generate_keystore.sh index 5ba331ccd3..dfb46d8f3e 100755 --- a/keystores/generate_keystore.sh +++ b/keystores/generate_keystore.sh @@ -5,7 +5,8 @@ rm -f airavata.jks client_truststore.jks # Generate a PKCS12 keystore with a self-signed certificate keytool -genkey -keyalg RSA -alias selfsigned -keystore airavata.jks -storetype pkcs12 -storepass airavata -validity 360 -keysize 2048 \ - -dname "CN=airavata.host, OU=airavata.host, O=airavata.host, L=airavata.host, ST=airavata.host, C=airavata.host" + -dname "CN=airavata.host, OU=airavata.host, O=airavata.host, L=airavata.host, ST=airavata.host, C=airavata.host" \ + -ext san=dns:airavata.host # Also generate a JKS keystore with that certificate (for backward-compatibility) keytool -importkeystore -noprompt \ diff --git a/modules/agent-framework/agent-service/pom.xml b/modules/agent-framework/agent-service/pom.xml index fc0bc8e1d2..29f3cf4c88 100644 --- a/modules/agent-framework/agent-service/pom.xml +++ b/modules/agent-framework/agent-service/pom.xml @@ -12,8 +12,8 @@ <artifactId>agent-service</artifactId> <properties> - <maven.compiler.source>11</maven.compiler.source> - <maven.compiler.target>11</maven.compiler.target> + <maven.compiler.source>17</maven.compiler.source> + <maven.compiler.target>17</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <jul-to-slf4j.version>1.7.0</jul-to-slf4j.version> <json.version>20240303</json.version> @@ -166,8 +166,8 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <source>14</source> - <target>14</target> + <source>17</source> + <target>17</target> </configuration> </plugin> <plugin> diff --git a/modules/agent-framework/pom.xml b/modules/agent-framework/pom.xml index c26190f5fe..71d3b8d32a 100644 --- a/modules/agent-framework/pom.xml +++ b/modules/agent-framework/pom.xml @@ -17,8 +17,8 @@ </modules> <properties> - <maven.compiler.source>11</maven.compiler.source> - <maven.compiler.target>11</maven.compiler.target> + <maven.compiler.source>17</maven.compiler.source> + <maven.compiler.target>17</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> @@ -26,6 +26,7 @@ <resources> <resource> <directory>../../keystores</directory> + <targetPath>keystores</targetPath> <includes> <include>*.jks</include> <include>*.p12</include> diff --git a/modules/airavata-metascheduler/metadata-analyzer/pom.xml b/modules/airavata-metascheduler/metadata-analyzer/pom.xml index 34fcad2e99..8fe700bfec 100644 --- a/modules/airavata-metascheduler/metadata-analyzer/pom.xml +++ b/modules/airavata-metascheduler/metadata-analyzer/pom.xml @@ -13,8 +13,8 @@ <artifactId>metadata-analyzer</artifactId> <properties> - <maven.compiler.source>11</maven.compiler.source> - <maven.compiler.target>11</maven.compiler.target> + <maven.compiler.source>17</maven.compiler.source> + <maven.compiler.target>17</maven.compiler.target> </properties> <dependencies> diff --git a/modules/airavata-metascheduler/metascheduler-core/pom.xml b/modules/airavata-metascheduler/metascheduler-core/pom.xml index 1c1d20b8e6..fda2bb32ce 100644 --- a/modules/airavata-metascheduler/metascheduler-core/pom.xml +++ b/modules/airavata-metascheduler/metascheduler-core/pom.xml @@ -13,8 +13,8 @@ <artifactId>metascheduler-core</artifactId> <properties> - <maven.compiler.source>11</maven.compiler.source> - <maven.compiler.target>11</maven.compiler.target> + <maven.compiler.source>17</maven.compiler.source> + <maven.compiler.target>17</maven.compiler.target> </properties> diff --git a/modules/airavata-metascheduler/pom.xml b/modules/airavata-metascheduler/pom.xml index f2a93aab50..fb869d410e 100644 --- a/modules/airavata-metascheduler/pom.xml +++ b/modules/airavata-metascheduler/pom.xml @@ -13,8 +13,8 @@ <artifactId>airavata-metascheduler</artifactId> <properties> - <maven.compiler.source>11</maven.compiler.source> - <maven.compiler.target>11</maven.compiler.target> + <maven.compiler.source>17</maven.compiler.source> + <maven.compiler.target>17</maven.compiler.target> </properties> </project> \ No newline at end of file diff --git a/modules/airavata-metascheduler/process-scheduler/pom.xml b/modules/airavata-metascheduler/process-scheduler/pom.xml index fc5d372094..8a573f2a66 100644 --- a/modules/airavata-metascheduler/process-scheduler/pom.xml +++ b/modules/airavata-metascheduler/process-scheduler/pom.xml @@ -13,8 +13,8 @@ <artifactId>process-scheduler</artifactId> <properties> - <maven.compiler.source>11</maven.compiler.source> - <maven.compiler.target>11</maven.compiler.target> + <maven.compiler.source>17</maven.compiler.source> + <maven.compiler.target>17</maven.compiler.target> </properties> <dependencies> diff --git a/modules/computer-resource-monitoring-service/pom.xml b/modules/computer-resource-monitoring-service/pom.xml index 6586d367b9..ac00bf137b 100644 --- a/modules/computer-resource-monitoring-service/pom.xml +++ b/modules/computer-resource-monitoring-service/pom.xml @@ -59,8 +59,8 @@ </dependencies> <properties> - <maven.compiler.source>11</maven.compiler.source> - <maven.compiler.target>11</maven.compiler.target> + <maven.compiler.source>17</maven.compiler.source> + <maven.compiler.target>17</maven.compiler.target> </properties> </project> \ No newline at end of file diff --git a/modules/credential-store/credential-store-service/pom.xml b/modules/credential-store/credential-store-service/pom.xml index 132dd0c2e0..549f441ca1 100644 --- a/modules/credential-store/credential-store-service/pom.xml +++ b/modules/credential-store/credential-store-service/pom.xml @@ -172,6 +172,7 @@ </testResource> <testResource> <directory>${project.basedir}/../../../keystores</directory> + <targetPath>keystores</targetPath> <includes> <include>*.jks</include> <include>*.p12</include> diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 20b544ba76..cd0c643fec 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -434,7 +434,7 @@ <executions> <execution> <id>unpack</id> - <phase>compile</phase> + <phase>package</phase> <goals> <goal>unpack</goal> </goals> diff --git a/modules/ide-integration/pom.xml b/modules/ide-integration/pom.xml index 0903119c56..1b8162b6d5 100644 --- a/modules/ide-integration/pom.xml +++ b/modules/ide-integration/pom.xml @@ -84,11 +84,12 @@ </excludes> </resource> <resource> - <directory>../../keystores</directory> - <includes> - <include>*.jks</include> - <include>*.p12</include> - </includes> + <directory>../../keystores</directory> + <targetPath>keystores</targetPath> + <includes> + <include>*.jks</include> + <include>*.p12</include> + </includes> </resource> </resources> </build> diff --git a/modules/ide-integration/src/main/containers/pga/airavata-php-gateway/app/tests/selenium/pom.xml b/modules/ide-integration/src/main/containers/pga/airavata-php-gateway/app/tests/selenium/pom.xml index 028c3ccb78..2221c68406 100755 --- a/modules/ide-integration/src/main/containers/pga/airavata-php-gateway/app/tests/selenium/pom.xml +++ b/modules/ide-integration/src/main/containers/pga/airavata-php-gateway/app/tests/selenium/pom.xml @@ -15,9 +15,9 @@ <artifactId>maven-compiler-plugin</artifactId> <version>3.8.0</version> <configuration> - <!--<source>1.7</source>--> - <!--<target>1.7</target>--> - <release>11</release> + <!--<source>17</source>--> + <!--<target>17</target>--> + <release>17</release> </configuration> </plugin> <plugin> diff --git a/modules/registry/registry-core/pom.xml b/modules/registry/registry-core/pom.xml index a5b7c2cf58..e90d34c499 100644 --- a/modules/registry/registry-core/pom.xml +++ b/modules/registry/registry-core/pom.xml @@ -37,7 +37,7 @@ <derby.version>10.11.1.1</derby.version> <surefire.version>2.18.1</surefire.version> <skipTests>false</skipTests> - <mysql.connector.version>5.1.34</mysql.connector.version> + <mysql.connector.version>8.0.31</mysql.connector.version> </properties> <dependencies> @@ -130,7 +130,7 @@ <artifactId>maven-compiler-plugin</artifactId> <version>3.8.0</version> <configuration> - <release>11</release> + <release>17</release> <!--<compilerArgs>--> <!--<arg>--add-opens=java.base/java.lang=ALL-UNNAMED</arg>--> <!--</compilerArgs>--> @@ -231,7 +231,6 @@ <executions> <execution> <id>enhancer</id> - <phase>process-classes</phase> <goals> <goal>enhance</goal> </goals> diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/UserPK.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/UserPK.java index 2b7f15dc2c..ccce246be6 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/UserPK.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/UserPK.java @@ -1,6 +1,8 @@ package org.apache.airavata.registry.core.entities.expcatalog; -public class UserPK { +import java.io.Serializable; + +public class UserPK implements Serializable { private String gatewayId; private String userId; diff --git a/modules/registry/registry-core/src/main/resources/META-INF/persistence.xml b/modules/registry/registry-core/src/main/resources/META-INF/persistence.xml index cac5e36771..d0744c8422 100644 --- a/modules/registry/registry-core/src/main/resources/META-INF/persistence.xml +++ b/modules/registry/registry-core/src/main/resources/META-INF/persistence.xml @@ -81,6 +81,11 @@ <class>org.apache.airavata.registry.core.entities.appcatalog.ParserConnectorEntity</class> <class>org.apache.airavata.registry.core.entities.appcatalog.ComputeResourceReservationEntity</class> <exclude-unlisted-classes>true</exclude-unlisted-classes> + <properties> + <property name="openjpa.RuntimeOptimization" value="true" /> + <property name="openjpa.jdbc.MappingDefaults" + value="ForeignKeyDeleteAction=cascade, JoinForeignKeyDeleteAction=cascade" /> + </properties> </persistence-unit> <persistence-unit name="replicacatalog_data_new"> <class>org.apache.airavata.registry.core.entities.replicacatalog.ConfigurationEntity</class> @@ -89,6 +94,11 @@ <class>org.apache.airavata.registry.core.entities.replicacatalog.DataReplicaLocationEntity</class> <class>org.apache.airavata.registry.core.entities.replicacatalog.DataReplicaMetadataEntity</class> <exclude-unlisted-classes>true</exclude-unlisted-classes> + <properties> + <property name="openjpa.RuntimeOptimization" value="true" /> + <property name="openjpa.jdbc.MappingDefaults" + value="ForeignKeyDeleteAction=cascade, JoinForeignKeyDeleteAction=cascade" /> + </properties> </persistence-unit> <persistence-unit name="workflowcatalog_data_new"> <class>org.apache.airavata.registry.core.entities.airavataworkflowcatalog.AiravataWorkflowEntity</class> @@ -105,6 +115,11 @@ <class>org.apache.airavata.registry.core.entities.airavataworkflowcatalog.WorkflowDataBlockEntity</class> <class>org.apache.airavata.registry.core.entities.airavataworkflowcatalog.WorkflowHandlerEntity</class> <exclude-unlisted-classes>true</exclude-unlisted-classes> + <properties> + <property name="openjpa.RuntimeOptimization" value="true" /> + <property name="openjpa.jdbc.MappingDefaults" + value="ForeignKeyDeleteAction=cascade, JoinForeignKeyDeleteAction=cascade" /> + </properties> </persistence-unit> <persistence-unit name="experiment_data_new"> <class>org.apache.airavata.registry.core.entities.expcatalog.ExperimentEntity</class> @@ -136,5 +151,10 @@ <class>org.apache.airavata.registry.core.entities.expcatalog.ComputationalResourceSchedulingEntity</class> <class>org.apache.airavata.registry.core.entities.expcatalog.UserEntity</class> <exclude-unlisted-classes>true</exclude-unlisted-classes> + <properties> + <property name="openjpa.RuntimeOptimization" value="true" /> + <property name="openjpa.jdbc.MappingDefaults" + value="ForeignKeyDeleteAction=cascade, JoinForeignKeyDeleteAction=cascade" /> + </properties> </persistence-unit> </persistence> diff --git a/modules/server/pom.xml b/modules/server/pom.xml index b7b22ce475..8f5cfe09e5 100644 --- a/modules/server/pom.xml +++ b/modules/server/pom.xml @@ -38,9 +38,9 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <!--<source>9</source>--> - <!--<target>9</target>--> - <release>11</release> + <!--<source>17</source>--> + <!--<target>17</target>--> + <release>17</release> </configuration> </plugin> </plugins> diff --git a/modules/sharing-registry/sharing-data-migrator/pom.xml b/modules/sharing-registry/sharing-data-migrator/pom.xml index 40cf956e9b..17f4c67a72 100644 --- a/modules/sharing-registry/sharing-data-migrator/pom.xml +++ b/modules/sharing-registry/sharing-data-migrator/pom.xml @@ -39,9 +39,9 @@ <artifactId>maven-compiler-plugin</artifactId> <version>3.8.0</version> <configuration> - <!--<source>1.8</source>--> - <!--<target>1.8</target>--> - <release>11</release> + <!--<source>17</source>--> + <!--<target>17</target>--> + <release>17</release> </configuration> </plugin> <plugin> diff --git a/modules/sharing-registry/sharing-registry-server/pom.xml b/modules/sharing-registry/sharing-registry-server/pom.xml index c0909cbda3..8dc1f6d70b 100644 --- a/modules/sharing-registry/sharing-registry-server/pom.xml +++ b/modules/sharing-registry/sharing-registry-server/pom.xml @@ -102,9 +102,9 @@ <artifactId>maven-compiler-plugin</artifactId> <version>3.8.0</version> <configuration> - <release>11</release> - <source>9</source> - <target>9</target> + <release>17</release> + <source>17</source> + <target>17</target> <!--<compilerArgs>--> <!--<arg>--add-opens=java.base/java.lang=ALL-UNNAMED</arg>--> <!--</compilerArgs>--> @@ -128,11 +128,10 @@ </configuration> <executions> <execution> - <id>enhancer</id> - <phase>process-classes</phase> - <goals> - <goal>enhance</goal> - </goals> + <id>enhancer</id> + <goals> + <goal>enhance</goal> + </goals> </execution> </executions> <dependencies> diff --git a/modules/sharing-registry/sharing-registry-server/src/main/resources/META-INF/persistence.xml b/modules/sharing-registry/sharing-registry-server/src/main/resources/META-INF/persistence.xml index 936b84d2c5..398a69504f 100644 --- a/modules/sharing-registry/sharing-registry-server/src/main/resources/META-INF/persistence.xml +++ b/modules/sharing-registry/sharing-registry-server/src/main/resources/META-INF/persistence.xml @@ -12,5 +12,10 @@ <class>org.apache.airavata.sharing.registry.db.entities.UserEntity</class> <class>org.apache.airavata.sharing.registry.db.entities.GroupAdminEntity</class> <class>org.apache.airavata.sharing.registry.db.entities.UserGroupEntity</class> + <properties> + <property name="openjpa.RuntimeOptimization" value="true" /> + <property name="openjpa.jdbc.MappingDefaults" + value="ForeignKeyDeleteAction=cascade, JoinForeignKeyDeleteAction=cascade" /> + </properties> </persistence-unit> </persistence> diff --git a/modules/sharing-registry/sharing-registry-stubs/pom.xml b/modules/sharing-registry/sharing-registry-stubs/pom.xml index d5b88ceefc..00bc2bc2fb 100644 --- a/modules/sharing-registry/sharing-registry-stubs/pom.xml +++ b/modules/sharing-registry/sharing-registry-stubs/pom.xml @@ -59,8 +59,7 @@ <artifactId>maven-compiler-plugin</artifactId> <version>3.8.0</version> <configuration> - <release>11</release> - + <release>17</release> </configuration> </plugin> <plugin> diff --git a/pom.xml b/pom.xml index 73e725c583..3436071534 100644 --- a/pom.xml +++ b/pom.xml @@ -129,7 +129,7 @@ <bouncy.castle.version>1.70</bouncy.castle.version> <ebay.cors.filter>1.0.0</ebay.cors.filter> <thrift.version>0.18.1</thrift.version> - <mysql.connector.version>5.1.34</mysql.connector.version> + <mysql.connector.version>8.0.31</mysql.connector.version> <skipTests>false</skipTests> <google.gson.version>2.10.1</google.gson.version> <zk.version>3.9.2</zk.version> @@ -143,7 +143,7 @@ <commons.io.version>2.11.0</commons.io.version> <google.guava.version>33.2.1-jre</google.guava.version> <jacoco.version>0.8.1</jacoco.version> - <openjpa.version>3.1.0</openjpa.version> + <openjpa.version>3.2.2</openjpa.version> <dozer.version>5.4.0</dozer.version> <javax.annotation.version>1.3.2</javax.annotation.version> <jaxb.version>2.4.0-b180830.0359</jaxb.version> @@ -343,8 +343,8 @@ <artifactId>maven-compiler-plugin</artifactId> <version>3.6.1</version> <configuration> - <source>11</source> - <target>11</target> + <source>17</source> + <target>17</target> <!--</configuration>--> <!--<!–<version>3.8.0</version>–>--> <!--<configuration>--> @@ -352,7 +352,7 @@ <!--<compilerArgs>--> <!--<arg>--add-exports=java.base/sun.security=ALL-UNNAMED</arg>--> <!--</compilerArgs>--> - <!--<release>11</release>--> + <!--<release>17</release>--> <fork>true</fork> </configuration>
