Skip to content

Commit 70ea7c4

Browse files
authored
#252: include documentation into release (#253)
1 parent 128bf5c commit 70ea7c4

File tree

3 files changed

+34
-8
lines changed

3 files changed

+34
-8
lines changed

cli/pom.xml

+33-7
Original file line numberDiff line numberDiff line change
@@ -152,17 +152,17 @@
152152
<configuration>
153153
<artifacts>
154154
<artifact>
155-
<file>target/${project.artifactId}-linux-x64.tar.gz</file>
155+
<file>${project.build.directory}/${project.artifactId}-linux-x64.tar.gz</file>
156156
<type>tar.gz</type>
157157
<classifier>linux</classifier>
158158
</artifact>
159159
<artifact>
160-
<file>target/${project.artifactId}-windows-x64.tar.gz</file>
160+
<file>${project.build.directory}/${project.artifactId}-windows-x64.tar.gz</file>
161161
<type>tar.gz</type>
162162
<classifier>windows</classifier>
163163
</artifact>
164164
<artifact>
165-
<file>target/${project.artifactId}-mac-x64.tar.gz</file>
165+
<file>${project.build.directory}/${project.artifactId}-mac-x64.tar.gz</file>
166166
<type>tar.gz</type>
167167
<classifier>mac</classifier>
168168
</artifact>
@@ -206,16 +206,42 @@
206206
<agent>
207207
<enabled>true</enabled>
208208
</agent>
209-
<imageName>
210-
${imageName}
211-
</imageName>
209+
<imageName>${imageName}</imageName>
212210
<buildArgs>
213211
<arg>--enable-url-protocols=https</arg>
214212
<arg>-H:IncludeResources="nls/.*"</arg>
215213
<arg>--initialize-at-build-time=org.apache.commons.compress</arg>
216214
</buildArgs>
217215
</configuration>
218216
</plugin>
217+
<plugin>
218+
<!-- Include documentation into release -->
219+
<groupId>org.apache.maven.plugins</groupId>
220+
<artifactId>maven-dependency-plugin</artifactId>
221+
<executions>
222+
<execution>
223+
<id>copy-documentation</id>
224+
<phase>prepare-package</phase>
225+
<goals>
226+
<goal>copy</goal>
227+
</goals>
228+
</execution>
229+
</executions>
230+
<configuration>
231+
<artifactItems>
232+
<artifactItem>
233+
<groupId>${project.groupId}</groupId>
234+
<artifactId>ide-doc</artifactId>
235+
<version>${project.version}</version>
236+
<type>pdf</type>
237+
<destFileName>IDEasy-documentation.pdf</destFileName>
238+
</artifactItem>
239+
</artifactItems>
240+
<outputDirectory>${project.build.directory}/package</outputDirectory>
241+
<overWriteReleases>false</overWriteReleases>
242+
<overWriteSnapshots>true</overWriteSnapshots>
243+
</configuration>
244+
</plugin>
219245
<plugin>
220246
<groupId>org.apache.maven.plugins</groupId>
221247
<artifactId>maven-assembly-plugin</artifactId>
@@ -230,7 +256,7 @@
230256
<finalName>${releaseName}</finalName>
231257
<appendAssemblyId>false</appendAssemblyId>
232258
<descriptors>
233-
<descriptor>/src/main/assembly/exec.xml</descriptor>
259+
<descriptor>/src/main/assembly/release.xml</descriptor>
234260
</descriptors>
235261
</configuration>
236262
</execution>
File renamed without changes.

cli/src/main/java/com/devonfw/tools/ide/repo/CustomToolRepositoryImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ public static CustomToolRepository of(IdeContext context) {
164164
String url = getString(jsonToolObject, "url", defaultUrl);
165165
boolean osAgnostic = getBoolean(jsonToolObject, "os-agnostic", Boolean.FALSE);
166166
boolean archAgnostic = getBoolean(jsonToolObject, "arch-agnostic", Boolean.TRUE);
167-
if (defaultUrl.isEmpty()) {
167+
if (url.isEmpty()) {
168168
throw new IllegalStateException("Missing 'url' property for tool '" + name + "'!");
169169
}
170170
// TODO

0 commit comments

Comments
 (0)