Skip to content

Commit

Permalink
MARP-626 Fix for Dev-Fail on Market Monitor (#15)
Browse files Browse the repository at this point in the history
  • Loading branch information
phhung-axonivy authored Jul 25, 2024
1 parent be481bd commit 60c9d15
Show file tree
Hide file tree
Showing 5 changed files with 81 additions and 33 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ on:

jobs:
build:
uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v2
uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v3
4 changes: 1 addition & 3 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,4 @@ on:

jobs:
build:
uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v2
with:
ivyVersion: nightly-10
uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v3
15 changes: 14 additions & 1 deletion vertexai-google-demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,19 @@
<artifactId>vertexai-google-demo</artifactId>
<version>10.0.23-SNAPSHOT</version>
<packaging>iar</packaging>
<properties>
<project.build.plugin.version>10.0.16</project.build.plugin.version>
</properties>
<pluginRepositories>
<!-- Snapshot releases are available via sonatype.org -->
<pluginRepository>
<id>sonatype</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<snapshots>
<updatePolicy>always</updatePolicy>
</snapshots>
</pluginRepository>
</pluginRepositories>
<dependencies>
<dependency>
<groupId>com.axonivy.connector.vertexai</groupId>
Expand All @@ -18,7 +31,7 @@
<plugin>
<groupId>com.axonivy.ivy.ci</groupId>
<artifactId>project-build-plugin</artifactId>
<version>10.0.14</version>
<version>${project.build.plugin.version}</version>
<extensions>true</extensions>
</plugin>
</plugins>
Expand Down
27 changes: 25 additions & 2 deletions vertexai-google-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,34 @@
<artifactId>vertexai-google-test</artifactId>
<version>10.0.23-SNAPSHOT</version>
<packaging>iar</packaging>
<properties>
<project.build.plugin.version>10.0.16</project.build.plugin.version>
<tester.version>10.0.16</tester.version>
</properties>
<pluginRepositories>
<!-- Snapshot releases are available via sonatype.org -->
<pluginRepository>
<id>sonatype</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<snapshots>
<updatePolicy>always</updatePolicy>
</snapshots>
</pluginRepository>
</pluginRepositories>
<repositories>
<repository>
<id>sonatype</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<snapshots>
<updatePolicy>always</updatePolicy>
</snapshots>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>com.axonivy.ivy.test</groupId>
<artifactId>unit-tester</artifactId>
<version>10.0.14</version>
<version>${tester.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -37,7 +60,7 @@
<plugin>
<groupId>com.axonivy.ivy.ci</groupId>
<artifactId>project-build-plugin</artifactId>
<version>10.0.14</version>
<version>${project.build.plugin.version}</version>
<extensions>true</extensions>
</plugin>
</plugins>
Expand Down
66 changes: 40 additions & 26 deletions vertexai-google/pom.xml
Original file line number Diff line number Diff line change
@@ -1,41 +1,55 @@
<?xml version="1.0" encoding="UTF-8"?>
<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.axonivy.connector.vertexai</groupId>
<artifactId>vertexai-google</artifactId>
<version>10.0.23-SNAPSHOT</version>
<packaging>iar</packaging>
<dependencies>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-aiplatform</artifactId>
<version>2.1.0</version>
</dependency>

<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.9</version>
</dependency>
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-oauth2-http</artifactId>
<version>1.1.0</version>
</dependency>
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.15.3</version>
</dependency>
</dependencies>
<properties>
<project.build.plugin.version>10.0.16</project.build.plugin.version>
</properties>
<pluginRepositories>
<!-- Snapshot releases are available via sonatype.org -->
<pluginRepository>
<id>sonatype</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<snapshots>
<updatePolicy>always</updatePolicy>
</snapshots>
</pluginRepository>
</pluginRepositories>
<dependencies>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-aiplatform</artifactId>
<version>2.1.0</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.9</version>
</dependency>
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-oauth2-http</artifactId>
<version>1.1.0</version>
</dependency>
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.15.3</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>com.axonivy.ivy.ci</groupId>
<artifactId>project-build-plugin</artifactId>
<version>10.0.14</version>
<version>${project.build.plugin.version}</version>
<extensions>true</extensions>
</plugin>
</plugins>
</build>
</project>
</project>

0 comments on commit 60c9d15

Please sign in to comment.