You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ya...@apache.org on 2025/04/23 17:32:09 UTC
(airavata) 12/24: fix pom issues when running in devcontainer
This is an automated email from the ASF dual-hosted git repository.
yasith pushed a commit to branch cybershuttle-dev
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 25ca66b871b9a3cda1ba72ea57d17d37cee19005
Author: yasith <ya...@gatech.edu>
AuthorDate: Mon Mar 17 20:50:24 2025 +0000
fix pom issues when running in devcontainer
---
.devcontainer/devcontainer.json | 7 +++----
airavata-services/profile-service/profile-service-commons/pom.xml | 1 +
.../src/main/resources/META-INF/persistence.xml | 1 -
airavata-services/profile-service/profile-user-core/pom.xml | 1 +
modules/agent-framework/agent-service/pom.xml | 2 +-
modules/airavata-metascheduler/metadata-analyzer/pom.xml | 2 +-
modules/airavata-metascheduler/metascheduler-core/pom.xml | 8 +-------
modules/airavata-metascheduler/process-scheduler/pom.xml | 8 +-------
modules/cluster-monitoring/pom.xml | 4 ++--
modules/computer-resource-monitoring-service/pom.xml | 2 +-
modules/ide-integration/src/main/resources/log4j2.xml | 4 +++-
modules/registry/registry-core/pom.xml | 1 +
.../registry-core/src/main/resources/META-INF/persistence.xml | 4 ----
modules/sharing-registry/sharing-registry-server/pom.xml | 1 +
.../src/main/resources/META-INF/persistence.xml | 1 -
15 files changed, 17 insertions(+), 30 deletions(-)
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index d87d85aeac..0e36f86df7 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -6,6 +6,7 @@
"dockerComposeFile": "docker-compose.yml",
"service": "devcontainer",
"workspaceFolder": "/workspace",
+ // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
// Features to add to the dev container. More info: https://containers.dev/features.
"features": {
"ghcr.io/roul/devcontainer-features/mise": {},
@@ -23,7 +24,7 @@
// TODO mention the ports used all airavata services
"forwardPorts": [],
// Use 'postCreateCommand' to run commands after the container is created.
- "postCreateCommand": "mise install -y maven@3.9.9 && mise use -g maven@3.9.9 && echo 'export PATH=$PATH:~/.local/share/mise/installs/maven/3.9.9/bin' >> ~/.bashrc",
+ "postCreateCommand": "mise install -y maven@3.9.9 && mise use -g maven@3.9.9 && echo 'export PATH=$PATH:~/.local/share/mise/installs/maven/3.9.9/bin' >> ~/.bashrc; sudo ln -s ~/.m2 /m2",
// Configure tool-specific properties.
"customizations": {
"vscode": {
@@ -40,8 +41,6 @@
"njpwerner.autodocstring",
"vscjava.vscode-java-pack",
]
- }
+ },
}
- // 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/airavata-services/profile-service/profile-service-commons/pom.xml b/airavata-services/profile-service/profile-service-commons/pom.xml
index 046b9cb1a8..440c5e6144 100644
--- a/airavata-services/profile-service/profile-service-commons/pom.xml
+++ b/airavata-services/profile-service/profile-service-commons/pom.xml
@@ -108,6 +108,7 @@
<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 c470f63de7..08c9bed003 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,7 +29,6 @@
<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-user-core/pom.xml b/airavata-services/profile-service/profile-user-core/pom.xml
index 72f0bb5100..edecf7d793 100644
--- a/airavata-services/profile-service/profile-user-core/pom.xml
+++ b/airavata-services/profile-service/profile-user-core/pom.xml
@@ -74,6 +74,7 @@
<executions>
<execution>
<id>enhancer</id>
+ <phase>process-classes</phase>
<goals>
<goal>enhance</goal>
</goals>
diff --git a/modules/agent-framework/agent-service/pom.xml b/modules/agent-framework/agent-service/pom.xml
index ff33ec5fb2..c866cdec65 100644
--- a/modules/agent-framework/agent-service/pom.xml
+++ b/modules/agent-framework/agent-service/pom.xml
@@ -169,7 +169,7 @@
<configuration>
<source>17</source>
<target>17</target>
- <generatedSourcesDirectory>${project.build.directory}/generated-sources</generatedSourcesDirectory>
+ <generatedSourcesDirectory>${project.build.directory}/generated-sources/protobuf</generatedSourcesDirectory>
<includes>
<include>${project.build.directory}/generated-sources/**/*.java</include>
</includes>
diff --git a/modules/airavata-metascheduler/metadata-analyzer/pom.xml b/modules/airavata-metascheduler/metadata-analyzer/pom.xml
index 8fe700bfec..7ec6806547 100644
--- a/modules/airavata-metascheduler/metadata-analyzer/pom.xml
+++ b/modules/airavata-metascheduler/metadata-analyzer/pom.xml
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <version>2.3.0</version>
+ <version>2.3.2</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
diff --git a/modules/airavata-metascheduler/metascheduler-core/pom.xml b/modules/airavata-metascheduler/metascheduler-core/pom.xml
index fda2bb32ce..9969b9982b 100644
--- a/modules/airavata-metascheduler/metascheduler-core/pom.xml
+++ b/modules/airavata-metascheduler/metascheduler-core/pom.xml
@@ -42,19 +42,13 @@
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <version>2.3.0</version>
+ <version>2.3.2</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-messaging-core</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.quartz-scheduler</groupId>
- <artifactId>quartz</artifactId>
- <version>2.2.1</version>
- <scope>compile</scope>
- </dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-messaging-core</artifactId>
diff --git a/modules/airavata-metascheduler/process-scheduler/pom.xml b/modules/airavata-metascheduler/process-scheduler/pom.xml
index 8a573f2a66..71aa94c5e1 100644
--- a/modules/airavata-metascheduler/process-scheduler/pom.xml
+++ b/modules/airavata-metascheduler/process-scheduler/pom.xml
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <version>2.3.0</version>
+ <version>2.3.2</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
@@ -59,12 +59,6 @@
<version>0.21-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.quartz-scheduler</groupId>
- <artifactId>quartz</artifactId>
- <version>2.3.0</version>
- <scope>compile</scope>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/modules/cluster-monitoring/pom.xml b/modules/cluster-monitoring/pom.xml
index 0b7aa75259..6c8dd5cdac 100644
--- a/modules/cluster-monitoring/pom.xml
+++ b/modules/cluster-monitoring/pom.xml
@@ -55,12 +55,12 @@
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <version>2.2.1</version>
+ <version>2.3.2</version>
</dependency>
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz-jobs</artifactId>
- <version>2.2.1</version>
+ <version>2.3.2</version>
</dependency>
<dependency>
<groupId>com.jcraft</groupId>
diff --git a/modules/computer-resource-monitoring-service/pom.xml b/modules/computer-resource-monitoring-service/pom.xml
index ac00bf137b..129a93aee5 100644
--- a/modules/computer-resource-monitoring-service/pom.xml
+++ b/modules/computer-resource-monitoring-service/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <version>2.3.0</version>
+ <version>2.3.2</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
diff --git a/modules/ide-integration/src/main/resources/log4j2.xml b/modules/ide-integration/src/main/resources/log4j2.xml
index e38f7ff011..a06ff13d8a 100644
--- a/modules/ide-integration/src/main/resources/log4j2.xml
+++ b/modules/ide-integration/src/main/resources/log4j2.xml
@@ -26,7 +26,7 @@
<Console name="Console" target="SYSTEM_OUT">
<PatternLayout pattern="%d [%t] %-5p %c{30} %X - %m%n"/>
</Console>
- <RollingFile name="RollingFileAppender" fileName="../logs/airavata.log"
+ <RollingFile name="RollingFileAppender" fileName="logs/airavata.log"
filePattern="logs/${date:yyyy-MM}/airavata-log-%d{MM-dd-yyyy}-%i.log.gz">
<PatternLayout>
<Pattern>%d [%t] %-5p %c{30} %X - %m%n</Pattern>
@@ -45,6 +45,8 @@
<logger name="org.apache.zookeeper" level="ERROR"/>
<logger name="org.apache.airavata" level="INFO"/>
<logger name="org.hibernate" level="ERROR"/>
+ <logger name="org.apache.openjpa" level="DEBUG"/>
+ <logger name="org.apache.openjpa.enhance" level="DEBUG"/>
<Root level="INFO">
<AppenderRef ref="Console"/>
<AppenderRef ref="RollingFileAppender"/>
diff --git a/modules/registry/registry-core/pom.xml b/modules/registry/registry-core/pom.xml
index e90d34c499..c4b26971c6 100644
--- a/modules/registry/registry-core/pom.xml
+++ b/modules/registry/registry-core/pom.xml
@@ -231,6 +231,7 @@
<executions>
<execution>
<id>enhancer</id>
+ <phase>process-classes</phase>
<goals>
<goal>enhance</goal>
</goals>
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 d0744c8422..f3b4ef035c 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
@@ -82,7 +82,6 @@
<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>
@@ -95,7 +94,6 @@
<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>
@@ -116,7 +114,6 @@
<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>
@@ -152,7 +149,6 @@
<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>
diff --git a/modules/sharing-registry/sharing-registry-server/pom.xml b/modules/sharing-registry/sharing-registry-server/pom.xml
index 8dc1f6d70b..fa5c877dea 100644
--- a/modules/sharing-registry/sharing-registry-server/pom.xml
+++ b/modules/sharing-registry/sharing-registry-server/pom.xml
@@ -129,6 +129,7 @@
<executions>
<execution>
<id>enhancer</id>
+ <phase>process-classes</phase>
<goals>
<goal>enhance</goal>
</goals>
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 398a69504f..adcc54c1cb 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
@@ -13,7 +13,6 @@
<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>