Skip to content

Commit ab7caba

Browse files
sholtkampsholtkamp
authored
Merge pull request #14 from conterra/dev_4.18.3
Update project to map.apps version 4.18.3
2 parents e694a0e + 5d7c06c commit ab7caba

11 files changed

Lines changed: 105 additions & 211 deletions

File tree

‎.prettierrc‎

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

‎.vscode/extensions.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"recommendations": [
3+
"dbaeumer.vscode-eslint",
4+
"vue.volar",
5+
"Esri.arcgis-jsapi-snippets",
6+
"ctjdr.vscode-apprt-bundles"
7+
]
8+
}

‎.vscode/launch.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
// Use IntelliSense to learn about possible attributes.
3+
// Hover to view descriptions of existing attributes.
4+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5+
"version": "0.2.0",
6+
"configurations": [
7+
{
8+
"type": "chrome",
9+
"request": "launch",
10+
"name": "Launch Chrome against localhost",
11+
"url": "http://localhost:9090",
12+
"webRoot": "${workspaceFolder}/src/main"
13+
}
14+
]
15+
}

‎.vscode/tasks.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"detail": "Run mapapps-github-manager development server",
1414
"type": "shell",
1515
"command": "mvn",
16-
"args": ["compile", "-Denv=dev", "'-Dlocal.configfile=./build.properties'", "-Pinclude-mapapps-deps"],
16+
"args": ["clean", "compile", "-Denv=dev", "'-Dlocal.configfile=./build.properties'", "-Pinclude-mapapps-deps"],
1717
"group": "build",
1818
"isBackground": true
1919
},
@@ -22,7 +22,7 @@
2222
"detail": "Run mapapps-github-manager development server in 'remote project' mode",
2323
"type": "shell",
2424
"command": "mvn",
25-
"args": ["compile", "-Denv=dev", "'-Dlocal.configfile=./build.properties'"],
25+
"args": ["clean", "compile", "-Denv=dev", "'-Dlocal.configfile=./build.properties'"],
2626
"group": "build",
2727
"isBackground": true
2828
},
@@ -31,7 +31,7 @@
3131
"detail": "Prepare bundles and apps for deployment on a map.apps instance",
3232
"type": "shell",
3333
"command": "mvn",
34-
"args": ["install", "-Pcompress"],
34+
"args": ["clean", "install", "-Pcompress"],
3535
"group": "build",
3636
"presentation": {
3737
"reveal": "always",

‎Jenkinsfile‎

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

‎RELEASE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
✅ Tested for map.apps 4.18.1 / Linie 4
1+
✅ Tested for map.apps 4.18.3 / Linie 4
22

33
#### Release Notes
44
- autogenerated SNAPSHOT-Release

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
"watch-types": "tsc -w --noEmit"
1010
},
1111
"devDependencies": {
12-
"@conterra/ct-mapapps-typings": "~4.18.1",
12+
"@conterra/ct-mapapps-typings": "~4.18.3",
1313
"@conterra/mapapps-mocha-runner": "1.1.1",
1414
"@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",
1818
"arcgis-js-api": "4.29.10",
1919
"chai": "4.3.10",
20-
"ct-mapapps-browser-sync": "0.0.39",
20+
"ct-mapapps-browser-sync": "0.0.41",
2121
"ct-mapapps-gulp-js": "0.10.3",
2222
"eslint-config-ct-prodeng": "1.4.0",
2323
"license-checker": "25.0.1",

‎pom.xml‎

Lines changed: 16 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -40,41 +40,23 @@
4040
</pluginRepositories>
4141
<dependencyManagement>
4242
<dependencies>
43+
<!-- dependency versions available -->
4344
<dependency>
4445
<groupId>de.conterra.mapapps</groupId>
45-
<artifactId>ct-mapapps</artifactId>
46+
<artifactId>ct-mapapps-js-bom</artifactId>
4647
<version>${mapapps.version}</version>
4748
<type>pom</type>
4849
<scope>import</scope>
4950
</dependency>
5051
</dependencies>
5152
</dependencyManagement>
5253
<dependencies>
53-
<!-- include for vue-devtools support -->
54+
<!-- include only if old intern test libs are required -->
5455
<dependency>
55-
<groupId>org.vuejs</groupId>
56-
<artifactId>vue</artifactId>
57-
<classifier>dev</classifier>
58-
<scope>test</scope>
59-
</dependency>
60-
<dependency>
61-
<groupId>org.vuetifyjs</groupId>
62-
<artifactId>vuetify</artifactId>
63-
<classifier>dev</classifier>
64-
<scope>test</scope>
65-
</dependency>
66-
67-
<!-- test support libs -->
68-
<dependency>
69-
<groupId>de.conterra.jsrt</groupId>
70-
<artifactId>ct-jsrt-test-intern</artifactId>
71-
<version>${ct.jsrt-test.version}</version>
72-
<scope>test</scope>
73-
</dependency>
74-
<dependency>
75-
<groupId>de.conterra.jsrt</groupId>
76-
<artifactId>ct-jsrt-test-uitest</artifactId>
77-
<version>${ct.jsrt-test.version}</version>
56+
<groupId>de.conterra.mapapps</groupId>
57+
<artifactId>ct-mapapps-js-bom-dev-test</artifactId>
58+
<version>${mapapps.version}</version>
59+
<type>pom</type>
7860
<scope>test</scope>
7961
</dependency>
8062
</dependencies>
@@ -277,7 +259,6 @@
277259
<!-- unpack stylus files provided by beautify to map.apps themes -->
278260
<groupId>org.vuetifyjs</groupId>
279261
<artifactId>vuetify</artifactId>
280-
<version>${vuetify.version}</version>
281262
<classifier>dev</classifier>
282263
<outputDirectory>${project.build.directory}/unpacked/layout</outputDirectory>
283264
<includes>vuetify/stylus/**</includes>
@@ -293,6 +274,8 @@
293274
</goals>
294275
<configuration>
295276
<outputDirectory>${project.build.directory}/bundle-imports</outputDirectory>
277+
<includeTypes>jar</includeTypes>
278+
<stripVersion>true</stripVersion>
296279
</configuration>
297280
</execution>
298281
</executions>
@@ -448,8 +431,7 @@
448431
<goal>deployAppTemplate</goal>
449432
</goals>
450433
<configuration>
451-
<templateFile>
452-
${project.build.directory}/${project.artifactId}-sample-app.zip</templateFile>
434+
<templateFile>${project.build.directory}/${project.artifactId}-sample-app.zip</templateFile>
453435
<templateResources>
454436
<templateResource>
455437
<directory>${js.build.outputPath}/apps/manager</directory>
@@ -514,13 +496,12 @@
514496
<root.build.outputPath>${project.build.directory}/webapp</root.build.outputPath>
515497
<js.build.outputPath>${root.build.outputPath}/js</js.build.outputPath>
516498

517-
<mapapps.version>4.18.1</mapapps.version>
518-
<vuetify.version>1.5.30</vuetify.version>
499+
<mapapps.version>4.18.3</mapapps.version>
519500
<!-- JS lib versions -->
520501
<apprt.version>${mapapps.version}</apprt.version>
502+
521503
<!-- java lib versions -->
522-
<ct.jsregistry.version>2.1.1</ct.jsregistry.version>
523-
<ct.jsrt-test.version>2.0.2</ct.jsrt-test.version>
504+
<ct.jsregistry.version>2.1.3</ct.jsregistry.version>
524505

525506
<!-- the default app, replaced in the *.html files to switch app names-->
526507
<default.app.name>manager</default.app.name>
@@ -559,47 +540,9 @@
559540
<dependencies>
560541
<dependency>
561542
<groupId>de.conterra.mapapps</groupId>
562-
<artifactId>ct-mapapps-js</artifactId>
563-
<scope>test</scope>
564-
</dependency>
565-
<dependency>
566-
<groupId>org.dojotoolkit</groupId>
567-
<artifactId>dojo-release</artifactId>
568-
<scope>test</scope>
569-
</dependency>
570-
<dependency>
571-
<groupId>org.dojotoolkit</groupId>
572-
<artifactId>dgrid</artifactId>
573-
<scope>test</scope>
574-
</dependency>
575-
<dependency>
576-
<groupId>org.dojotoolkit</groupId>
577-
<artifactId>dstore</artifactId>
578-
<scope>test</scope>
579-
</dependency>
580-
<dependency>
581-
<groupId>com.esri.js</groupId>
582-
<artifactId>ags-js-api4</artifactId>
583-
<scope>test</scope>
584-
</dependency>
585-
<dependency>
586-
<groupId>com.esri</groupId>
587-
<artifactId>terraformer-js</artifactId>
588-
<scope>test</scope>
589-
</dependency>
590-
<dependency>
591-
<groupId>moment-js</groupId>
592-
<artifactId>moment-js</artifactId>
593-
<scope>test</scope>
594-
</dependency>
595-
<dependency>
596-
<groupId>de.conterra.js</groupId>
597-
<artifactId>apprt-polyfill</artifactId>
598-
<scope>test</scope>
599-
</dependency>
600-
<dependency>
601-
<groupId>de.conterra.js</groupId>
602-
<artifactId>reactivity</artifactId>
543+
<artifactId>ct-mapapps-js-bom-dev</artifactId>
544+
<version>${mapapps.version}</version>
545+
<type>pom</type>
603546
<scope>test</scope>
604547
</dependency>
605548
</dependencies>

0 commit comments

Comments
 (0)