Skip to content

Commit a586e9c

Browse files
authored
Merge pull request #3417 from ProgrammeVitam/cp81_story_15510_jre
CP V8.1 - Story #15510: Delivering JRE instead of JDK for Pastis Standalone.
2 parents 229e49f + c5ea49e commit a586e9c

File tree

2 files changed

+15
-17
lines changed

2 files changed

+15
-17
lines changed

api/api-pastis/pastis-standalone/pom.xml

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -237,36 +237,35 @@
237237
<executions>
238238
<!-- download openjdk -->
239239
<execution>
240-
<id>download-jdk</id>
240+
<id>download-jre</id>
241241
<phase>initialize</phase>
242242
<goals>
243243
<goal>run</goal>
244244
</goals>
245245
<configuration>
246246
<target>
247247
<get
248-
src="https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_x64_windows_hotspot_17.0.13_11.zip"
249-
dest="${project.build.directory}/jdk17.zip"
250-
verbose="false"
251-
usetimestamp="true"/>
248+
src="https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.17+10/OpenJDK17U-jre_x64_windows_hotspot_17.0.17_10.zip"
249+
dest="${project.build.directory}/jre17.zip"
250+
verbose="false"
251+
usetimestamp="true"/>
252252
</target>
253253
</configuration>
254254
</execution>
255-
256255
<!-- unzip jdk -->
257256
<execution>
258-
<id>unzip-jdk</id>
257+
<id>unzip-jre</id>
259258
<phase>package</phase>
260-
<configuration>
261-
<tasks>
262-
<echo message="unzipping file"/>
263-
<unzip src="${project.build.directory}/jdk17.zip"
264-
dest="${project.build.directory}/jdk17/"/>
265-
</tasks>
266-
</configuration>
267259
<goals>
268260
<goal>run</goal>
269261
</goals>
262+
<configuration>
263+
<target>
264+
<echo message="unzipping file"/>
265+
<unzip src="${project.build.directory}/jre17.zip"
266+
dest="${project.build.directory}/"/>
267+
</target>
268+
</configuration>
270269
</execution>
271270
</executions>
272271
</plugin>
@@ -292,9 +291,8 @@
292291
<errTitle>Erreur</errTitle>
293292
<jre>
294293
<minVersion>17</minVersion>
295-
<path>./jdk17/jdk-17.0.13+11</path>
294+
<path>./jdk-17.0.17+10-jre</path>
296295
<requires64Bit/>
297-
<requiresJdk/>
298296
</jre>
299297
<versionInfo>
300298
<fileVersion>1.0.0.0</fileVersion>

api/api-pastis/pastis-standalone/src/main/assembly/packaging-zip.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<outputDirectory>/</outputDirectory>
1313
<includes>
1414
<include>*.exe</include>
15-
<include>jdk17/jdk-17.0.13+11/**</include>
15+
<include>jdk-17.0.17+10-jre/**</include>
1616
</includes>
1717
</fileSet>
1818
<fileSet>

0 commit comments

Comments
 (0)