Skip to content

Commit e455d55

Browse files
GiooDevGiooDev
authored
Merge pull request #100 from ProgrammeVitam/story_15509_temurin11
Story #15509 & #15513: Changing JRE and updating package composition
2 parents b3a81b3 + 56e851b commit e455d55

File tree

9 files changed

+99
-125
lines changed

9 files changed

+99
-125
lines changed

‎Jenkinsfile‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
pipeline {
22
agent {
3-
label 'slaves'
3+
label 'build'
4+
}
5+
6+
tools {
7+
jdk 'java11'
8+
maven 'maven-3.9'
49
}
510

611
environment {
@@ -51,7 +56,6 @@ pipeline {
5156
script {
5257
// overwrite file content with one more goal
5358
writeFile file: 'deploy_goal.txt', text: "${env.DEPLOY_GOAL}"
54-
writeFile file: 'master_branch.txt', text: "${env.MASTER_BRANCH}"
5559
}
5660
echo "We are on master branch (${env.GIT_BRANCH}) ; deploy goal is \"${env.DEPLOY_GOAL}\""
5761
}

‎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: 18 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/>
@@ -190,6 +191,7 @@
190191
</txtFileVersion>
191192
<fileDescription>${project.name}</fileDescription>
192193
<copyright>Programme Vitam</copyright>
194+
<companyName>Programme Vitam</companyName>
193195
<productVersion>
194196
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
195197
</productVersion>
@@ -213,7 +215,7 @@
213215
<jar>${project.build.directory}/${project.artifactId}-${project.version}-shaded.jar</jar>
214216
<icon>windows/VitamIcon.ico</icon>
215217
<outfile>${project.build.directory}/MailExtractCmd.exe</outfile>
216-
<downloadUrl>http://java.com/download</downloadUrl>
218+
<downloadUrl>https://adoptium.net/temurin/releases/?version=11</downloadUrl>
217219
<classPath>
218220
<mainClass>fr.gouv.vitam.tools.mailextract.MailExtractApp</mainClass>
219221
</classPath>
@@ -236,6 +238,7 @@
236238
</txtFileVersion>
237239
<fileDescription>${project.name}</fileDescription>
238240
<copyright>Programme Vitam</copyright>
241+
<companyName>Programme Vitam</companyName>
239242
<productVersion>
240243
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
241244
</productVersion>

‎packaging/assembly.xml‎

Lines changed: 42 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,60 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
3+
<id>package</id>
34
<formats>
4-
<format>tar.gz</format>
5+
<format>zip</format>
56
</formats>
67
<includeBaseDirectory>false</includeBaseDirectory>
78
<fileSets>
8-
<!-- Add all vitam-external rpm -->
9+
10+
<!-- Resip -->
911
<fileSet>
10-
<directory>../resip/windows</directory>
11-
<outputDirectory></outputDirectory>
12-
<excludes>
13-
<exclude>VitamIcon.ico</exclude>
14-
<exclude>resipIHM.png</exclude>
15-
</excludes>
12+
<directory>../resip/target</directory>
13+
<outputDirectory>resip/</outputDirectory>
14+
<includes>
15+
<include>Resip.exe</include>
16+
<include>resip-${project.version}-shaded.jar</include>
17+
</includes>
1618
</fileSet>
1719
<fileSet>
18-
<directory>../doc</directory>
19-
<outputDirectory>/doc</outputDirectory>
20+
<directory>../resip/windows</directory>
21+
<outputDirectory>resip/</outputDirectory>
22+
<includes>
23+
<include>Resip.bat</include>
24+
</includes>
2025
</fileSet>
21-
<!-- Add "native" vitam-product rpm -->
2226
<fileSet>
2327
<directory>../resip/src/test/resources/PacketSamples/</directory>
24-
<outputDirectory>config/</outputDirectory>
28+
<outputDirectory>resip/config/</outputDirectory>
2529
<includes>
2630
<include>**/ExportContext.config</include>
2731
</includes>
28-
<!-- <excludes>
29-
<exclude>**/vitam-gatling-*.rpm</exclude>
30-
</excludes> -->
31-
</fileSet>
32-
</fileSets>
33-
<dependencySets>
34-
<!-- Add documentation files -->
35-
<dependencySet>
36-
<outputDirectory>/</outputDirectory>
37-
<unpack>false</unpack>
32+
</fileSet>
33+
<fileSet>
34+
<directory>../resip/doc</directory>
35+
<outputDirectory>resip/doc</outputDirectory>
36+
</fileSet>
37+
38+
<!-- TestFileGenerator -->
39+
<fileSet>
40+
<directory>../testsipgenerator/target</directory>
41+
<outputDirectory>testsipgenerator/</outputDirectory>
42+
<includes>
43+
<include>TestFileGenerator.exe</include>
44+
<include>testsipgenerator-${project.version}-shaded.jar</include>
45+
</includes>
46+
</fileSet>
47+
48+
<!-- MailExtractor -->
49+
<fileSet>
50+
<directory>../mailextract/target</directory>
51+
<outputDirectory>mailextract/</outputDirectory>
3852
<includes>
39-
<include>fr.gouv.vitam.tools:resip:*</include>
53+
<include>MailExtract.exe</include>
54+
<include>MailExtractCmd.exe</include>
55+
<include>mailextract-${project.version}-shaded.jar</include>
4056
</includes>
41-
</dependencySet>
42-
</dependencySets>
57+
</fileSet>
58+
59+
</fileSets>
4360
</assembly>

‎packaging/pom.xml‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
<build>
1818
<plugins>
19-
19+
2020
<plugin>
2121
<artifactId>maven-assembly-plugin</artifactId>
2222
<executions>
@@ -35,16 +35,8 @@
3535
</execution>
3636
</executions>
3737
</plugin>
38+
3839
</plugins>
3940
</build>
4041

41-
<dependencies>
42-
<!-- VITAM dependencies -->
43-
<dependency>
44-
<groupId>fr.gouv.vitam.tools</groupId>
45-
<artifactId>resip</artifactId>
46-
<version>${project.version}</version>
47-
<classifier>shaded</classifier>
48-
</dependency>
49-
</dependencies>
5042
</project>

‎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: 19 additions & 61 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>
@@ -215,16 +216,16 @@
215216
</goals>
216217
<configuration>
217218
<headerType>gui</headerType>
218-
<jar>target/${project.artifactId}-${project.version}-shaded.jar</jar>
219+
<jar>${project.build.directory}/${project.artifactId}-${project.version}-shaded.jar</jar>
219220
<icon>windows/VitamIcon.ico</icon>
220-
<outfile>windows/Resip.exe</outfile>
221+
<outfile>${project.build.directory}/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>
226227
<jre>
227-
<path>.\jre</path>
228+
<path>./jdk-11.0.29+7-jre</path>
228229
<minVersion>11</minVersion>
229230
<requires64Bit/>
230231
<opts>
@@ -241,50 +242,7 @@
241242
</txtFileVersion>
242243
<fileDescription>${project.name}</fileDescription>
243244
<copyright>Programme Vitam</copyright>
244-
<productVersion>
245-
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
246-
</productVersion>
247-
<txtProductVersion>
248-
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
249-
</txtProductVersion>
250-
<productName>${project.name}</productName>
251-
<internalName>${project.name}</internalName>
252-
<originalFilename>Resip.exe</originalFilename>
253-
</versionInfo>
254-
</configuration>
255-
</execution>
256-
<execution>
257-
<id>l4j-generate-x64</id>
258-
<phase>package</phase>
259-
<goals>
260-
<goal>launch4j</goal>
261-
</goals>
262-
<configuration>
263-
<headerType>gui</headerType>
264-
<jar>${project.build.directory}/${project.artifactId}-${project.version}-shaded.jar</jar>
265-
<icon>windows/VitamIcon.ico</icon>
266-
<outfile>${project.build.directory}/Resip.exe</outfile>
267-
<stayAlive>true</stayAlive>
268-
<downloadUrl>http://java.com/download</downloadUrl>
269-
<classPath>
270-
<mainClass>fr.gouv.vitam.tools.resip.app.ResipApp</mainClass>
271-
</classPath>
272-
<!-- Specify the JRE to include -->
273-
<jre>
274-
<path>jdk-11</path>
275-
<minVersion>11</minVersion>
276-
<requires64Bit/>
277-
<requiresJdk/>
278-
</jre>
279-
<versionInfo>
280-
<fileVersion>
281-
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
282-
</fileVersion>
283-
<txtFileVersion>
284-
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
285-
</txtFileVersion>
286-
<fileDescription>${project.name}</fileDescription>
287-
<copyright>Programme Vitam</copyright>
245+
<companyName>Programme Vitam</companyName>
288246
<productVersion>
289247
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
290248
</productVersion>
@@ -322,7 +280,7 @@
322280
</configuration>
323281
</execution>
324282
<execution>
325-
<id>tar.gz-with-jdk-11-assembly</id>
283+
<id>zip-with-jdk-11-assembly</id>
326284
<phase>package</phase>
327285
<goals>
328286
<goal>single</goal>

‎testsipgenerator/assembly.xml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
33
<formats>
4-
<format>tar.gz</format>
4+
<format>zip</format>
55
</formats>
66
<includeBaseDirectory>false</includeBaseDirectory>
77
<fileSets>
8-
<!-- Add all vitam-external rpm -->
98
<fileSet>
10-
<directory>windows/</directory>
9+
<directory>${project.build.directory}/</directory>
1110
<outputDirectory></outputDirectory>
12-
<!-- <excludes>
13-
<exclude>VitamIcon.ico</exclude>
14-
</excludes> -->
11+
<includes>
12+
<include>TestFileGenerator.exe</include>
13+
</includes>
1514
</fileSet>
1615
</fileSets>
1716
</assembly>

0 commit comments

Comments
 (0)