Skip to content

Commit f9f31b3

Browse files
sholtkampsholtkamp
committed
Update pom.xml
1 parent 4568709 commit f9f31b3

1 file changed

Lines changed: 113 additions & 63 deletions

File tree

‎pom.xml‎

Lines changed: 113 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (C) 2021 con terra GmbH (info@conterra.de)
4+
Copyright (C) 2023 con terra GmbH (info@conterra.de)
55
66
Licensed under the Apache License, Version 2.0 (the "License");
77
you may not use this file except in compliance with the License.
@@ -92,10 +92,6 @@
9292
<artifactId>ct-jsregistry-maven-plugin</artifactId>
9393
<version>${ct.jsregistry.version}</version>
9494
</plugin>
95-
<plugin>
96-
<artifactId>maven-deploy-plugin</artifactId>
97-
<version>2.8.2</version>
98-
</plugin>
9995
<plugin>
10096
<groupId>org.apache.maven.plugins</groupId>
10197
<artifactId>maven-resources-plugin</artifactId>
@@ -121,6 +117,8 @@
121117
<excludes>
122118
<exclude>apps/**</exclude>
123119
<exclude>**/tests/**</exclude>
120+
<exclude>**/sample_tests/**</exclude>
121+
<exclude>**/theme-common/**</exclude>
124122
</excludes>
125123
</configuration>
126124
</plugin>
@@ -151,6 +149,10 @@
151149
<artifactId>build-helper-maven-plugin</artifactId>
152150
<version>3.1.0</version>
153151
</plugin>
152+
<plugin>
153+
<artifactId>maven-release-plugin</artifactId>
154+
<version>2.5.3</version>
155+
</plugin>
154156
<plugin>
155157
<artifactId>maven-assembly-plugin</artifactId>
156158
<version>3.0.0</version>
@@ -160,6 +162,11 @@
160162
<artifactId>license-maven-plugin</artifactId>
161163
<version>2.11</version>
162164
</plugin>
165+
<plugin>
166+
<groupId>de.conterra.maven</groupId>
167+
<artifactId>setproperties-maven-plugin</artifactId>
168+
<version>1.0.2</version>
169+
</plugin>
163170
</plugins>
164171
</pluginManagement>
165172
<sourceDirectory>src/main/js</sourceDirectory>
@@ -197,9 +204,7 @@
197204
</execution>
198205
</executions>
199206
<configuration>
200-
<!-- add here properties which are used in plugin configuration resolution -->
201207
<properties>
202-
<!-- deployment of map.apps installation -->
203208
<mapapps.remote.base>.</mapapps.remote.base>
204209
</properties>
205210
</configuration>
@@ -236,8 +241,7 @@
236241
<artifactItems>
237242
<artifactItem>
238243
<groupId>de.conterra.mapapps</groupId>
239-
<artifactId>ct-mapapps-js-api</artifactId>
240-
<version>${mapapps.version}</version>
244+
<artifactId>ct-mapapps-js</artifactId>
241245
<classifier>src</classifier>
242246
<outputDirectory>${project.build.directory}/unpacked</outputDirectory>
243247
<includes>layout/theme-everlasting/**,layout/theme-common/**</includes>
@@ -303,6 +307,46 @@
303307
</execution>
304308
</executions>
305309
</plugin>
310+
<plugin>
311+
<groupId>com.mycila</groupId>
312+
<artifactId>license-maven-plugin</artifactId>
313+
<configuration>
314+
<header>${project.baseUri}apache2-license-header.txt</header>
315+
<properties>
316+
<owner>con terra GmbH</owner>
317+
<email>info@conterra.de</email>
318+
<project.inceptionYear>2023</project.inceptionYear>
319+
</properties>
320+
<includes>
321+
<include>src/main/js/**/*.js</include>
322+
<include>src/main/js/**/*.ts</include>
323+
<include>src/main/js/**/*.vue</include>
324+
<include>src/main/js/**/*.css</include>
325+
<include>src/test/**/*.js</include>
326+
<include>src/test/**/*.html</include>
327+
<include>src/test/**/*.css</include>
328+
<include>src/test/**/application.properties</include>
329+
<include>src/main/config/assembly.xml</include>
330+
<include>**/build.properties</include>
331+
<include>**/gulpfile.js</include>
332+
<include>**/pom.xml</include>
333+
</includes>
334+
<excludes>
335+
<exclude>src/main/js/**/*.min.js</exclude>
336+
</excludes>
337+
<mapping>
338+
<vue>XML_STYLE</vue>
339+
</mapping>
340+
</configuration>
341+
<executions>
342+
<execution>
343+
<goals>
344+
<goal>format</goal>
345+
</goals>
346+
<phase>process-sources</phase>
347+
</execution>
348+
</executions>
349+
</plugin>
306350
<plugin>
307351
<groupId>com.google.code.maven-replacer-plugin</groupId>
308352
<artifactId>replacer</artifactId>
@@ -341,6 +385,11 @@
341385
<goals>
342386
<goal>buildPacksProperties</goal>
343387
</goals>
388+
<configuration>
389+
<!-- don't list not shipped bundles in the
390+
META-INF\js-registry-packs.properties file -->
391+
<scanPackagesExcludes>apps/**,bundles/sample_tests</scanPackagesExcludes>
392+
</configuration>
344393
</execution>
345394
</executions>
346395
<configuration>
@@ -351,6 +400,12 @@
351400
<plugin>
352401
<groupId>de.conterra.mapapps</groupId>
353402
<artifactId>mapapps-maven-plugin</artifactId>
403+
<configuration>
404+
<!-- only build zip files -->
405+
<skipDeploy>true</skipDeploy>
406+
<sourceDirectory>${js.build.outputPath}/apps</sourceDirectory>
407+
<outputDirectory>${project.build.directory}</outputDirectory>
408+
</configuration>
354409
<executions>
355410
<execution>
356411
<!-- used to create .zip files containing the apps during the build -->
@@ -379,50 +434,6 @@
379434
</configuration>
380435
</execution>
381436
</executions>
382-
<configuration>
383-
<!-- only build zip files -->
384-
<skipDeploy>true</skipDeploy>
385-
<createApp>false</createApp>
386-
<sourceDirectory>${js.build.outputPath}/apps</sourceDirectory>
387-
<outputDirectory>${project.build.directory}</outputDirectory>
388-
</configuration>
389-
</plugin>
390-
<plugin>
391-
<groupId>com.mycila</groupId>
392-
<artifactId>license-maven-plugin</artifactId>
393-
<configuration>
394-
<header>${project.baseUri}apache2-license-header.txt</header>
395-
<properties>
396-
<owner>con terra GmbH</owner>
397-
<email>info@conterra.de</email>
398-
<project.inceptionYear>2021</project.inceptionYear>
399-
</properties>
400-
<includes>
401-
<include>src/main/js/**/*.js</include>
402-
<include>src/main/js/**/*.ts</include>
403-
<include>src/main/js/**/*.vue</include>
404-
<include>src/main/js/**/*.css</include>
405-
<include>src/test/**/*.js</include>
406-
<include>src/test/**/*.html</include>
407-
<include>src/test/**/*.css</include>
408-
<include>src/test/**/application.properties</include>
409-
<include>src/main/config/assembly.xml</include>
410-
<include>**/build.properties</include>
411-
<include>**/gulpfile.js</include>
412-
<include>**/pom.xml</include>
413-
</includes>
414-
<mapping>
415-
<vue>XML_STYLE</vue>
416-
</mapping>
417-
</configuration>
418-
<executions>
419-
<execution>
420-
<goals>
421-
<goal>format</goal>
422-
</goals>
423-
<phase>process-sources</phase>
424-
</execution>
425-
</executions>
426437
</plugin>
427438
<plugin>
428439
<artifactId>maven-assembly-plugin</artifactId>
@@ -443,6 +454,15 @@
443454
</execution>
444455
</executions>
445456
</plugin>
457+
<plugin>
458+
<artifactId>maven-release-plugin</artifactId>
459+
<configuration>
460+
<tagNameFormat>@{project.version}</tagNameFormat>
461+
<preparationGoals>clean</preparationGoals>
462+
<releaseProfiles>compress</releaseProfiles>
463+
<autoVersionSubmodules>true</autoVersionSubmodules>
464+
</configuration>
465+
</plugin>
446466
</plugins>
447467
</build>
448468
<scm>
@@ -464,11 +484,11 @@
464484
</distributionManagement>
465485
<properties>
466486
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
467-
<!-- dojo custom build parameters -->
468487
<root.build.outputPath>${project.build.directory}/webapp</root.build.outputPath>
469488
<js.build.outputPath>${root.build.outputPath}/js</js.build.outputPath>
470489

