Merge branch 'dev'

conterra · Jul 24, 2024 · 28a0225 · 28a0225
2 parents e88479a + 83b9748
commit 28a0225
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 77 deletions.
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -1,7 +1,6 @@
 {
     "recommendations": [
         "dbaeumer.vscode-eslint",
-        "vue.volar",
-        "vue.vscode-typescript-vue-plugin"
+        "vue.volar"
     ]
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,57 @@
 
 All notable changes to this project will be documented in this file.
 
+## [4.18.2] - 24.07.2024
+
+- Support for map.apps 4.18.2
+
+### Changes in pom.xml
+
+Introduce use of ct-mapapps-js-bom-* dependencies to reduce the list of manual maintained sub dependencies.
+
+- Update `mapapps.version` property to `4.18.2`
+- Remove all occurrences of `vuetify.version`
+- Remove all occurrences of `ct.jsrt-test.version`
+- Replace `<artifactId>ct-mapapps</artifactId>` in `<dependencyManagement>` by `<artifactId>ct-mapapps-js-bom</artifactId>`
+- Replace all `<dependencies>` by following snippet
+
+  ```xml
+   <dependencies>
+        <!-- include only if old intern test libs are required -->
+        <dependency>
+            <groupId>de.conterra.mapapps</groupId>
+            <artifactId>ct-mapapps-js-bom-dev-test</artifactId>
+            <type>pom</type>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+  ```
+
+  - Replace profile `include-mapapps-deps` by
+
+  ```xml
+    <profile>
+        <id>include-mapapps-deps</id>
+        <dependencies>
+            <dependency>
+                <groupId>de.conterra.mapapps</groupId>
+                <artifactId>ct-mapapps-js-bom-dev</artifactId>
+                <type>pom</type>
+                <scope>test</scope>
+            </dependency>
+        </dependencies>
+    </profile>
+  ```
+
+  - add `<stripVersion>true</stripVersion>` to `<configuration>` of `<goal>copy-dependencies</goal>`
+
+### Changes in package.json
+- Update `@conterra/ct-mapapps-typings` to `4.18.2`
+- Update `ct-mapapps-browser-sync` to `0.0.41`
+
+### Changes in tsconfig.json
+- add ArcGIS typings:     `"include": ["src", "node_modules/arcgis-js-api/index.d.ts"]`
+
 ## [4.18.1] - 23.05.2024
 
 - Support for map.apps 4.18.1

diff --git a/README.md b/README.md
@@ -34,13 +34,18 @@ For more details refer to the [Developer's Guide](https://docs.conterra.de/en/ma
 
 ## Updating from older versions
 
+### from 4.18.1 to 4.18.2
+
+See [Changelog](./CHANGELOG.md#4182---19072024)
+
+
 ### from 4.18.0 to 4.18.1
 
-See [Changelog](./CHANGELOG.md#4118---23052024)
+See [Changelog](./CHANGELOG.md#4181---23052024)
 
 ### from 4.17.0 to 4.18.0
 
-See [Changelog](./CHANGELOG.md#4118---17052024)
+See [Changelog](./CHANGELOG.md#4180---17052024)
 
 ### from 4.16.0 to 4.17.0
 

diff --git a/package.json b/package.json
@@ -17,7 +17,7 @@
         "@types/mocha": "10.0.4",
         "arcgis-js-api": "4.29.10",
         "chai": "4.3.10",
-        "ct-mapapps-browser-sync": "0.0.39",
+        "ct-mapapps-browser-sync": "0.0.41",
         "ct-mapapps-gulp-js": "0.10.3",
         "eslint-config-ct-prodeng": "1.4.0",
         "license-checker": "25.0.1",

diff --git a/pom.xml b/pom.xml
@@ -23,41 +23,23 @@
     </pluginRepositories>
     <dependencyManagement>
         <dependencies>
+            <!-- dependency versions available -->
             <dependency>
                 <groupId>de.conterra.mapapps</groupId>
-                <artifactId>ct-mapapps</artifactId>
+                <artifactId>ct-mapapps-js-bom</artifactId>
                 <version>${mapapps.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
         </dependencies>
     </dependencyManagement>
     <dependencies>
-        <!-- include for vue-devtools support -->
+        <!-- include only if old intern test libs are required -->
         <dependency>
-            <groupId>org.vuejs</groupId>
-            <artifactId>vue</artifactId>
-            <classifier>dev</classifier>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.vuetifyjs</groupId>
-            <artifactId>vuetify</artifactId>
-            <classifier>dev</classifier>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- test support libs -->
-        <dependency>
-            <groupId>de.conterra.jsrt</groupId>
-            <artifactId>ct-jsrt-test-intern</artifactId>
-            <version>${ct.jsrt-test.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>de.conterra.jsrt</groupId>
-            <artifactId>ct-jsrt-test-uitest</artifactId>
-            <version>${ct.jsrt-test.version}</version>
+            <groupId>de.conterra.mapapps</groupId>
+            <artifactId>ct-mapapps-js-bom-dev-test</artifactId>
+            <version>${mapapps.version}</version>
+            <type>pom</type>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -238,7 +220,6 @@
                                     <!-- unpack stylus files provided by beautify to map.apps themes -->
                                     <groupId>org.vuetifyjs</groupId>
                                     <artifactId>vuetify</artifactId>
-                                    <version>${vuetify.version}</version>
                                     <classifier>dev</classifier>
                                     <outputDirectory>${project.build.directory}/unpacked/layout</outputDirectory>
                                     <includes>vuetify/stylus/**</includes>
@@ -254,6 +235,8 @@
                         </goals>
                         <configuration>
                             <outputDirectory>${project.build.directory}/bundle-imports</outputDirectory>
+                            <includeTypes>jar</includeTypes>
+                            <stripVersion>true</stripVersion>
                         </configuration>
                     </execution>
                 </executions>
@@ -313,8 +296,7 @@
                             <replacements>
                                 <replacement>
                                     <!-- remove bundleLocations from app.json -->
-                                    <token>
-                                        \s*"bundleLocations"\s*:\s*\[\s*"localbundles"\s*,\s*"bundles"\s*\]\s*,\s*</token>
+                                    <token>\s*"bundleLocations"\s*:\s*\[\s*"localbundles"\s*,\s*"bundles"\s*\]\s*,\s*</token>
                                     <value></value>
                                 </replacement>
                             </replacements>
@@ -370,13 +352,12 @@
         <root.build.outputPath>${project.build.directory}/webapp</root.build.outputPath>
         <js.build.outputPath>${root.build.outputPath}/js</js.build.outputPath>
 
-        <mapapps.version>4.18.1</mapapps.version>
-        <vuetify.version>1.5.30</vuetify.version>
+        <mapapps.version>4.18.2</mapapps.version>
         <!-- JS lib versions -->
         <apprt.version>${mapapps.version}</apprt.version>
+
         <!-- java lib versions -->
         <ct.jsregistry.version>2.1.1</ct.jsregistry.version>
-        <ct.jsrt-test.version>2.0.2</ct.jsrt-test.version>
 
         <!-- the default app, replaced in the *.html files to switch app names-->
         <default.app.name>Demo</default.app.name>
@@ -415,47 +396,9 @@
             <dependencies>
                 <dependency>
                     <groupId>de.conterra.mapapps</groupId>
-                    <artifactId>ct-mapapps-js</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.dojotoolkit</groupId>
-                    <artifactId>dojo-release</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.dojotoolkit</groupId>
-                    <artifactId>dgrid</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.dojotoolkit</groupId>
-                    <artifactId>dstore</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>com.esri.js</groupId>
-                    <artifactId>ags-js-api4</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>com.esri</groupId>
-                    <artifactId>terraformer-js</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>moment-js</groupId>
-                    <artifactId>moment-js</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>de.conterra.js</groupId>
-                    <artifactId>apprt-polyfill</artifactId>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>de.conterra.js</groupId>
-                    <artifactId>reactivity</artifactId>
+                    <artifactId>ct-mapapps-js-bom-dev</artifactId>
+                    <version>${mapapps.version}</version>
+                    <type>pom</type>
                     <scope>test</scope>
                 </dependency>
             </dependencies>