Skip to content

Commit 7d637f7

Browse files
GiooDevGiooDev
committed
Story #15509: Update JRE to Adoptium Temurin 11.0.29+7.
1 parent b3a81b3 commit 7d637f7

File tree

5 files changed

+36
-34
lines changed

5 files changed

+36
-34
lines changed

‎mailextract/assembly.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<includes>
1515
<include>MailExtract.exe</include>
1616
<include>MailExtractCmd.exe</include>
17-
<include>jdk-11/**</include>
17+
<include>jdk-11.0.29+7-jre/**</include>
1818
</includes>
1919
</fileSet>
2020
</fileSets>

‎mailextract/pom.xml‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -117,35 +117,36 @@
117117
<executions>
118118
<!-- download openjdk -->
119119
<execution>
120-
<id>download-jdk</id>
120+
<id>download-jre</id>
121121
<phase>package</phase>
122122
<goals>
123123
<goal>run</goal>
124124
</goals>
125125
<configuration>
126126
<target>
127127
<get
128-
src="https://download.java.net/openjdk/jdk11/ri/openjdk-11+28_windows-x64_bin.zip"
129-
dest="${project.build.directory}/openjdk-11+28_windows-x64_bin.zip"
130-
verbose="false"
131-
ignoreerrors="false"
132-
usetimestamp="true"/>
128+
src="https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.29+7/OpenJDK11U-jre_x64_windows_hotspot_11.0.29_7.zip"
129+
dest="${project.build.directory}/jre11.zip"
130+
verbose="false"
131+
ignoreerrors="false"
132+
usetimestamp="true"/>
133133
</target>
134134
</configuration>
135135
</execution>
136136
<execution>
137-
<id>unzip-jdk</id>
137+
<id>unzip-jre</id>
138138
<phase>package</phase>
139+
<goals>
140+
<goal>run</goal>
141+
</goals>
139142
<configuration>
140143
<target>
141144
<echo message="unzipping file"/>
142-
<unzip src="${project.build.directory}/openjdk-11+28_windows-x64_bin.zip"
143-
dest="${project.build.directory}/"/>
145+
<unzip
146+
src="${project.build.directory}/jre11.zip"
147+
dest="${project.build.directory}/"/>
144148
</target>
145149
</configuration>
146-
<goals>
147-
<goal>run</goal>
148-
</goals>
149150
</execution>
150151
</executions>
151152
</plugin>
@@ -167,12 +168,12 @@
167168
<icon>windows/VitamIcon.ico</icon>
168169
<outfile>${project.build.directory}/MailExtract.exe</outfile>
169170
<stayAlive>true</stayAlive>
170-
<downloadUrl>http://java.com/download</downloadUrl>
171+
<downloadUrl>https://adoptium.net/temurin/releases/?version=11</downloadUrl>
171172
<classPath>
172173
<mainClass>fr.gouv.vitam.tools.mailextract.MailExtractApp</mainClass>
173174
</classPath>
174175
<jre>
175-
<path>jdk-11</path>
176+
<path>./jdk-11.0.29+7-jre</path>
176177
<minVersion>11</minVersion>
177178
<requires64Bit/>
178179
<requiresJdk/>
@@ -213,7 +214,7 @@
213214
<jar>${project.build.directory}/${project.artifactId}-${project.version}-shaded.jar</jar>
214215
<icon>windows/VitamIcon.ico</icon>
215216
<outfile>${project.build.directory}/MailExtractCmd.exe</outfile>
216-
<downloadUrl>http://java.com/download</downloadUrl>
217+
<downloadUrl>https://adoptium.net/temurin/releases/?version=11</downloadUrl>
217218
<classPath>
218219
<mainClass>fr.gouv.vitam.tools.mailextract.MailExtractApp</mainClass>
219220
</classPath>

‎resip/assembly.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<outputDirectory>/</outputDirectory>
1414
<includes>
1515
<include>Resip.exe</include>
16-
<include>jdk-11/**</include>
16+
<include>jdk-11.0.29+7-jre/**</include>
1717
</includes>
1818
</fileSet>
1919
<fileSet>

‎resip/pom.xml‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -169,35 +169,36 @@
169169
<executions>
170170
<!-- download openjdk -->
171171
<execution>
172-
<id>download-jdk</id>
172+
<id>download-jre</id>
173173
<phase>package</phase>
174174
<goals>
175175
<goal>run</goal>
176176
</goals>
177177
<configuration>
178178
<target>
179179
<get
180-
src="https://download.java.net/openjdk/jdk11/ri/openjdk-11+28_windows-x64_bin.zip"
181-
dest="${project.build.directory}/openjdk-11+28_windows-x64_bin.zip"
182-
verbose="false"
183-
ignoreerrors="false"
184-
usetimestamp="true"/>
180+
src="https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.29+7/OpenJDK11U-jre_x64_windows_hotspot_11.0.29_7.zip"
181+
dest="${project.build.directory}/jre11.zip"
182+
verbose="false"
183+
ignoreerrors="false"
184+
usetimestamp="true"/>
185185
</target>
186186
</configuration>
187187
</execution>
188188
<execution>
189-
<id>unzip-jdk</id>
189+
<id>unzip-jre</id>
190190
<phase>package</phase>
191+
<goals>
192+
<goal>run</goal>
193+
</goals>
191194
<configuration>
192195
<target>
193196
<echo message="unzipping file"/>
194-
<unzip src="${project.build.directory}/openjdk-11+28_windows-x64_bin.zip"
195-
dest="${project.build.directory}/"/>
197+
<unzip
198+
src="${project.build.directory}/jre11.zip"
199+
dest="${project.build.directory}/"/>
196200
</target>
197201
</configuration>
198-
<goals>
199-
<goal>run</goal>
200-
</goals>
201202
</execution>
202203
</executions>
203204
</plugin>
@@ -219,7 +220,7 @@
219220
<icon>windows/VitamIcon.ico</icon>
220221
<outfile>windows/Resip.exe</outfile>
221222
<stayAlive>true</stayAlive>
222-
<downloadUrl>http://java.com/download</downloadUrl>
223+
<downloadUrl>https://adoptium.net/temurin/releases/?version=11</downloadUrl>
223224
<classPath>
224225
<mainClass>fr.gouv.vitam.tools.resip.app.ResipApp</mainClass>
225226
</classPath>
@@ -265,13 +266,13 @@
265266
<icon>windows/VitamIcon.ico</icon>
266267
<outfile>${project.build.directory}/Resip.exe</outfile>
267268
<stayAlive>true</stayAlive>
268-
<downloadUrl>http://java.com/download</downloadUrl>
269+
<downloadUrl>https://adoptium.net/temurin/releases/?version=11</downloadUrl>
269270
<classPath>
270271
<mainClass>fr.gouv.vitam.tools.resip.app.ResipApp</mainClass>
271272
</classPath>
272273
<!-- Specify the JRE to include -->
273274
<jre>
274-
<path>jdk-11</path>
275+
<path>./jdk-11.0.29+7-jre</path>
275276
<minVersion>11</minVersion>
276277
<requires64Bit/>
277278
<requiresJdk/>

‎testsipgenerator/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,12 @@
122122
<jar>target/${project.artifactId}-${project.version}-shaded.jar</jar>
123123
<icon>windows/VitamIcon.ico</icon>
124124
<outfile>windows/TestFileGenerator.exe</outfile>
125-
<downloadUrl>http://java.com/download</downloadUrl>
125+
<downloadUrl>https://adoptium.net/temurin/releases/?version=11</downloadUrl>
126126
<classPath>
127127
<mainClass>fr.gouv.vitam.tools.testsipgenerator.TestSipGeneratorApp</mainClass>
128128
</classPath>
129129
<jre>
130-
<path>.\jre</path>
130+
<path>./jdk-11.0.29+7-jre</path>
131131
<minVersion>11</minVersion>
132132
<requires64Bit/>
133133
<opts>

0 commit comments

Comments
 (0)