Skip to content

Commit de4f534

Browse files
GiooDevGiooDev
committed
Story #15513: Refactoring sedatools-package to include all provided libraries.
1 parent 7d637f7 commit de4f534

File tree

7 files changed

+59
-92
lines changed

7 files changed

+59
-92
lines changed

‎Jenkinsfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ pipeline {
5151
script {
5252
// overwrite file content with one more goal
5353
writeFile file: 'deploy_goal.txt', text: "${env.DEPLOY_GOAL}"
54-
writeFile file: 'master_branch.txt', text: "${env.MASTER_BRANCH}"
5554
}
5655
echo "We are on master branch (${env.GIT_BRANCH}) ; deploy goal is \"${env.DEPLOY_GOAL}\""
5756
}

‎mailextract/pom.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@
191191
</txtFileVersion>
192192
<fileDescription>${project.name}</fileDescription>
193193
<copyright>Programme Vitam</copyright>
194+
<companyName>Programme Vitam</companyName>
194195
<productVersion>
195196
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
196197
</productVersion>
@@ -237,6 +238,7 @@
237238
</txtFileVersion>
238239
<fileDescription>${project.name}</fileDescription>
239240
<copyright>Programme Vitam</copyright>
241+
<companyName>Programme Vitam</companyName>
240242
<productVersion>
241243
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
242244
</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/pom.xml‎

Lines changed: 5 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -216,16 +216,16 @@
216216
</goals>
217217
<configuration>
218218
<headerType>gui</headerType>
219-
<jar>target/${project.artifactId}-${project.version}-shaded.jar</jar>
219+
<jar>${project.build.directory}/${project.artifactId}-${project.version}-shaded.jar</jar>
220220
<icon>windows/VitamIcon.ico</icon>
221-
<outfile>windows/Resip.exe</outfile>
221+
<outfile>${project.build.directory}/Resip.exe</outfile>
222222
<stayAlive>true</stayAlive>
223223
<downloadUrl>https://adoptium.net/temurin/releases/?version=11</downloadUrl>
224224
<classPath>
225225
<mainClass>fr.gouv.vitam.tools.resip.app.ResipApp</mainClass>
226226
</classPath>
227227
<jre>
228-
<path>.\jre</path>
228+
<path>./jdk-11.0.29+7-jre</path>
229229
<minVersion>11</minVersion>
230230
<requires64Bit/>
231231
<opts>
@@ -242,50 +242,7 @@
242242
</txtFileVersion>
243243
<fileDescription>${project.name}</fileDescription>
244244
<copyright>Programme Vitam</copyright>
245-
<productVersion>
246-
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
247-
</productVersion>
248-
<txtProductVersion>
249-
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
250-
</txtProductVersion>
251-
<productName>${project.name}</productName>
252-
<internalName>${project.name}</internalName>
253-
<originalFilename>Resip.exe</originalFilename>
254-
</versionInfo>
255-
</configuration>
256-
</execution>
257-
<execution>
258-
<id>l4j-generate-x64</id>
259-
<phase>package</phase>
260-
<goals>
261-
<goal>launch4j</goal>
262-
</goals>
263-
<configuration>
264-
<headerType>gui</headerType>
265-
<jar>${project.build.directory}/${project.artifactId}-${project.version}-shaded.jar</jar>
266-
<icon>windows/VitamIcon.ico</icon>
267-
<outfile>${project.build.directory}/Resip.exe</outfile>
268-
<stayAlive>true</stayAlive>
269-
<downloadUrl>https://adoptium.net/temurin/releases/?version=11</downloadUrl>
270-
<classPath>
271-
<mainClass>fr.gouv.vitam.tools.resip.app.ResipApp</mainClass>
272-
</classPath>
273-
<!-- Specify the JRE to include -->
274-
<jre>
275-
<path>./jdk-11.0.29+7-jre</path>
276-
<minVersion>11</minVersion>
277-
<requires64Bit/>
278-
<requiresJdk/>
279-
</jre>
280-
<versionInfo>
281-
<fileVersion>
282-
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
283-
</fileVersion>
284-
<txtFileVersion>
285-
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
286-
</txtFileVersion>
287-
<fileDescription>${project.name}</fileDescription>
288-
<copyright>Programme Vitam</copyright>
245+
<companyName>Programme Vitam</companyName>
289246
<productVersion>
290247
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
291248
</productVersion>
@@ -323,7 +280,7 @@
323280
</configuration>
324281
</execution>
325282
<execution>
326-
<id>tar.gz-with-jdk-11-assembly</id>
283+
<id>zip-with-jdk-11-assembly</id>
327284
<phase>package</phase>
328285
<goals>
329286
<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>

‎testsipgenerator/pom.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,9 @@
119119
</goals>
120120
<configuration>
121121
<headerType>console</headerType>
122-
<jar>target/${project.artifactId}-${project.version}-shaded.jar</jar>
122+
<jar>${project.build.directory}/${project.artifactId}-${project.version}-shaded.jar</jar>
123123
<icon>windows/VitamIcon.ico</icon>
124-
<outfile>windows/TestFileGenerator.exe</outfile>
124+
<outfile>${project.build.directory}/TestFileGenerator.exe</outfile>
125125
<downloadUrl>https://adoptium.net/temurin/releases/?version=11</downloadUrl>
126126
<classPath>
127127
<mainClass>fr.gouv.vitam.tools.testsipgenerator.TestSipGeneratorApp</mainClass>
@@ -143,6 +143,7 @@
143143
</txtFileVersion>
144144
<fileDescription>${project.name}</fileDescription>
145145
<copyright>Programme Vitam</copyright>
146+
<companyName>Programme Vitam</companyName>
146147
<productVersion>
147148
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0
148149
</productVersion>

0 commit comments

Comments
 (0)