Skip to content

Commit d91c860

Browse files
author
Michel Bröker
committed
DN-34: Update to map.apps 4.18.1
1 parent b04874e commit d91c860

31 files changed

Lines changed: 100 additions & 56 deletions

‎gulpfile.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2024 con terra GmbH (info@conterra.de)
2+
* Copyright (C) 2023 con terra GmbH (info@conterra.de)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎package.json‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,16 @@
99
"watch-types": "tsc -w --noEmit"
1010
},
1111
"devDependencies": {
12-
"@conterra/ct-mapapps-typings": "~4.17.0",
12+
"@conterra/ct-mapapps-typings": "~4.18.1",
1313
"@conterra/mapapps-mocha-runner": "1.1.1",
14-
"@types/arcgis-js-api": "4.28.0",
14+
"@conterra/reactivity-core": "^0.4.0",
1515
"@types/chai": "4.3.10",
1616
"@types/license-checker": "^25.0.6",
1717
"@types/mocha": "10.0.4",
18+
"arcgis-js-api": "4.29.10",
1819
"chai": "4.3.10",
19-
"ct-mapapps-browser-sync": "0.0.35",
20-
"ct-mapapps-gulp-js": "0.10.2",
20+
"ct-mapapps-browser-sync": "0.0.39",
21+
"ct-mapapps-gulp-js": "0.10.3",
2122
"eslint-config-ct-prodeng": "1.4.0",
2223
"license-checker": "25.0.1",
2324
"mocha": "10.2.0",
@@ -28,7 +29,7 @@
2829
"stylelint-config-recommended-less": "2.0.0",
2930
"ts-node": "^10.9.1",
3031
"tsx": "^4.6.0",
31-
"typescript": "5.2.2",
32+
"typescript": "5.4.5",
3233
"vue": "2.7.15",
3334
"vue-template-compiler": "2.7.15"
3435
}

‎pom.xml‎

