From 187b00eb5d70d6a670c0e73e6b300e4f4f58e9c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Hohwiller?= <joerg.hohwiller@capgemini.com>
Date: Mon, 18 Mar 2024 18:10:06 +0100
Subject: [PATCH 1/3] #252: include documentation into release

incl. cleanup
---
 cli/pom.xml                                   | 40 +++++++++++++++----
 .../main/assembly/{exec.xml => release.xml}   |  0
 2 files changed, 33 insertions(+), 7 deletions(-)
 rename cli/src/main/assembly/{exec.xml => release.xml} (100%)

diff --git a/cli/pom.xml b/cli/pom.xml
index c2624a8fe..45f43b8d4 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -152,17 +152,17 @@
                 <configuration>
                   <artifacts>
                     <artifact>
-                      <file>target/${project.artifactId}-linux-x64.tar.gz</file>
+                      <file>${project.build.directory}/${project.artifactId}-linux-x64.tar.gz</file>
                       <type>tar.gz</type>
                       <classifier>linux</classifier>
                     </artifact>
                     <artifact>
-                      <file>target/${project.artifactId}-windows-x64.tar.gz</file>
+                      <file>${project.build.directory}/${project.artifactId}-windows-x64.tar.gz</file>
                       <type>tar.gz</type>
                       <classifier>windows</classifier>
                     </artifact>
                     <artifact>
-                      <file>target/${project.artifactId}-mac-x64.tar.gz</file>
+                      <file>${project.build.directory}/${project.artifactId}-mac-x64.tar.gz</file>
                       <type>tar.gz</type>
                       <classifier>mac</classifier>
                     </artifact>
@@ -206,9 +206,7 @@
               <agent>
                 <enabled>true</enabled>
               </agent>
-              <imageName>
-                ${imageName}
-              </imageName>
+              <imageName>${imageName}</imageName>
               <buildArgs>
                 <arg>--enable-url-protocols=https</arg>
                 <arg>-H:IncludeResources="nls/.*"</arg>
@@ -216,6 +214,34 @@
               </buildArgs>
             </configuration>
           </plugin>
+          <plugin>
+            <!-- Include documentation into release -->
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>copy-documentation</id>
+                <phase>prepare-package</phase>
+                <goals>
+                  <goal>copy</goal>
+                </goals>
+              </execution>
+              <configuration>
+                <artifactItems>
+                  <artifactItem>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>ide-doc</artifactId>
+                    <version>${project.version}</version>
+                    <type>pdf</type>
+                    <destFileName>IDEasy-documentation.pdf</destFileName>
+                  </artifactItem>
+                </artifactItems>
+                <outputDirectory>${project.build.directory}/package</outputDirectory>
+                <overWriteReleases>false</overWriteReleases>
+                <overWriteSnapshots>true</overWriteSnapshots>
+              </configuration>
+            </executions>
+          </plugin>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-assembly-plugin</artifactId>
@@ -230,7 +256,7 @@
                   <finalName>${releaseName}</finalName>
                   <appendAssemblyId>false</appendAssemblyId>
                   <descriptors>
-                    <descriptor>/src/main/assembly/exec.xml</descriptor>
+                    <descriptor>/src/main/assembly/release.xml</descriptor>
                   </descriptors>
                 </configuration>
               </execution>
diff --git a/cli/src/main/assembly/exec.xml b/cli/src/main/assembly/release.xml
similarity index 100%
rename from cli/src/main/assembly/exec.xml
rename to cli/src/main/assembly/release.xml

From 9440c241e405a10c6bbc684157e40306cc40076a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Hohwiller?= <joerg.hohwiller@capgemini.com>
Date: Mon, 18 Mar 2024 18:13:01 +0100
Subject: [PATCH 2/3] small unrelated bugfix for custom-tool.json config

---
 .../com/devonfw/tools/ide/repo/CustomToolRepositoryImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cli/src/main/java/com/devonfw/tools/ide/repo/CustomToolRepositoryImpl.java b/cli/src/main/java/com/devonfw/tools/ide/repo/CustomToolRepositoryImpl.java
index 29fb8172d..584535d7f 100644
--- a/cli/src/main/java/com/devonfw/tools/ide/repo/CustomToolRepositoryImpl.java
+++ b/cli/src/main/java/com/devonfw/tools/ide/repo/CustomToolRepositoryImpl.java
@@ -164,7 +164,7 @@ public static CustomToolRepository of(IdeContext context) {
           String url = getString(jsonToolObject, "url", defaultUrl);
           boolean osAgnostic = getBoolean(jsonToolObject, "os-agnostic", Boolean.FALSE);
           boolean archAgnostic = getBoolean(jsonToolObject, "arch-agnostic", Boolean.TRUE);
-          if (defaultUrl.isEmpty()) {
+          if (url.isEmpty()) {
             throw new IllegalStateException("Missing 'url' property for tool '" + name + "'!");
           }
           // TODO

From 7b6193bff405875611c672e46e47d3e3f09085fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Hohwiller?= <joerg.hohwiller@capgemini.com>
Date: Mon, 18 Mar 2024 18:36:35 +0100
Subject: [PATCH 3/3] fixed pom

---
 cli/pom.xml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/cli/pom.xml b/cli/pom.xml
index 45f43b8d4..9f47e2369 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -226,21 +226,21 @@
                   <goal>copy</goal>
                 </goals>
               </execution>
-              <configuration>
-                <artifactItems>
-                  <artifactItem>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>ide-doc</artifactId>
-                    <version>${project.version}</version>
-                    <type>pdf</type>
-                    <destFileName>IDEasy-documentation.pdf</destFileName>
-                  </artifactItem>
-                </artifactItems>
-                <outputDirectory>${project.build.directory}/package</outputDirectory>
-                <overWriteReleases>false</overWriteReleases>
-                <overWriteSnapshots>true</overWriteSnapshots>
-              </configuration>
             </executions>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>${project.groupId}</groupId>
+                  <artifactId>ide-doc</artifactId>
+                  <version>${project.version}</version>
+                  <type>pdf</type>
+                  <destFileName>IDEasy-documentation.pdf</destFileName>
+                </artifactItem>
+              </artifactItems>
+              <outputDirectory>${project.build.directory}/package</outputDirectory>
+              <overWriteReleases>false</overWriteReleases>
+              <overWriteSnapshots>true</overWriteSnapshots>
+            </configuration>
           </plugin>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>