Skip to content

use maven ivy-api #609

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

use maven ivy-api #609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions .ivy/raise-build-plugin-version.sh
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions .ivy/raise-ivy-project-parent.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash

mvn --batch-mode versions:update-parent versions:commit -f maven/config/pom.xml -DparentVersion=${1} -DskipResolution=true -DallowSnapshots=true
3 changes: 0 additions & 3 deletions .ivy/raise-web-tester.sh
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions dev-workflow-ui-test-data/.settings/ch.ivyteam.ivy.designer.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=ch.ivyteam.ivy.project.workflow
ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:useProjectSettings=true
ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11
ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=120001
eclipse.preferences.version=1
ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13
ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=131000
eclipse.preferences.version=1
2 changes: 1 addition & 1 deletion ...ui-test-data/src_hd/ch/ivyteam/ivy/project/workflow/TestDefaultPage/TestDefaultPage.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<h3 id="defaultPagesTitle">
This is a test page for default pages.
</h3>
<p:panelGrid columns="2" styleClass="ui-panelgrid-blank">
<p:panelGrid columns="2" styleClass="ui-panelgrid-blank" layout="tabular">
<p:button id="homeBtn" href="#{ivy.html.applicationHomeRef()}" value="Home Page" style="width: 100%"/>
<p:button id="startsBtn" href="#{ivy.html.processStartListRef()}" value="Process Starts" style="width: 100%"/>
<p:button id="tasksBtn" href="#{ivy.html.taskListRef()}" value="Task List" style="width: 100%"/>
Expand Down
2 changes: 1 addition & 1 deletion ...orkflow-ui-test-data/src_hd/ch/ivyteam/ivy/project/workflow/TestDialog2/TestDialog2.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<h3>Hello. This is the second dialog for testing. Below are some cool buttons you can click for fun.</h3>

<h:form id="form">
<p:panelGrid columns="2" styleClass="ui-panelgrid-blank">
<p:panelGrid columns="2" styleClass="ui-panelgrid-blank" layout="tabular">
<p:button value="Button 1" style="width: 100%" />
<p:button value="Button 2" style="width: 100%" />
<p:button value="Button 3" style="width: 100%" />
Expand Down
6 changes: 3 additions & 3 deletions dev-workflow-ui-test/.settings/ch.ivyteam.ivy.designer.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=ch.ivyteam.ivy.project.workflow
ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11
ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=120001
eclipse.preferences.version=1
ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13
ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=131000
eclipse.preferences.version=1
1 change: 0 additions & 1 deletion dev-workflow-ui-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven.surefire.version}</version>
<configuration>
<skip>${skip.unit.tests}</skip>
</configuration>
Expand Down
6 changes: 3 additions & 3 deletions dev-workflow-ui-web-test/.settings/ch.ivyteam.ivy.designer.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=ch.ivyteam.ivy.project.workflow
ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11
ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=120001
eclipse.preferences.version=1
ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13
ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=131000
eclipse.preferences.version=1
20 changes: 0 additions & 20 deletions dev-workflow-ui-web-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
<dependency>
<groupId>com.axonivy.ivy.webtest</groupId>
<artifactId>web-tester</artifactId>
<version>${web.tester.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -47,19 +46,6 @@
</dependency>
</dependencies>

<repositories>
<repository>
<id>central.snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<updatePolicy>always</updatePolicy>
</snapshots>
</repository>
</repositories>

<build>
<testSourceDirectory>src_test</testSourceDirectory>
<testOutputDirectory>target/test-classes</testOutputDirectory>
Expand Down Expand Up @@ -95,7 +81,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven.surefire.version}</version>
<configuration>
<testFailureIgnore>true</testFailureIgnore>
<trimStackTrace>false</trimStackTrace>
Expand All @@ -113,7 +98,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${maven.surefire.version}</version>
<configuration>
<skip>${skip.integration.test}</skip>
</configuration>
Expand All @@ -132,7 +116,6 @@
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>3.4.1</version>
<executions>
<execution>
<id>clean-wf-ui-from-engine</id>
Expand All @@ -157,7 +140,6 @@

