Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
7f36c40
🐵🐶🐻
alexsuter Oct 17, 2025
0f4e982
🐵🐶🐻
alexsuter Oct 17, 2025
35c33fb
🐵🐶🐻
alexsuter Oct 17, 2025
9705294
🐵🐶🐻
alexsuter Oct 17, 2025
35d94a8
Merge branch 'master' into kingfisher
alexsuter Oct 23, 2025
7361d32
Merge branch 'master' into kingfisher
alexsuter Oct 24, 2025
83f9b97
🐵🐶🐻
alexsuter Oct 24, 2025
8f46219
🐵🐶🐻
alexsuter Oct 24, 2025
3396f67
🐵🐶🐻
alexsuter Oct 27, 2025
1deda1f
🐵🐶🐻
alexsuter Oct 27, 2025
edf7aaa
🐵🐶🐻
alexsuter Oct 28, 2025
eb0cdfa
Merge branch 'master' into kingfisher
alexsuter Oct 30, 2025
2e322c5
🐵🐶🐻
alexsuter Oct 30, 2025
44edd2f
🐵🐶🐻
alexsuter Oct 30, 2025
eaadb35
🐵🐶🐻
alexsuter Oct 31, 2025
aa49e6f
🐵🐶🐻
alexsuter Oct 31, 2025
75c78c7
Merge branch 'master' into kingfisher
alexsuter Nov 10, 2025
42fa982
🐵🐶🐻
alexsuter Nov 11, 2025
1ec4291
Merge branch 'master' into kingfisher
alexsuter Nov 11, 2025
9bafe88
🐵🐶🐻
alexsuter Nov 12, 2025
120975f
🐵🐶🐻
alexsuter Nov 12, 2025
1b38720
Merge branch 'master' into kingfisher
alexsuter Nov 25, 2025
0ea5da8
Merge branch 'master' into kingfisher
alexsuter Dec 1, 2025
32c8fc6
🐵🐶🐻
alexsuter Dec 2, 2025
5bfd817
🐵🐶🐻
alexsuter Dec 2, 2025
d449424
🐵🐶🐻
alexsuter Dec 2, 2025
db35fb1
🐵🐶🐻
alexsuter Dec 29, 2025
5dbe075
🐵🐶🐻
alexsuter Dec 29, 2025
4794edd
🐵🐶🐻
alexsuter Dec 29, 2025
b6453fe
🐵🐶🐻
alexsuter Dec 29, 2025
7d8db13
Merge branch 'master' into kingfisher
alexsuter Jan 7, 2026
31cf4f0
Merge branch 'master' into kingfisher
alexsuter Jan 12, 2026
d50e9cf
Merge branch 'master' into kingfisher
alexsuter Jan 12, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ pipeline {
}

parameters {
string(name: 'engineSource', defaultValue: 'https://product.ivyteam.io', description: 'Engine page url')
string(name: 'engineSource', defaultValue: 'https://jenkins.ivyteam.io/job/core_product/job/kingfisher/', description: 'Engine page url')
}