471490
<mapapps.version>4.17.0</mapapps.version>
491+
<vuetify.version>1.5.28</vuetify.version>
472492
<!-- JS lib versions -->
473493
<apprt.version>${mapapps.version}</apprt.version>
474494
<!-- java lib versions -->
@@ -478,10 +498,18 @@
478498
<!-- the default app, replaced in the *.html files to switch app names-->
479499
<default.app.name>manager</default.app.name>
480500

501+
<!-- don't do this in production configuration! This allows to go any http traffic over the
502+
/proxy endpoint -->
503+
<proxy.allowedServerUrls>
504+
*://*:*/**;
505+
</proxy.allowedServerUrls>
506+
<proxy.allowedSSLDNs>*</proxy.allowedSSLDNs>
507+
<proxy.use.rules></proxy.use.rules>
481508
<cors.request.trustedServers>$\{mapapps.remote.base\}</cors.request.trustedServers>
482509
<proxy.use.rules></proxy.use.rules>
483510
<mvn.cmd>mvn</mvn.cmd>
484511
<gulp.task></gulp.task>
512+
<gulp.node.env>development</gulp.node.env>
485513

486514
<mapapps.user>
487515
<!-- set correct username for map.apps remote installation-->
@@ -492,6 +520,7 @@
492520
<mapapps.token>
493521
<!-- set correct token for map.apps remote installation-->
494522
</mapapps.token>
523+
495524
<!-- set to false if map.apps is configured behind integrated windows authentication is
496525
required -->
497526
<mapapps.useChunkedRequestEncoding>true</mapapps.useChunkedRequestEncoding>
@@ -506,7 +535,7 @@
506535
<dependencies>
507536
<dependency>
508537
<groupId>de.conterra.mapapps</groupId>
509-
<artifactId>ct-mapapps-js-api</artifactId>
538+
<artifactId>ct-mapapps-js</artifactId>
510539
<scope>test</scope>
511540
</dependency>
512541
<dependency>
@@ -585,8 +614,8 @@
585614
<profile>
586615
<id>env-dev</id>
587616
<!-- This is the development profile, per default it points to a build.properties
588-
file in the user home, but this can be changed localy by specifiying the
589-
property local.configfile with its own string.
617+
file in the user home, but this can be changed localy by specifiying the
618+
property local.configfile with its own string.
590619
-->
591620
<activation>
592621
<property>
@@ -637,10 +666,33 @@
637666
<build>
638667
<plugins>
639668
<plugin>
640-
<artifactId>maven-deploy-plugin</artifactId>
641-
<configuration>
642-
<updateReleaseInfo>true</updateReleaseInfo>
643-
</configuration>
669+
<groupId>de.conterra.jsregistry</groupId>
670+
<artifactId>ct-jsregistry-maven-plugin</artifactId>
671+
<executions>
672+
<execution>
673+
<id>calculate js dependencies</id>
674+
<goals>
675+
<goal>calculateDependencies</goal>
676+
</goals>
677+
</execution>
678+
<!--
679+
680+
The optimizeJS goal is usually no longer required because compression is done via terser (see
681+
gulpfile.js 'compress' option).
682+
Uncomment this block only if you're still using `dojo/text!` in your source code.
683+
Reenabling the optimizeJS goal unfortunately removes all comments from your built JavaScript, which
684+
would incidentally also break source maps.
685+
686+
<execution>
687+
<id>optimize js</id>
688+
<goals>
689+
<goal>optimizeJS</goal>
690+
</goals>
691+
<configuration>
692+
<compress>false</compress>
693+
</configuration>
694+
</execution> -->
695+
</executions>
644696
</plugin>
645697
</plugins>
646698
</build>
@@ -655,8 +707,6 @@
655707
<configuration>
656708
<skipDeploy>${skip.apps.upload}</skipDeploy>
657709
<deployAsApp>true</deployAsApp>
658-
<appName>${project.artifactId}</appName>
659-
<appTitle>${project.artifactId}-${project.version}</appTitle>
660710
<appEditorState>PUBLISHED</appEditorState>
661711
<serverResourcesEndpoint>${mapapps.remote.base}/resources</serverResourcesEndpoint>
662712
<username>${mapapps.user}</username>

0 commit comments

Comments
 (0)