Skip to content
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

Raise to 12.0.0 #496

Merged
merged 2 commits into from
Sep 16, 2024
Merged

Raise to 12.0.0 #496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
253359d
Raise to 12.0.0
alexsuter Sep 16, 2024
4d151a6
Fix test
alexsuter Sep 16, 2024
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
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ Wait until the maven central release is available: this may take several hours u

The Apache License, Version 2.0

[0]: https://img.shields.io/maven-metadata/v.svg?versionPrefix=11&label=central&logo=apachemaven&metadataUrl=https%3A%2F%2Frepo1.maven.org%2Fmaven2%2Fcom%2Faxonivy%2Fivy%2Fci%2Fproject-build-plugin%2Fmaven-metadata.xml
[0]: https://img.shields.io/maven-metadata/v.svg?versionPrefix=12&label=central&logo=apachemaven&metadataUrl=https%3A%2F%2Frepo1.maven.org%2Fmaven2%2Fcom%2Faxonivy%2Fivy%2Fci%2Fproject-build-plugin%2Fmaven-metadata.xml
[1]: https://repo1.maven.org/maven2/com/axonivy/ivy/ci/project-build-plugin/
[2]: https://img.shields.io/maven-metadata/v?versionPrefix=11&label=dev&logo=sonatype&metadataUrl=https%3A%2F%2Foss.sonatype.org%2Fcontent%2Frepositories%2Fsnapshots%2Fcom%2Faxonivy%2Fivy%2Fci%2Fproject-build-plugin%2Fmaven-metadata.xml
[2]: https://img.shields.io/maven-metadata/v?versionPrefix=12&label=dev&logo=sonatype&metadataUrl=https%3A%2F%2Foss.sonatype.org%2Fcontent%2Frepositories%2Fsnapshots%2Fcom%2Faxonivy%2Fivy%2Fci%2Fproject-build-plugin%2Fmaven-metadata.xml
[3]: https://oss.sonatype.org/content/repositories/snapshots/com/axonivy/ivy/ci/project-build-plugin/
[4]: https://img.shields.io/badge/-Documentation-blue
[5]: https://axonivy.github.io/project-build-plugin/release/
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<groupId>com.axonivy.ivy.ci</groupId>
<artifactId>project-build-plugin</artifactId>
<packaging>maven-plugin</packaging>
<version>11.4.0-SNAPSHOT</version>
<version>12.0.0-SNAPSHOT</version>

<name>Axon Ivy Project Build Plugin</name>
<description>Maven plugin for the automated building of Axon Ivy Projects. Referenced from the pom.xml of Axon Ivy Projects.</description>
Expand Down Expand Up @@ -455,7 +455,7 @@
<others>
<property>
<name>ivy engine</name>
<value>11.4</value>
<value>12.0</value>
</property>
</others>
</requirements>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ch/ivyteam/ivy/maven/AbstractEngineMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public abstract class AbstractEngineMojo extends AbstractMojo {
* keep synch with pom.xml &gt; reporting &gt; maven-plugin-plugin &gt;
* requirements
*/
protected static final String MINIMAL_COMPATIBLE_VERSION = "11.3.0";
protected static final String MINIMAL_COMPATIBLE_VERSION = "12.0.0";
protected static final String DEFAULT_VERSION = "12.0.0";

protected static final String ENGINE_DIRECTORY_PROPERTY = "ivy.engine.directory";
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/ch/ivyteam/ivy/maven/InstallEngineMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@
* </p>
*
* <pre>
* mvn com.axonivy.ivy.ci:project-build-plugin:11.4.0:installEngine
* mvn com.axonivy.ivy.ci:project-build-plugin:12.0.0:installEngine
* -Divy.engine.directory=c:/axonviy/engine
* -Divy.engine.version=11.4.0
* -Divy.engine.version=12.0.0
* -Divy.engine.os.arch=Linux_x64
* </pre>
*
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/ch/ivyteam/ivy/maven/deploy/DeployToEngineMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
* </p>
*
* <pre>
* mvn com.axonivy.ivy.ci:project-build-plugin:11.4.0:deploy-to-engine
* mvn com.axonivy.ivy.ci:project-build-plugin:12.0.0:deploy-to-engine
* -Divy.deploy.file=myProject.iar
* -Divy.deploy.engine.dir=c:/axonivy/engine
* -Divy.deploy.engine.app=Portal
Expand All @@ -58,7 +58,7 @@
* </p>
*
* <pre>
* mvn com.axonivy.ivy.ci:project-build-plugin:11.4.0:deploy-to-engine
* mvn com.axonivy.ivy.ci:project-build-plugin:12.0.0:deploy-to-engine
* -Divy.deploy.file=myProject.iar
* -Divy.deploy.method=HTTP
* -Divy.deploy.server.id=AxonIvyEngine
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/ch/ivyteam/ivy/maven/TestInstallEngineMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ public void testEngineDownload_alreadyInstalledVersionTooOld() throws Exception
assertThat(mojo.engineDirectory).isDirectory();
assertThat(mojo.engineDirectory.resolve(getFakeLibraryPath(outdatedVersion))).exists();

mojo.ivyVersion = "[11.3.0,11.4.0]";
mojo.ivyVersion = "[12.0.0,12.0.0]";
mojo.autoInstallEngine = true;
mojo.engineDownloadUrl = mockEngineZip();

Expand Down
Loading