stages {
Expand Down
2 changes: 1 addition & 1 deletion build/build.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def build() {
}

def mvnBuild(def mvnArgs = '') {
def phase = isReleasingBranch() ? 'deploy' : 'verify'
def phase = isReleasingBranch() ? 'deploy' : 'deploy'
maven cmd: "clean ${phase} -ntp -Divy.engine.version.latest.minor=true -Dmaven.test.skip=false " + mvnArgs
junit testDataPublishers: [[$class: 'AttachmentPublisher'], [$class: 'StabilityTestDataPublisher']], testResults: '**/target/surefire-reports/**/*.xml'
}
Expand Down
2 changes: 1 addition & 1 deletion build/integration/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ pipeline {
}

parameters {
string(name: 'engineSource', defaultValue: 'https://product.ivyteam.io', description: 'Engine page url')
string(name: 'engineSource', defaultValue: 'https://jenkins.ivyteam.io/job/core_product/job/kingfisher/', description: 'Engine page url')
string(name: 'testFilter', defaultValue: 'WebTest*.java', description: 'Change to only run tests of the matching classes (flag will be gnored on master)')
}

Expand Down
2 changes: 1 addition & 1 deletion build/integration/windows/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ pipeline {
}

parameters {
string(name: 'engineSource', defaultValue: 'https://product.ivyteam.io', description: 'Engine page url')
string(name: 'engineSource', defaultValue: 'https://jenkins.ivyteam.io/job/core_product/job/kingfisher/', description: 'Engine page url')
}

stages {
Expand Down
2 changes: 1 addition & 1 deletion build/screenshots/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ pipeline {
}

parameters {
string(name: 'engineSource', defaultValue: 'https://product.ivyteam.io', description: 'Engine page url')
string(name: 'engineSource', defaultValue: 'https://jenkins.ivyteam.io/job/core_product/job/kingfisher/', description: 'Engine page url')
}

stages {
Expand Down
4 changes: 2 additions & 2 deletions engine-cockpit-selenium-test/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>ch.ivyteam.enginecockpit</groupId>
<groupId>ch.ivyteam.kingfisher.enginecockpit</groupId>
<artifactId>engine-cockpit-config</artifactId>
<version>14.0.0-SNAPSHOT</version>
<relativePath>../maven-config</relativePath>
Expand Down Expand Up @@ -78,7 +78,7 @@
<configuration>
<artifactItems>
<artifactItem>
<groupId>ch.ivyteam.enginecockpit</groupId>
<groupId>ch.ivyteam.kingfisher.enginecockpit</groupId>
<artifactId>engine-cockpit</artifactId>
<version>${project.version}</version>
<destFileName>engine-cockpit.jar</destFileName>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>ch.ivyteam.enginecockpit</groupId>
<groupId>ch.ivyteam.kingfisher.enginecockpit</groupId>
<artifactId>engine-cockpit-config</artifactId>
<version>14.0.0-SNAPSHOT</version>
<relativePath>../../../../maven-config</relativePath>
</parent>

<groupId>ch.ivyteam.enginecockpit</groupId>
<groupId>ch.ivyteam.kingfisher.enginecockpit</groupId>
<artifactId>core-pmv-test</artifactId>
<version>14.0.0-SNAPSHOT</version>
<packaging>iar</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>ch.ivyteam.enginecockpit</groupId>
<groupId>ch.ivyteam.kingfisher.enginecockpit</groupId>
<artifactId>engine-cockpit-config</artifactId>
<version>14.0.0-SNAPSHOT</version>
<relativePath>../../../../maven-config</relativePath>
</parent>
<groupId>ch.ivyteam.enginecockpit</groupId>
<groupId>ch.ivyteam.kingfisher.enginecockpit</groupId>
<artifactId>custom-pmv-test</artifactId>
<version>14.0.0-SNAPSHOT</version>
<packaging>iar</packaging>
<dependencies>
<dependency>
<groupId>ch.ivyteam.enginecockpit</groupId>
<groupId>ch.ivyteam.kingfisher.enginecockpit</groupId>
<artifactId>main-pmv-test</artifactId>
<version>${project.version}</version>
<type>iar</type>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>ch.ivyteam.enginecockpit</groupId>
<groupId>ch.ivyteam.kingfisher.enginecockpit</groupId>
<artifactId>engine-cockpit-config</artifactId>
<version>14.0.0-SNAPSHOT</version>
<relativePath>../../../../maven-config</relativePath>
</parent>
<groupId>ch.ivyteam.enginecockpit</groupId>
<groupId>ch.ivyteam.kingfisher.enginecockpit</groupId>
<artifactId>main-pmv-test</artifactId>
<version>14.0.0-SNAPSHOT</version>
<packaging>iar</packaging>
<dependencies>
<dependency>
<groupId>ch.ivyteam.enginecockpit</groupId>
<groupId>ch.ivyteam.kingfisher.enginecockpit</groupId>
<artifactId>core-pmv-test</artifactId>
<version>${project.version}</version>
<type>iar</type>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>ch.ivyteam.enginecockpit</groupId>
<groupId>ch.ivyteam.kingfisher.enginecockpit</groupId>
<artifactId>engine-cockpit-config</artifactId>
<version>14.0.0-SNAPSHOT</version>
<relativePath>../../../maven-config</relativePath>
</parent>

<groupId>ch.ivyteam.enginecockpit</groupId>
<groupId>ch.ivyteam.kingfisher.enginecockpit</groupId>
<artifactId>engine-cockpit-test-app-pmvs</artifactId>
<version>14.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
Expand Down
6 changes: 3 additions & 3 deletions engine-cockpit-selenium-test/test-apps/test-ad/pom.xml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>ch.ivyteam.enginecockpit</groupId>
<groupId>ch.ivyteam.kingfisher.enginecockpit</groupId>
<artifactId>engine-cockpit-config</artifactId>
<version>14.0.0-SNAPSHOT</version>
<relativePath>../../../maven-config</relativePath>
</parent>

<groupId>ch.ivyteam.enginecockpit</groupId>
<groupId>ch.ivyteam.kingfisher.enginecockpit</groupId>
<artifactId>engine-cockpit-test-app-test-ad</artifactId>
<version>14.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

<dependencies>
<dependency>
<groupId>ch.ivyteam.enginecockpit</groupId>
<groupId>ch.ivyteam.kingfisher.enginecockpit</groupId>
<artifactId>engine-cockpit-test-data</artifactId>
<version>14.0.0-SNAPSHOT</version>
<type>iar</type>
Expand Down
4 changes: 2 additions & 2 deletions engine-cockpit-test-data/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>ch.ivyteam.enginecockpit</groupId>
<groupId>ch.ivyteam.kingfisher.enginecockpit</groupId>
<artifactId>engine-cockpit-config</artifactId>
<version>14.0.0-SNAPSHOT</version>
<relativePath>../maven-config</relativePath>
</parent>

<groupId>ch.ivyteam.enginecockpit</groupId>
<groupId>ch.ivyteam.kingfisher.enginecockpit</groupId>
<artifactId>engine-cockpit-test-data</artifactId>
<version>14.0.0-SNAPSHOT</version>
<packaging>iar</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.util.UUID;

import ch.ivyteam.ivy.application.ReleaseState;
import ch.ivyteam.ivy.application.app.IApplicationRepository;
import ch.ivyteam.ivy.security.IRole;
import ch.ivyteam.ivy.security.ISecurityContext;
Expand Down Expand Up @@ -38,7 +39,10 @@ private static IRole getEverybody() {

private static ISecurityContext context() {
return IApplicationRepository.instance()
.findByName("test").orElseThrow()
.findByName("test").stream()
.filter(a -> a.getReleaseState() == ReleaseState.RELEASED)
.findAny()
.orElseThrow()
.getSecurityContext();
}
}
6 changes: 3 additions & 3 deletions engine-cockpit-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>ch.ivyteam.enginecockpit</groupId>
<groupId>ch.ivyteam.kingfisher.enginecockpit</groupId>
<artifactId>engine-cockpit-config</artifactId>
<version>14.0.0-SNAPSHOT</version>
<relativePath>../maven-config</relativePath>
</parent>

<groupId>ch.ivyteam.enginecockpit</groupId>
<groupId>ch.ivyteam.kingfisher.enginecockpit</groupId>
<artifactId>engine-cockpit-test</artifactId>
<version>14.0.0-SNAPSHOT</version>
<packaging>iar</packaging>
Expand All @@ -20,7 +20,7 @@

<dependencies>
<dependency>
<groupId>ch.ivyteam.enginecockpit</groupId>
<groupId>ch.ivyteam.kingfisher.enginecockpit</groupId>
<artifactId>engine-cockpit</artifactId>
<version>${project.version}</version>
<type>iar</type>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ public class TestProcessModelVersion {
/** ISSUE XIVY-4159 Application overview not displayed due to NPE */
@Test
void emptyLibrary() {
ProcessModelVersion pmv = new ProcessModelVersion(createPmvProxy());
assertThat(pmv.getQualifiedVersion()).isEqualTo("Unknown version");
assertThat(pmv.getLibraryId()).isEqualTo("Unknown id");
var pmv = new ProcessModelVersion(createPmvProxy());
assertThat(pmv.getQualifiedVersion()).isNull();
assertThat(pmv.getLibraryId()).isNull();
}

private IProcessModelVersion createPmvProxy() {
Expand Down
2 changes: 1 addition & 1 deletion engine-cockpit/cms/cms_en.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ admins:
applicationDetail:
ProcessModels: Process Models
applications:
AppPmPmvHeader: App / PM / PMV
AppPmPmvHeader: App / Version / Project
ApplicationConvertToLatestVersionMessage: All Axon Ivy Projects in state RELEASED and DEPRECATED will be converted to the latest version.
ApplicationWarningMessageForNoReleasedPmv: At least one process model has no released process model version
Convert: Convert
Expand Down
4 changes: 2 additions & 2 deletions engine-cockpit/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>ch.ivyteam.enginecockpit</groupId>
<groupId>ch.ivyteam.kingfisher.enginecockpit</groupId>
<artifactId>engine-cockpit-config</artifactId>
<version>14.0.0-SNAPSHOT</version>
<relativePath>../maven-config</relativePath>
</parent>

<groupId>ch.ivyteam.enginecockpit</groupId>
<groupId>ch.ivyteam.kingfisher.enginecockpit</groupId>
<version>14.0.0-SNAPSHOT</version>
<artifactId>engine-cockpit</artifactId>
<packaging>iar</packaging>
Expand Down
Loading