<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.1</version>
<executions>
<execution>
<id>copy-resource-one</id>
Expand All @@ -183,7 +165,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven.surefire.version}</version>
<configuration>
<testFailureIgnore>true</testFailureIgnore>
<trimStackTrace>false</trimStackTrace>
Expand Down Expand Up @@ -255,7 +236,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven.surefire.version}</version>
<configuration>
<testFailureIgnore>true</testFailureIgnore>
<trimStackTrace>false</trimStackTrace>
Expand Down
4 changes: 2 additions & 2 deletions dev-workflow-ui/.settings/ch.ivyteam.ivy.designer.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=ch.ivyteam.ivy.project.workflow.ui
ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13
ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=120001
eclipse.preferences.version=1
ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=131000
eclipse.preferences.version=1
1 change: 0 additions & 1 deletion dev-workflow-ui/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.7.1</version>
<executions>
<execution>
<id>jar</id>
Expand Down
54 changes: 22 additions & 32 deletions maven/config/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,30 @@
<version>13.1.0-SNAPSHOT</version>
<packaging>pom</packaging>

<parent>
<groupId>com.axonivy.ivy.api</groupId>
<artifactId>ivy-project-parent</artifactId>
<version>13.1.0-SNAPSHOT</version>
<relativePath></relativePath>
</parent>

<properties>
<engine.page.url>https://product.ivyteam.io</engine.page.url>
<flatten.plugin.version>1.7.0</flatten.plugin.version>
<project.build.plugin.version>13.1.0-SNAPSHOT</project.build.plugin.version>
<web.tester.version>12.0.2-SNAPSHOT</web.tester.version>
<engineHomeDirectory>${basedir}/../maven/config/target/ivyEngine/</engineHomeDirectory>
<maven.surefire.version>3.5.3</maven.surefire.version>
</properties>

<dependencies>
<dependency>
<groupId>com.axonivy.ivy.api</groupId>
<artifactId>ivy-api</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>${flatten.plugin.version}</version>
<configuration>
<updatePomFile>true</updatePomFile>
</configuration>
Expand Down Expand Up @@ -47,7 +56,6 @@
<plugin>
<groupId>com.axonivy.ivy.ci</groupId>
<artifactId>project-build-plugin</artifactId>
<version>${project.build.plugin.version}</version>
<configuration>
<engineDirectory>${engineHomeDirectory}</engineDirectory>
<testEngine>COPY_FROM_TEMPLATE</testEngine>
Expand Down Expand Up @@ -80,20 +88,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.1.4</version>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>3.1.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.1</version>
</plugin>
</plugins>
</pluginManagement>
Expand All @@ -108,33 +113,18 @@

<repositories>
<repository>
<id>nexus.ivyteam.io</id>
<url>https://nexus.ivyteam.io/repository/maven/</url>
<id>central</id>
<url>https://repo.maven.apache.org/maven2</url>
<snapshots>
<updatePolicy>always</updatePolicy>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>

<pluginRepositories>
<!-- Used to install ivy maven plugins -->
<pluginRepository>
<id>nexus.ivyteam.io</id>
<url>https://nexus.ivyteam.io/repository/maven/</url>
<snapshots>
<updatePolicy>always</updatePolicy>
</snapshots>
</pluginRepository>
<!-- Used to install project-build-plugin -->
<pluginRepository>
<id>central.snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<repository>
<id>maven.axonivy.com</id>
<url>https://maven.axonivy.com</url>
<snapshots>
<updatePolicy>always</updatePolicy>
</snapshots>
</pluginRepository>
</pluginRepositories>
</repository>
</repositories>
</project>
1 change: 0 additions & 1 deletion maven/config/test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<configuration>
<source>21</source>
<target>21</target>
Expand Down
1 change: 0 additions & 1 deletion maven/dev-workflow-ui-screenshots/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.7.1</version>
<executions>
<execution>
<id>zip</id>
Expand Down
2 changes: 0 additions & 2 deletions maven/image-validation/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
<properties>
<test.target.dir>${project.basedir}/../../dev-workflow-ui-web-test/target/</test.target.dir>
<screenshotArtifactId>dev-workflow-ui-screenshots</screenshotArtifactId>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<ref.screenshot.build>master</ref.screenshot.build>
<img.similarity>92</img.similarity>
</properties>
Expand All @@ -29,7 +28,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<id>download-latest-screenshots</id>
Expand Down