MARP-528: Fix dependency not found (#57)

* MARP-528: Fix dependency not found * MARP-528:change p2 from nightly to nightly-10.0 * MARP-528: revert change * MARP-528: change to workflows v3 * Revert "MARP-528: change to workflows v3" This reverts commit 3396764. * keep commonmark lib in bundled jar * refactor: properties to steer plugin-version at build runtime * fix pipeline: divide LTS10 and leading-edge p2 * use snapshot artifacts at dev-pipeline --------- Co-authored-by: Reguel Wermelinger <[email protected]>
axonivy-market · Jul 24, 2024 · 3569afa · 3569afa
1 parent eb1267f
commit 3569afa
Show file tree

Hide file tree

Showing 10 changed files with 86 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,4 +9,6 @@ on:
 
 jobs:
   build:
-    uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v2
+    uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v3
+    with:
+      javaVersion: 21
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -8,4 +8,4 @@ on:
 
 jobs:
   build:
-    uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v2
+    uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v3
diff --git a/openai-assistant/.classpath b/openai-assistant/.classpath
@@ -25,6 +25,5 @@
       <attribute name="maven.pomderived" value="true" />
     </attributes>
   </classpathentry>
-  <classpathentry kind="lib" path="libs/commonmark-0.22.0.jar"/>
   <classpathentry kind="output" path="target/classes" />
 </classpath>
diff --git a/openai-assistant/META-INF/MANIFEST.MF b/openai-assistant/META-INF/MANIFEST.MF
@@ -16,5 +16,5 @@ Require-Bundle: org.eclipse.core.runtime,
  ch.ivyteam.ivy.jersey.client,
  javax.ws.rs,
  ch.ivyteam.ivy.rest.client.exec;resolution:=optional
-Bundle-ClassPath: ., libs/commonmark-0.22.0.jar
+Bundle-ClassPath: lib/commonmark-0.22.0.jar, .
 Bundle-ActivationPolicy: lazy
diff --git a/openai-assistant/build.properties b/openai-assistant/build.properties
@@ -2,4 +2,5 @@ source.. = src/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               res/
+               res/,\
+               lib/
diff --git a/openai-assistant/libs/commonmark-0.22.0.jar b/openai-assistant/libs/commonmark-0.22.0.jar
diff --git a/openai-assistant/pom.xml b/openai-assistant/pom.xml
@@ -16,11 +16,23 @@
     <repository>
       <id>ivy.nightly.release</id>
       <layout>p2</layout>
-      <url>https://p2.axonivy.com/p2/nightly/</url>
+      <!-- we build towards nightly to server /dev and /lts10 pipeline 
+        dependencies only available on LE; are marked as optional requirement
+      -->
+      <url>https://p2.axonivy.com/p2/nightly/</url> 
     </repository>
   </repositories>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.commonmark</groupId>
+			<artifactId>commonmark</artifactId>
+			<version>0.22.0</version>
+		</dependency>
+	</dependencies>
 
   <build>
+	<sourceDirectory>src</sourceDirectory>
     <testSourceDirectory>test</testSourceDirectory>
     <plugins>
       <plugin>
@@ -50,6 +62,22 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-dependencies</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.basedir}/lib</outputDirectory>
+           	<includeGroupIds>org.commonmark</includeGroupIds>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
 
     <pluginManagement>

diff --git a/openai-connector-demo/pom.xml b/openai-connector-demo/pom.xml
@@ -5,6 +5,18 @@
   <artifactId>openai-connector-demo</artifactId>
   <version>10.0.12-SNAPSHOT</version>
   <packaging>iar</packaging>
+  <properties>
+    <project.build.plugin.version>10.0.6</project.build.plugin.version>
+  </properties>
+  <pluginRepositories>
+    <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.openai</groupId>
@@ -18,7 +30,7 @@
       <plugin>
         <groupId>com.axonivy.ivy.ci</groupId>
         <artifactId>project-build-plugin</artifactId>
-        <version>10.0.6</version>
+        <version>${project.build.plugin.version}</version>
         <extensions>true</extensions>
       </plugin>
     </plugins>

diff --git a/openai-connector-test/pom.xml b/openai-connector-test/pom.xml
@@ -5,6 +5,28 @@
   <artifactId>openai-connector-test</artifactId>
   <version>10.0.12-SNAPSHOT</version>
   <packaging>iar</packaging>
+  <properties>
+    <project.build.plugin.version>10.0.6</project.build.plugin.version>
+    <tester.version>10.0.0</tester.version>
+  </properties>
+  <pluginRepositories>
+    <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.connector.openai</groupId>
@@ -15,7 +37,7 @@
     <dependency>
     	<groupId>com.axonivy.ivy.test</groupId>
     	<artifactId>unit-tester</artifactId>
-    	<version>10.0.0</version>
+    	<version>${tester.version}</version>
     	<scope>test</scope>
     </dependency>
   </dependencies>
@@ -25,7 +47,7 @@
       <plugin>
         <groupId>com.axonivy.ivy.ci</groupId>
         <artifactId>project-build-plugin</artifactId>
-        <version>10.0.6</version>
+        <version>${project.build.plugin.version}</version>
         <extensions>true</extensions>
       </plugin>
     </plugins>

diff --git a/openai-connector/pom.xml b/openai-connector/pom.xml
@@ -5,12 +5,24 @@
   <artifactId>openai-connector</artifactId>
   <version>10.0.12-SNAPSHOT</version>
   <packaging>iar</packaging>
+  <properties>
+    <project.build.plugin.version>10.0.6</project.build.plugin.version>
+  </properties>
+  <pluginRepositories>
+    <pluginRepository>
+      <id>sonatype</id>
+      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+      <snapshots>
+        <updatePolicy>always</updatePolicy>
+      </snapshots>
+    </pluginRepository>
+  </pluginRepositories>
   <build>
     <plugins>
       <plugin>
         <groupId>com.axonivy.ivy.ci</groupId>
         <artifactId>project-build-plugin</artifactId>
-        <version>10.0.6</version>
+        <version>${project.build.plugin.version}</version>
         <extensions>true</extensions>
       </plugin>
     </plugins>
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,4 +8,4 @@ on: @@
     jobs:
       build:
-        uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v2
+        uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v3