Skip to content

Commit a644014

Browse files
khergalantkhergalant
committed
build
1 parent 43145e8 commit a644014

File tree

3 files changed

+132
-40
lines changed

3 files changed

+132
-40
lines changed

‎configuration/template/refus-specifique-diplome/lettre_refus_export_template_COD-DIP.sample.docx

-64 KB
Binary file not shown.

‎pom.xml

Lines changed: 116 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@
3333
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3434
<java.version>11</java.version>
3535

36+
<!-- Localisation des ressources -->
37+
<ressources.location>${basedir}/configuration/</ressources.location>
38+
3639
<!-- Java -->
3740
<javax.servlet.version>3.1.0</javax.servlet.version>
3841
<javax.annotation-api.version>1.3.2</javax.annotation-api.version>
@@ -168,16 +171,101 @@
168171
<excludes>
169172
<exclude>license/</exclude>
170173
<exclude>assembly/</exclude>
171-
<exclude>**/*.scss</exclude>
172174
<exclude>VAADIN/gwt-unitCache/</exclude>
175+
<!--<exclude>VAADIN/themes/valo-ul/style.scss</exclude>-->
173176
<exclude>repository/</exclude>
174177
</excludes>
175178
</resource>
176179
</resources>
180+
181+
<!-- Copie des ressources -->
182+
<plugins>
183+
<plugin>
184+
<artifactId>maven-resources-plugin</artifactId>
185+
<version>${maven-resources-plugin.version}</version>
186+
<executions>
187+
<execution>
188+
<id>copy-resources-front</id>
189+
<phase>process-resources</phase>
190+
<goals>
191+
<goal>copy-resources</goal>
192+
</goals>
193+
<configuration>
194+
<outputDirectory>${project.build.outputDirectory}/VAADIN/themes/valo-ul</outputDirectory>
195+
<overwrite>true</overwrite>
196+
<resources>
197+
<resource>
198+
<directory>${ressources.location}/front/</directory>
199+
<filtering>false</filtering>
200+
<exclude>**sample**</exclude>
201+
</resource>
202+
</resources>
203+
</configuration>
204+
</execution>
205+
<execution>
206+
<id>copy-resources-i18n</id>
207+
<phase>process-resources</phase>
208+
<goals>
209+
<goal>copy-resources</goal>
210+
</goals>
211+
<configuration>
212+
<outputDirectory>${project.build.outputDirectory}/i18n/</outputDirectory>
213+
<overwrite>true</overwrite>
214+
<resources>
215+
<resource>
216+
<directory>${ressources.location}/i18n/</directory>
217+
<filtering>false</filtering>
218+
<exclude>**sample**</exclude>
219+
</resource>
220+
</resources>
221+
</configuration>
222+
</execution>
223+
<execution>
224+
<id>copy-resources-siscol</id>
225+
<phase>process-resources</phase>
226+
<goals>
227+
<goal>copy-resources</goal>
228+
</goals>
229+
<configuration>
230+
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
231+
<overwrite>true</overwrite>
232+
<resources>
233+
<resource>
234+
<directory>${ressources.location}/siscol/</directory>
235+
<filtering>false</filtering>
236+
<exclude>**sample**</exclude>
237+
</resource>
238+
</resources>
239+
</configuration>
240+
</execution>
241+
<execution>
242+
<id>copy-resources-template</id>
243+
<phase>process-resources</phase>
244+
<goals>
245+
<goal>copy-resources</goal>
246+
</goals>
247+
<configuration>
248+
<outputDirectory>${project.build.outputDirectory}/template/</outputDirectory>
249+
<overwrite>true</overwrite>
250+
<resources>
251+
<resource>
252+
<directory>${ressources.location}/template/</directory>
253+
<filtering>false</filtering>
254+
<excludes>
255+
<exclude>**sample**</exclude>
256+
<exclude>refus-specifique-diplome/**sample**</exclude>
257+
</excludes>
258+
</resource>
259+
</resources>
260+
</configuration>
261+
</execution>
262+
</executions>
263+
</plugin>
264+
</plugins>
177265
</build>
178266
</profile>
179267

180-
<!-- Profil de déploiement national, sans les fichiers de sample, avec les fichiers de config -->
268+
<!-- Profil de déploiement national, sans les fichiers de sample, avec les fichiers de config
181269
<profile>
182270
<id>deploiement-national</id>
183271
<build>
@@ -204,9 +292,9 @@
204292
</resource>
205293
</resources>
206294
</build>
207-
</profile>
295+
</profile> -->
208296

209-
<!-- Profil de déploiement local, avec les fichiers de config, sans les fichiers sample et avec Oracle -->
297+
<!-- Profil de déploiement local, avec les fichiers de config, sans les fichiers sample et avec Oracle
210298
<profile>
211299
<id>local</id>
212300
<build>
@@ -228,9 +316,9 @@
228316
</resource>
229317
</resources>
230318
</build>
231-
</profile>
319+
</profile> -->
232320

233-
<!-- Profil de déploiement local, avec les fichiers de config, sans les fichiers sample -->
321+
<!-- Profil de déploiement local, avec les fichiers de config, sans les fichiers sample
234322
<profile>
235323
<id>saas</id>
236324
<build>
@@ -255,9 +343,9 @@
255343
</resource>
256344
</resources>
257345
</build>
258-
</profile>
346+
</profile> -->
259347

260-
<!-- Profil de déploiement UL, avec les fichiers de config, sans les fichiers sample et sans Oracle -->
348+
<!-- Profil de déploiement UL, avec les fichiers de config, sans les fichiers sample et sans Oracle
261349
<profile>
262350
<id>ul</id>
263351
<build>
@@ -268,7 +356,6 @@
268356
<executions>
269357
<execution>
270358
<id>copy-resources-img</id>
271-
<!-- here the phase you need -->
272359
<phase>process-resources</phase>
273360
<goals>
274361
<goal>copy-resources</goal>
@@ -286,7 +373,6 @@
286373
</execution>
287374
<execution>
288375
<id>copy-resources-ico</id>
289-
<!-- here the phase you need -->
290376
<phase>process-resources</phase>
291377
<goals>
292378
<goal>copy-resources</goal>
@@ -304,7 +390,6 @@
304390
</execution>
305391
<execution>
306392
<id>copy-resources-template</id>
307-
<!-- here the phase you need -->
308393
<phase>process-resources</phase>
309394
<goals>
310395
<goal>copy-resources</goal>
@@ -322,7 +407,6 @@
322407
</execution>
323408
<execution>
324409
<id>copy-resources-template-spec-dip</id>
325-
<!-- here the phase you need -->
326410
<phase>process-resources</phase>
327411
<goals>
328412
<goal>copy-resources</goal>
@@ -340,7 +424,6 @@
340424
</execution>
341425
<execution>
342426
<id>copy-resources-i18n</id>
343-
<!-- here the phase you need -->
344427
<phase>process-resources</phase>
345428
<goals>
346429
<goal>copy-resources</goal>
@@ -360,9 +443,9 @@
360443
</plugin>
361444
</plugins>
362445
</build>
363-
</profile>
446+
</profile> -->
364447

365-
<!-- Profil de déploiement UL Prod,configuration du fichier WS Apogée -->
448+
<!-- Profil de déploiement UL Prod,configuration du fichier WS Apogée
366449
<profile>
367450
<id>prod</id>
368451
<properties>
@@ -376,7 +459,6 @@
376459
<executions>
377460
<execution>
378461
<id>copy-resources-ws</id>
379-
<!-- here the phase you need -->
380462
<phase>process-resources</phase>
381463
<goals>
382464
<goal>copy-resources</goal>
@@ -396,9 +478,9 @@
396478
</plugin>
397479
</plugins>
398480
</build>
399-
</profile>
481+
</profile> -->
400482

401-
<!-- Profil de déploiement Orion, pour le logo -->
483+
<!-- Profil de déploiement Orion, pour le logo
402484
<profile>
403485
<id>orion</id>
404486
<build>
@@ -409,7 +491,6 @@
409491
<executions>
410492
<execution>
411493
<id>copy-resources-img</id>
412-
<!-- here the phase you need -->
413494
<phase>process-resources</phase>
414495
<goals>
415496
<goal>copy-resources</goal>
@@ -429,9 +510,9 @@
429510
</plugin>
430511
</plugins>
431512
</build>
432-
</profile>
513+
</profile> -->
433514

434-
<!-- Profil de déploiement UL Prod Orion,configuration du fichier WS Apogée -->
515+
<!-- Profil de déploiement UL Prod Orion,configuration du fichier WS Apogée
435516
<profile>
436517
<id>prod-orion</id>
437518
<properties>
@@ -445,7 +526,6 @@
445526
<executions>
446527
<execution>
447528
<id>copy-resources-ws</id>
448-
<!-- here the phase you need -->
449529
<phase>process-resources</phase>
450530
<goals>
451531
<goal>copy-resources</goal>
@@ -465,9 +545,9 @@
465545
</plugin>
466546
</plugins>
467547
</build>
468-
</profile>
548+
</profile> -->
469549

470-
<!-- Profil de déploiement Test (pour les WS) -->
550+
<!-- Profil de déploiement Test (pour les WS)
471551
<profile>
472552
<id>test-ws</id>
473553
<build>
@@ -478,7 +558,6 @@
478558
<executions>
479559
<execution>
480560
<id>copy-resources-test-ws</id>
481-
<!-- here the phase you need -->
482561
<phase>process-resources</phase>
483562
<goals>
484563
<goal>copy-resources</goal>
@@ -499,7 +578,7 @@
499578
</plugin>
500579
</plugins>
501580
</build>
502-
</profile>
581+
</profile> -->
503582

504583
<!-- Profile de license -->
505584
<profile>
@@ -782,7 +861,8 @@
782861
<version>${maven-war-plugin.version}</version>
783862
<configuration>
784863
<failOnMissingWebXml>false</failOnMissingWebXml>
785-
<warSourceExcludes>META-INF/context.xml,META-INF/maven/**,**/builddef.lst</warSourceExcludes>
864+
<warSourceExcludes>META-INF/context.xml,META-INF/maven/**</warSourceExcludes>
865+
<packagingExcludes>**/*.lst,**/*.scss</packagingExcludes>
786866
<archive>
787867
<addMavenDescriptor>false</addMavenDescriptor>
788868
<manifestEntries>
@@ -798,7 +878,16 @@
798878
<include>NOTICE</include>
799879
<include>LICENSE-VAADIN.txt</include>
800880
</includes>
881+
<!--<excludes>
882+
<exclude>WEB-INF/**/*.scss</exclude>
883+
</excludes>-->
801884
</resource>
885+
<!--<resource>
886+
<directory>WEB-INF/classes/</directory>
887+
<excludes>
888+
<exclude>WEB-INF/**/*.scss</exclude>
889+
</excludes>
890+
</resource>-->
802891
</webResources>
803892
</configuration>
804893
</plugin>

