Skip to content

Commit e63c849

Browse files
suneet-guptasuneet-gupta
authored
Merge pull request #655 from Alfresco/fix/MNT_23888_reserved_keywords
[MNT-23888] Changes done for handling reserved words while compressing the Javascript files.
2 parents 20d4486 + 013fed7 commit e63c849

File tree

3 files changed

+84
-43
lines changed
  • archetypes
    • alfresco-allinone-archetype/src/main/resources/archetype-resources
    • alfresco-platform-jar-archetype/src/main/resources/archetype-resources
    • alfresco-share-jar-archetype/src/main/resources/archetype-resources

3 files changed

+84
-43
lines changed

‎archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml

+28-14
Original file line numberDiff line numberDiff line change
@@ -287,51 +287,65 @@
287287
</executions>
288288
</plugin>
289289

290-
<!-- Compress JavaScript files and store as *-min.js -->
290+
<!-- Compress JavaScript files and store as *.min.js -->
291291
<plugin>
292-
<groupId>net.alchim31.maven</groupId>
293-
<artifactId>yuicompressor-maven-plugin</artifactId>
294-
<version>1.5.1</version>
292+
<groupId>com.github.blutorange</groupId>
293+
<artifactId>closure-compiler-maven-plugin</artifactId>
294+
<version>2.28.0</version>
295295
<executions>
296296
<!-- Compress the JS files under the assembly folder -->
297297
<execution>
298298
<id>compress-assembly</id>
299+
<phase>generate-resources</phase>
299300
<goals>
300-
<goal>compress</goal>
301+
<goal>minify</goal>
301302
</goals>
302303
<configuration>
303-
<sourceDirectory>${project.basedir}/src/main/assembly/web</sourceDirectory>
304-
<outputDirectory>${project.basedir}/src/main/assembly/web</outputDirectory>
304+
<baseSourceDir>${project.basedir}/src/main/assembly</baseSourceDir>
305+
<baseTargetDir>${project.basedir}/src/main/assembly</baseTargetDir>
306+
<sourceDir>web</sourceDir>
307+
<targetDir>web</targetDir>
308+
<skipMerge>true</skipMerge>
309+
<includes>
310+
<include>**/*.js</include>
311+
</includes>
305312
<excludes>
306313
<exclude>**/webscripts/**</exclude>
307314
<exclude>**/site-webscripts/**</exclude>
308315
<exclude>**/META-INF/**</exclude>
309316
<exclude>**/*.lib.js</exclude>
310317
<exclude>**/*.css</exclude>
311-
<exclude>**/*-min.js</exclude>
312-
<exclude>**/*-min.css</exclude>
318+
<exclude>**/*.min.js</exclude>
319+
<exclude>**/*.min.css</exclude>
313320
</excludes>
314321
<force>true</force>
315-
<jswarn>false</jswarn>
316322
</configuration>
317323
</execution>
318324
<!-- Compress the JS files under the resources folder -->
319325
<execution>
320326
<id>compress-resources</id>
327+
<phase>generate-resources</phase>
321328
<goals>
322-
<goal>compress</goal>
329+
<goal>minify</goal>
323330
</goals>
324331
<configuration>
332+
<baseSourceDir>${project.basedir}/src/main</baseSourceDir>
333+
<baseTargetDir>${project.basedir}/src/main</baseTargetDir>
334+
<sourceDir>resources</sourceDir>
335+
<targetDir>resources</targetDir>
336+
<skipMerge>true</skipMerge>
337+
<includes>
338+
<include>**/*.js</include>
339+
</includes>
325340
<excludes>
326341
<exclude>**/webscripts/**</exclude>
327342
<exclude>**/site-webscripts/**</exclude>
328343
<exclude>**/*.lib.js</exclude>
329344
<exclude>**/*.css</exclude>
330-
<exclude>**/*-min.js</exclude>
331-
<exclude>**/*-min.css</exclude>
345+
<exclude>**/*.min.js</exclude>
346+
<exclude>**/*.min.css</exclude>
332347
</excludes>
333348
<force>true</force>
334-
<jswarn>false</jswarn>
335349
</configuration>
336350
</execution>
337351
</executions>

‎archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/pom.xml

+28-15
Original file line numberDiff line numberDiff line change
@@ -355,56 +355,69 @@
355355
</dependencies>
356356
</plugin>
357357

358-
<!-- Compress JavaScript files and store as *-min.js -->
358+
<!-- Compress JavaScript files and store as *.min.js -->
359359
<plugin>
360-
<groupId>net.alchim31.maven</groupId>
361-
<artifactId>yuicompressor-maven-plugin</artifactId>
362-
<version>1.5.1</version>
360+
<groupId>com.github.blutorange</groupId>
361+
<artifactId>closure-compiler-maven-plugin</artifactId>
362+
<version>2.28.0</version>
363363
<executions>
364364
<!-- Compress the JS files under the assembly folder -->
365365
<execution>
366366
<id>compress-assembly</id>
367+
<phase>generate-resources</phase>
367368
<goals>
368-
<goal>compress</goal>
369+
<goal>minify</goal>
369370
</goals>
370371
<configuration>
371-
<sourceDirectory>${project.basedir}/src/main/assembly/web</sourceDirectory>
372-
<outputDirectory>${project.basedir}/src/main/assembly/web</outputDirectory>
372+
<baseSourceDir>${project.basedir}/src/main/assembly</baseSourceDir>
373+
<baseTargetDir>${project.basedir}/src/main/assembly</baseTargetDir>
374+
<sourceDir>web</sourceDir>
375+
<targetDir>web</targetDir>
376+
<skipMerge>true</skipMerge>
377+
<includes>
378+
<include>**/*.js</include>
379+
</includes>
373380
<excludes>
374381
<exclude>**/webscripts/**</exclude>
375382
<exclude>**/site-webscripts/**</exclude>
376383
<exclude>**/META-INF/**</exclude>
377384
<exclude>**/*.lib.js</exclude>
378385
<exclude>**/*.css</exclude>
379-
<exclude>**/*-min.js</exclude>
380-
<exclude>**/*-min.css</exclude>
386+
<exclude>**/*.min.js</exclude>
387+
<exclude>**/*.min.css</exclude>
381388
</excludes>
382389
<force>true</force>
383-
<jswarn>false</jswarn>
384390
</configuration>
385391
</execution>
386392
<!-- Compress the JS files under the resources folder -->
387393
<execution>
388394
<id>compress-resources</id>
395+
<phase>generate-resources</phase>
389396
<goals>
390-
<goal>compress</goal>
397+
<goal>minify</goal>
391398
</goals>
392399
<configuration>
400+
<baseSourceDir>${project.basedir}/src/main</baseSourceDir>
401+
<baseTargetDir>${project.basedir}/src/main</baseTargetDir>
402+
<sourceDir>resources</sourceDir>
403+
<targetDir>resources</targetDir>
404+
<skipMerge>true</skipMerge>
405+
<includes>
406+
<include>**/*.js</include>
407+
</includes>
393408
<excludes>
394409
<exclude>**/webscripts/**</exclude>
395410
<exclude>**/site-webscripts/**</exclude>
396411
<exclude>**/*.lib.js</exclude>
397412
<exclude>**/*.css</exclude>
398-
<exclude>**/*-min.js</exclude>
399-
<exclude>**/*-min.css</exclude>
413+
<exclude>**/*.min.js</exclude>
414+
<exclude>**/*.min.css</exclude>
400415
</excludes>
401416
<force>true</force>
402-
<jswarn>false</jswarn>
403417
</configuration>
404418
</execution>
405419
</executions>
406420
</plugin>
407-
408421
<!-- Hot reloading with JRebel -->
409422
<plugin>
410423
<groupId>org.zeroturnaround</groupId>

‎archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/pom.xml

+28-14
Original file line numberDiff line numberDiff line change
@@ -221,51 +221,65 @@
221221
</executions>
222222
</plugin>
223223

224-
<!-- Compress JavaScript files and store as *-min.js -->
224+
<!-- Compress JavaScript files and store as *.min.js -->
225225
<plugin>
226-
<groupId>net.alchim31.maven</groupId>
227-
<artifactId>yuicompressor-maven-plugin</artifactId>
228-
<version>1.5.1</version>
226+
<groupId>com.github.blutorange</groupId>
227+
<artifactId>closure-compiler-maven-plugin</artifactId>
228+
<version>2.28.0</version>
229229
<executions>
230230
<!-- Compress the JS files under the assembly folder -->
231231
<execution>
232232
<id>compress-assembly</id>
233+
<phase>generate-resources</phase>
233234
<goals>
234-
<goal>compress</goal>
235+
<goal>minify</goal>
235236
</goals>
236237
<configuration>
237-
<sourceDirectory>${project.basedir}/src/main/assembly/web</sourceDirectory>
238-
<outputDirectory>${project.basedir}/src/main/assembly/web</outputDirectory>
238+
<baseSourceDir>${project.basedir}/src/main/assembly</baseSourceDir>
239+
<baseTargetDir>${project.basedir}/src/main/assembly</baseTargetDir>
240+
<sourceDir>web</sourceDir>
241+
<targetDir>web</targetDir>
242+
<skipMerge>true</skipMerge>
243+
<includes>
244+
<include>**/*.js</include>
245+
</includes>
239246
<excludes>
240247
<exclude>**/webscripts/**</exclude>
241248
<exclude>**/site-webscripts/**</exclude>
242249
<exclude>**/META-INF/**</exclude>
243250
<exclude>**/*.lib.js</exclude>
244251
<exclude>**/*.css</exclude>
245-
<exclude>**/*-min.js</exclude>
246-
<exclude>**/*-min.css</exclude>
252+
<exclude>**/*.min.js</exclude>
253+
<exclude>**/*.min.css</exclude>
247254
</excludes>
248255
<force>true</force>
249-
<jswarn>false</jswarn>
250256
</configuration>
251257
</execution>
252258
<!-- Compress the JS files under the resources folder -->
253259
<execution>
254260
<id>compress-resources</id>
261+
<phase>generate-resources</phase>
255262
<goals>
256-
<goal>compress</goal>
263+
<goal>minify</goal>
257264
</goals>
258265
<configuration>
266+
<baseSourceDir>${project.basedir}/src/main</baseSourceDir>
267+
<baseTargetDir>${project.basedir}/src/main</baseTargetDir>
268+
<sourceDir>resources</sourceDir>
269+
<targetDir>resources</targetDir>
270+
<skipMerge>true</skipMerge>
271+
<includes>
272+
<include>**/*.js</include>
273+
</includes>
259274
<excludes>
260275
<exclude>**/webscripts/**</exclude>
261276
<exclude>**/site-webscripts/**</exclude>
262277
<exclude>**/*.lib.js</exclude>
263278
<exclude>**/*.css</exclude>
264-
<exclude>**/*-min.js</exclude>
265-
<exclude>**/*-min.css</exclude>
279+
<exclude>**/*.min.js</exclude>
280+
<exclude>**/*.min.css</exclude>
266281
</excludes>
267282
<force>true</force>
268-
<jswarn>false</jswarn>
269283
</configuration>
270284
</execution>
271285
</executions>

0 commit comments

Comments
 (0)