Merge pull request #23 from axonivy-market/dev113

Dev113
axonivy-market · Jul 24, 2024 · e5647c6 · e5647c6
2 parents ba4a211 + 68297e9
commit e5647c6
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -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
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -8,4 +8,6 @@ on:
 
 jobs:
   build:
-    uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v2
+    uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v3
+    with:
+      mvnArgs: '-Dportal.version=11.4.0-m261'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -4,4 +4,4 @@ on: workflow_dispatch
 
 jobs:
   build:
-    uses: axonivy-market/github-workflows/.github/workflows/release.yml@v2
+    uses: axonivy-market/github-workflows/.github/workflows/release.yml@v3
diff --git a/axonivy-express-product/pom.xml b/axonivy-express-product/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.axonivy.portal</groupId>
   <artifactId>axonivy-express-product</artifactId>
-  <version>11.1.2-SNAPSHOT</version>
+  <version>11.3.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>

diff --git a/axonivy-express/.project b/axonivy-express/.project
@@ -25,6 +25,11 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>ch.ivyteam.ivy.dialog.form.build.ivyDialogFormBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>ch.ivyteam.ivy.designer.ide.ivyModelValidationBuilder</name>
 			<arguments>

diff --git a/axonivy-express/.settings/ch.ivyteam.ivy.designer.prefs b/axonivy-express/.settings/ch.ivyteam.ivy.designer.prefs
@@ -13,5 +13,5 @@ ch.ivyteam.ivy.designer.preferences.ProcessEnginePreferencePage\:START_ENGINES_O
 ch.ivyteam.ivy.designer.preferences.ProcessEnginePreferencePage\:useProjectSettings=true
 ch.ivyteam.ivy.project.preferences\:PORTAL_VERSION=10
 ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13
-ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=112100
+ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=113000
 eclipse.preferences.version=1
diff --git a/axonivy-express/pom.xml b/axonivy-express/pom.xml
@@ -3,17 +3,16 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.axonivy.portal</groupId>
   <artifactId>axonivy-express</artifactId>
-  <version>11.1.2-SNAPSHOT</version>
+  <version>11.3.0-SNAPSHOT</version>
   <packaging>iar</packaging>
   <properties>
-    <ivy.engine.version>11.3.0</ivy.engine.version>
-    <build.plugin.version>11.2.0</build.plugin.version>
+    <project.build.plugin.version>11.3.0</project.build.plugin.version>
   </properties>
   <dependencies>
     <dependency>
       <groupId>com.axonivy.portal</groupId>
       <artifactId>portal</artifactId>
-      <version>11.2.0</version>
+      <version>11.3.1</version>
       <type>iar</type>
     </dependency>
   </dependencies>
@@ -24,12 +23,21 @@
       <url>https://maven.axonivy.com/</url>
     </repository>
   </repositories>
+  <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>${build.plugin.version}</version>
+        <version>${project.build.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <compilerWarnings>false</compilerWarnings>

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
   <groupId>com.axonivy.portal</groupId>
   <name>axonivy-express</name>
   <artifactId>axonivy-express-modules</artifactId>
-  <version>11.1.2-SNAPSHOT</version>
+  <version>11.3.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <modules>
-Original file 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