Lines changed: 65 additions & 6 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) 2024 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.
@@ -91,6 +91,10 @@
9191
<artifactId>ct-jsregistry-maven-plugin</artifactId>
9292
<version>${ct.jsregistry.version}</version>
9393
</plugin>
94+
<plugin>
95+
<artifactId>maven-deploy-plugin</artifactId>
96+
<version>2.8.2</version>
97+
</plugin>
9498
<plugin>
9599
<groupId>org.apache.maven.plugins</groupId>
96100
<artifactId>maven-resources-plugin</artifactId>
@@ -191,6 +195,29 @@
191195
</testResource>
192196
</testResources>
193197
<plugins>
198+
<plugin>
199+
<groupId>org.apache.maven.plugins</groupId>
200+
<artifactId>maven-enforcer-plugin</artifactId>
201+
<version>3.4.1</version>
202+
<executions>
203+
<execution>
204+
<id>enforce-versions</id>
205+
<goals>
206+
<goal>enforce</goal>
207+
</goals>
208+
<configuration>
209+
<rules>
210+
<requireMavenVersion>
211+
<version>[3.8.0,)</version>
212+
</requireMavenVersion>
213+
<requireJavaVersion>
214+
<version>[17,)</version>
215+
</requireJavaVersion>
216+
</rules>
217+
</configuration>
218+
</execution>
219+
</executions>
220+
</plugin>
194221
<plugin>
195222
<groupId>de.conterra.maven</groupId>
196223
<artifactId>setproperties-maven-plugin</artifactId>
@@ -314,7 +341,7 @@
314341
<properties>
315342
<owner>con terra GmbH</owner>
316343
<email>info@conterra.de</email>
317-
<project.inceptionYear>2024</project.inceptionYear>
344+
<project.inceptionYear>2023</project.inceptionYear>
318345
</properties>
319346
<includes>
320347
<include>src/main/js/**/*.js</include>
@@ -402,6 +429,7 @@
402429
<configuration>
403430
<!-- only build zip files -->
404431
<skipDeploy>true</skipDeploy>
432+
<createApp>false</createApp>
405433
<sourceDirectory>${js.build.outputPath}/apps</sourceDirectory>
406434
<outputDirectory>${project.build.directory}</outputDirectory>
407435
</configuration>
@@ -413,6 +441,24 @@
413441
<goal>deployApps</goal>
414442
</goals>
415443
</execution>
444+
<execution>
445+
<id>build-app-template</id>
446+
<phase>prepare-package</phase>
447+
<goals>
448+
<goal>deployAppTemplate</goal>
449+
</goals>
450+
<configuration>
451+
<templateFile>${project.build.directory}/${project.artifactId}-sample-app.zip</templateFile>
452+
<templateResources>
453+
<templateResource>
454+
<directory>${js.build.outputPath}/apps/sample</directory>
455+
<includes>
456+
<include>**/*</include>
457+
</includes>
458+
</templateResource>
459+
</templateResources>
460+
</configuration>
461+
</execution>
416462
</executions>
417463
</plugin>
418464
<plugin>
@@ -466,12 +512,12 @@
466512
<root.build.outputPath>${project.build.directory}/webapp</root.build.outputPath>
467513
<js.build.outputPath>${root.build.outputPath}/js</js.build.outputPath>
468514

469-
<mapapps.version>4.17.0</mapapps.version>
470-
<vuetify.version>1.5.28</vuetify.version>
515+
<mapapps.version>4.18.1</mapapps.version>
516+
<vuetify.version>1.5.30</vuetify.version>
471517
<!-- JS lib versions -->
472518
<apprt.version>${mapapps.version}</apprt.version>
473519
<!-- java lib versions -->
474-
<ct.jsregistry.version>2.0.1</ct.jsregistry.version>
520+
<ct.jsregistry.version>2.1.1</ct.jsregistry.version>
475521
<ct.jsrt-test.version>2.0.2</ct.jsrt-test.version>
476522

477523
<!-- the default app, replaced in the *.html files to switch app names-->
@@ -501,7 +547,7 @@
501547
required -->
502548
<mapapps.useChunkedRequestEncoding>true</mapapps.useChunkedRequestEncoding>
503549
<!-- enable this if "upload" profile should only deploy bundles -->
504-
<skip.apps.upload>true</skip.apps.upload>
550+
<skip.apps.upload>false</skip.apps.upload>
505551
<!-- enable this if "upload" profile should pre-optimize apps -->
506552
<triggerPreOptimization>false</triggerPreOptimization>
507553
</properties>
@@ -549,6 +595,11 @@
549595
<artifactId>apprt-polyfill</artifactId>
550596
<scope>test</scope>
551597
</dependency>
598+
<dependency>
599+
<groupId>de.conterra.js</groupId>
600+
<artifactId>reactivity</artifactId>
601+
<scope>test</scope>
602+
</dependency>
552603
</dependencies>
553604
</profile>
554605
<profile>
@@ -641,6 +692,12 @@
641692
</properties>
642693
<build>
643694
<plugins>
695+
<plugin>
696+
<artifactId>maven-deploy-plugin</artifactId>
697+
<configuration>
698+
<updateReleaseInfo>true</updateReleaseInfo>
699+
</configuration>
700+
</plugin>
644701
<plugin>
645702
<groupId>de.conterra.jsregistry</groupId>
646703
<artifactId>ct-jsregistry-maven-plugin</artifactId>
@@ -683,6 +740,8 @@
683740
<configuration>
684741
<skipDeploy>${skip.apps.upload}</skipDeploy>
685742
<deployAsApp>true</deployAsApp>
743+
<appName>${project.artifactId}</appName>
744+
<appTitle>${project.artifactId}-${project.version}</appTitle>
686745
<appEditorState>PUBLISHED</appEditorState>
687746
<serverResourcesEndpoint>${mapapps.remote.base}/resources</serverResourcesEndpoint>
688747
<username>${mapapps.user}</username>

‎src/main/config/assembly.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
22
3-
Copyright (C) 2024 con terra GmbH (info@conterra.de)
3+
Copyright (C) 2023 con terra GmbH (info@conterra.de)
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

‎src/main/js/apps/sample/app.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (C) 2024 con terra GmbH (info@conterra.de)
2+
* Copyright (C) 2023 con terra GmbH (info@conterra.de)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/js/apps/sample/app.js‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎src/main/js/apps/sample/nls/bundle.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2024 con terra GmbH (info@conterra.de)
2+
* Copyright (C) 2023 con terra GmbH (info@conterra.de)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/js/apps/sample/nls/de/bundle.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2024 con terra GmbH (info@conterra.de)
2+
* Copyright (C) 2023 con terra GmbH (info@conterra.de)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎src/main/js/bundles/dn_charting-c3/index.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/main/js/bundles/dn_charting-c3/styles/c3.min.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (C) 2024 con terra GmbH (info@conterra.de)
2+
* Copyright (C) 2023 con terra GmbH (info@conterra.de)
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)