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 eaa1b7fd07b41d37a2db5288cdb04d7563e7b299 Author: yasith <[email protected]> AuthorDate: Tue Mar 18 05:09:30 2025 +0000 simplify devcontainer. unify maven-compiler plugin version. --- .devcontainer/Dockerfile | 8 ++++++++ .devcontainer/devcontainer.json | 21 +-------------------- .devcontainer/docker-compose.yml | 2 +- .vscode/launch.json | 2 +- .../profile-service/profile-service-commons/pom.xml | 2 +- .../profile-service/profile-user-core/pom.xml | 2 +- modules/agent-framework/agent-service/pom.xml | 7 ++++++- modules/airavata-helix/agent-api/pom.xml | 2 +- modules/airavata-helix/task-api/pom.xml | 2 +- modules/airavata-helix/task-core/pom.xml | 2 +- modules/airavata-helix/workflow-impl/pom.xml | 2 +- modules/file-server/pom.xml | 2 +- .../airavata-php-gateway/app/tests/selenium/pom.xml | 2 +- modules/registry/registry-core/pom.xml | 2 +- modules/server/pom.xml | 1 + .../sharing-registry/sharing-data-migrator/pom.xml | 2 +- .../sharing-registry-server/pom.xml | 2 +- .../sharing-registry/sharing-registry-stubs/pom.xml | 2 +- pom.xml | 4 +++- 19 files changed, 33 insertions(+), 36 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile new file mode 100644 index 0000000000..79250c290c --- /dev/null +++ b/.devcontainer/Dockerfile @@ -0,0 +1,8 @@ +FROM mcr.microsoft.com/devcontainers/base:debian + +USER vscode + +RUN curl https://mise.run | sh +RUN ~/.local/bin/mise install -y java@openjdk-17 [email protected] [email protected] [email protected]; \ + ~/.local/bin/mise use -g java@openjdk-17 [email protected] [email protected] [email protected]; \ + ~/.local/bin/mise env >> ~/.bashrc diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 0e36f86df7..05d77d7d5d 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,30 +2,11 @@ // README at: https://github.com/devcontainers/templates/tree/main/src/ubuntu { "name": "Airavata", - // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile "dockerComposeFile": "docker-compose.yml", "service": "devcontainer", + "features": {}, "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": {}, - "ghcr.io/roul/devcontainer-features/mise-java": { - "version": "openjdk-17" - }, - "ghcr.io/roul/devcontainer-features/mise-python": { - "version": "3.10" - }, - "ghcr.io/roul/devcontainer-features/mise-golang": { - "version": "1.23" - } - }, - // Use 'forwardPorts' to make a list of ports inside the container available locally. - // 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; sudo ln -s ~/.m2 /m2", - // Configure tool-specific properties. "customizations": { "vscode": { "extensions": [ diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index f3539bbb8a..0e8e5346a0 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -13,7 +13,7 @@ volumes: services: devcontainer: - image: mcr.microsoft.com/devcontainers/base:debian + build: . volumes: - ..:/workspace:cached command: sleep infinity diff --git a/.vscode/launch.json b/.vscode/launch.json index 317c8693e0..9a39c30cdc 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -6,7 +6,7 @@ "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", + "vmArgs": "-javaagent:/home/vscode/.m2/repository/org/apache/openjpa/openjpa/4.0.1/openjpa-4.0.1.jar", }, { "type": "java", diff --git a/airavata-services/profile-service/profile-service-commons/pom.xml b/airavata-services/profile-service/profile-service-commons/pom.xml index 346c0daf5a..3394c9aff0 100644 --- a/airavata-services/profile-service/profile-service-commons/pom.xml +++ b/airavata-services/profile-service/profile-service-commons/pom.xml @@ -88,7 +88,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.0</version> + <version>${maven.compiler.plugin.version}</version> <configuration> <!--<source>17</source>--> <!--<target>17</target>--> diff --git a/airavata-services/profile-service/profile-user-core/pom.xml b/airavata-services/profile-service/profile-user-core/pom.xml index e0f978f5ef..d187dfd8cf 100644 --- a/airavata-services/profile-service/profile-user-core/pom.xml +++ b/airavata-services/profile-service/profile-user-core/pom.xml @@ -52,7 +52,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.0</version> + <version>${maven.compiler.plugin.version}</version> <configuration> <release>17</release> <compilerArgs> diff --git a/modules/agent-framework/agent-service/pom.xml b/modules/agent-framework/agent-service/pom.xml index c866cdec65..b9dd019fe8 100644 --- a/modules/agent-framework/agent-service/pom.xml +++ b/modules/agent-framework/agent-service/pom.xml @@ -90,6 +90,11 @@ <artifactId>grpc-protobuf</artifactId> <version>${grpc.version}</version> </dependency> + <dependency> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + <version>${protoc.version}</version> + </dependency> <dependency> <groupId>net.devh</groupId> <artifactId>grpc-server-spring-boot-starter</artifactId> @@ -165,7 +170,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.1</version> + <version>${maven.compiler.plugin.version}</version> <configuration> <source>17</source> <target>17</target> diff --git a/modules/airavata-helix/agent-api/pom.xml b/modules/airavata-helix/agent-api/pom.xml index 7467f0e658..3011a6eac1 100644 --- a/modules/airavata-helix/agent-api/pom.xml +++ b/modules/airavata-helix/agent-api/pom.xml @@ -65,7 +65,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.5.1</version> + <version>${maven.compiler.plugin.version}</version> <configuration> <source>${java.version}</source> <target>${java.version}</target> diff --git a/modules/airavata-helix/task-api/pom.xml b/modules/airavata-helix/task-api/pom.xml index 666a1b51da..43801cc8c7 100644 --- a/modules/airavata-helix/task-api/pom.xml +++ b/modules/airavata-helix/task-api/pom.xml @@ -63,7 +63,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.5.1</version> + <version>${maven.compiler.plugin.version}</version> <configuration> <source>${java.version}</source> <target>${java.version}</target> diff --git a/modules/airavata-helix/task-core/pom.xml b/modules/airavata-helix/task-core/pom.xml index 61fd2811a1..f07c5d41ea 100644 --- a/modules/airavata-helix/task-core/pom.xml +++ b/modules/airavata-helix/task-core/pom.xml @@ -59,7 +59,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.5.1</version> + <version>${maven.compiler.plugin.version}</version> <configuration> <source>${java.version}</source> <target>${java.version}</target> diff --git a/modules/airavata-helix/workflow-impl/pom.xml b/modules/airavata-helix/workflow-impl/pom.xml index 54a407072e..8baf3a01c2 100644 --- a/modules/airavata-helix/workflow-impl/pom.xml +++ b/modules/airavata-helix/workflow-impl/pom.xml @@ -50,7 +50,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.5.1</version> + <version>${maven.compiler.plugin.version}</version> <configuration> <source>${java.version}</source> <target>${java.version}</target> diff --git a/modules/file-server/pom.xml b/modules/file-server/pom.xml index aa58c9281d..4a3fe4363c 100644 --- a/modules/file-server/pom.xml +++ b/modules/file-server/pom.xml @@ -53,7 +53,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.1</version> + <version>${maven.compiler.plugin.version}</version> <configuration> <compilerArgs> <arg>-parameters</arg> 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 2221c68406..b4546339f5 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 @@ -13,7 +13,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.0</version> + <version>${maven.compiler.plugin.version}</version> <configuration> <!--<source>17</source>--> <!--<target>17</target>--> diff --git a/modules/registry/registry-core/pom.xml b/modules/registry/registry-core/pom.xml index cb3e03f522..0634e28f6f 100644 --- a/modules/registry/registry-core/pom.xml +++ b/modules/registry/registry-core/pom.xml @@ -128,7 +128,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.0</version> + <version>${maven.compiler.plugin.version}</version> <configuration> <release>17</release> <!--<compilerArgs>--> diff --git a/modules/server/pom.xml b/modules/server/pom.xml index 8f5cfe09e5..ad569d05d4 100644 --- a/modules/server/pom.xml +++ b/modules/server/pom.xml @@ -37,6 +37,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> + <version>${maven.compiler.plugin.version}</version> <configuration> <!--<source>17</source>--> <!--<target>17</target>--> diff --git a/modules/sharing-registry/sharing-data-migrator/pom.xml b/modules/sharing-registry/sharing-data-migrator/pom.xml index 17f4c67a72..69fac6e8ef 100644 --- a/modules/sharing-registry/sharing-data-migrator/pom.xml +++ b/modules/sharing-registry/sharing-data-migrator/pom.xml @@ -37,7 +37,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.0</version> + <version>${maven.compiler.plugin.version}</version> <configuration> <!--<source>17</source>--> <!--<target>17</target>--> diff --git a/modules/sharing-registry/sharing-registry-server/pom.xml b/modules/sharing-registry/sharing-registry-server/pom.xml index 8adce21529..411552b2c7 100644 --- a/modules/sharing-registry/sharing-registry-server/pom.xml +++ b/modules/sharing-registry/sharing-registry-server/pom.xml @@ -100,7 +100,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.0</version> + <version>${maven.compiler.plugin.version}</version> <configuration> <release>17</release> <source>17</source> diff --git a/modules/sharing-registry/sharing-registry-stubs/pom.xml b/modules/sharing-registry/sharing-registry-stubs/pom.xml index 00bc2bc2fb..0c4b360fb6 100644 --- a/modules/sharing-registry/sharing-registry-stubs/pom.xml +++ b/modules/sharing-registry/sharing-registry-stubs/pom.xml @@ -57,7 +57,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.0</version> + <version>${maven.compiler.plugin.version}</version> <configuration> <release>17</release> </configuration> diff --git a/pom.xml b/pom.xml index 7a973c459e..db5cd8df9a 100644 --- a/pom.xml +++ b/pom.xml @@ -138,6 +138,7 @@ <maven.javadoc.failOnError>false</maven.javadoc.failOnError> <maven.replacer.plugin.version>1.5.3</maven.replacer.plugin.version> <maven.assembly.plugin>3.3.0</maven.assembly.plugin> + <maven.compiler.plugin.version>3.14.0</maven.compiler.plugin.version> <kafka-clients.version>1.0.0</kafka-clients.version> <json.version>20160212</json.version> <commons.io.version>2.11.0</commons.io.version> @@ -287,6 +288,7 @@ <version>1.0.0</version> <executions> <execution> + <phase>process-resources</phase> <id>filtering-java-templates</id> <goals> <goal>filter-sources</goal> @@ -342,7 +344,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.6.1</version> + <version>${maven.compiler.plugin.version}</version> <configuration> <source>17</source> <target>17</target>