‎src/main/resources/assembly/distribution.xml

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,27 +31,30 @@
3131
<exclude>**/test/**</exclude>
3232
<exclude>**/assembly/**</exclude>
3333
<exclude>**/license/**</exclude>
34-
<exclude>**/ul/**</exclude>
3534
<exclude>**/VAADIN/gwt-unitCache/**</exclude>
3635
<exclude>**/.settings/**</exclude>
37-
<exclude>**/configUrlServicesPegase.properties</exclude>
38-
<exclude>**/configUrlServices.properties</exclude>
39-
<exclude>**/configUrlServices.ul.*.properties</exclude>
40-
<exclude>**/configUrlServicesPegase.properties</exclude>
41-
<exclude>**/messages.properties</exclude>
42-
<exclude>**/styles.scss</exclude>
43-
<exclude>**/favicon.ico</exclude>
44-
<exclude>**/logo.png</exclude>
45-
<exclude>**/dossier_export_template.docx</exclude>
46-
<exclude>**/dossier_export_template*_*.docx</exclude>
47-
<exclude>**/lettre_*_export_template.docx</exclude>
48-
<exclude>**/lettre_*_export_template*_*.docx</exclude>
4936
<exclude>**/context.xml</exclude>
5037
<exclude>**/META-INF/maven/**</exclude>
5138
<exclude>src/main/webapp/VAADIN/**</exclude>
5239
<exclude>.project</exclude>
5340
<exclude>.classpath</exclude>
5441
<exclude>.gitignore</exclude>
42+
<exclude>**/.externalToolBuilders/**</exclude>
43+
<exclude>**/.github/**</exclude>
44+
<exclude>.gitlab-ci.yml</exclude>
45+
<exclude>docker-run.bat</exclude>
46+
<exclude>image_ecandidat.bat</exclude>
47+
<!-- Ressources -->
48+
<exclude>**/configuration/siscol/configUrlServicesPegase.properties</exclude>
49+
<exclude>**/configuration/siscol/configUrlServices.properties</exclude>
50+
<exclude>**/configuration/i18n/messages.properties</exclude>
51+
<exclude>**/configuration/front/styles.scss</exclude>
52+
<exclude>**/configuration/front/favicon.ico</exclude>
53+
<exclude>**/configuration/front/logo.png</exclude>
54+
<exclude>**/configuration/template/dossier_export_template.docx</exclude>
55+
<exclude>**/configuration/template/dossier_export_template*_*.docx</exclude>
56+
<exclude>**/configuration/template/lettre_*_export_template.docx</exclude>
57+
<exclude>**/configuration/template/refus-specifique-diplome/lettre_*_export_template.docx</exclude>
5558
</excludes>
5659
</fileSet>
5760
</fileSets>

0 commit comments

Comments
 (0)