Skip to content

Commit

Permalink
Updated to map.apps 4.18.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Marius Austerschulte committed Jun 13, 2024
1 parent c09423b commit e004cbb
Show file tree
Hide file tree
Showing 9 changed files with 52 additions and 22 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@
/.vscode/settings.json
/.externalToolBuilders/
/package-lock.json
/gulpfile.overrides.js
2 changes: 1 addition & 1 deletion .stylelintignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# add path patterns to ignore style files
**/external-libs/**
**/styles/dijit/**
**/styles/dijit/**
2 changes: 1 addition & 1 deletion .stylelintrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"extends": "stylelint-config-ct-prodeng"
"extends": "stylelint-config-ct-prodeng"
}
5 changes: 3 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -178,15 +178,15 @@
APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
boilerplate notice, with the fields enclosed by brackets "{}"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]
Copyright {yyyy} {name of copyright owner}

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -199,3 +199,4 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

2 changes: 1 addition & 1 deletion RELEASE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
✅ Tested for map.apps 4.18.0 / Linie 4
✅ Tested for map.apps 4.18.1 / Line 4

#### Release Notes
- autogenerated SNAPSHOT-Release
19 changes: 13 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,24 @@
{
"name": "test",
"name": "mapapps-welcome",
"description": "test build",
"version": "0.0.1",
"license": "CC0-1.0",
"scripts": {
"check-licenses": "tsx ./src/support/js/check-licenses.ts",
"check-types": "tsc --noEmit",
"watch-types": "tsc -w --noEmit"
},
"devDependencies": {
"@conterra/ct-mapapps-typings": "~4.17.0",
"@conterra/ct-mapapps-typings": "~4.18.1",
"@conterra/mapapps-mocha-runner": "1.1.1",
"@types/arcgis-js-api": "4.28.0",
"@conterra/reactivity-core": "^0.4.0",
"@types/chai": "4.3.10",
"@types/license-checker": "^25.0.6",
"@types/mocha": "10.0.4",
"arcgis-js-api": "4.29.10",
"chai": "4.3.10",
"ct-mapapps-browser-sync": "0.0.35",
"ct-mapapps-gulp-js": "0.10.2",
"ct-mapapps-browser-sync": "0.0.39",
"ct-mapapps-gulp-js": "0.10.4",
"dompurify": "~3.1.0",
"eslint-config-ct-prodeng": "1.4.0",
"license-checker": "25.0.1",
Expand All @@ -23,7 +30,7 @@
"stylelint-config-recommended-less": "2.0.0",
"ts-node": "^10.9.1",
"tsx": "^4.6.0",
"typescript": "5.2.2",
"typescript": "5.4.5",
"vue": "2.7.15",
"vue-template-compiler": "2.7.15",
"@vue/test-utils": "1.3.5"
Expand Down
41 changes: 31 additions & 10 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,6 @@
<version>${ct.jsrt-test.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>de.conterra.devnet</groupId>
<artifactId>mapapps-arcgis-html-sanitizer</artifactId>
<version>3.0.1</version>
</dependency>

</dependencies>
<build>
<pluginManagement>
Expand Down Expand Up @@ -200,6 +193,29 @@
</testResource>
</testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.4.1</version>
<executions>
<execution>
<id>enforce-versions</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireMavenVersion>
<version>[3.8.0,)</version>
</requireMavenVersion>
<requireJavaVersion>
<version>[17,)</version>
</requireJavaVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>de.conterra.maven</groupId>
<artifactId>setproperties-maven-plugin</artifactId>
Expand Down Expand Up @@ -494,12 +510,12 @@
<root.build.outputPath>${project.build.directory}/webapp</root.build.outputPath>
<js.build.outputPath>${root.build.outputPath}/js</js.build.outputPath>

<mapapps.version>4.17.0</mapapps.version>
<vuetify.version>1.5.28</vuetify.version>
<mapapps.version>4.18.1</mapapps.version>
<vuetify.version>1.5.30</vuetify.version>
<!-- JS lib versions -->
<apprt.version>${mapapps.version}</apprt.version>
<!-- java lib versions -->
<ct.jsregistry.version>2.0.1</ct.jsregistry.version>
<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-->
Expand Down Expand Up @@ -577,6 +593,11 @@
<artifactId>apprt-polyfill</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>de.conterra.js</groupId>
<artifactId>reactivity</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
<profile>
Expand Down
Binary file added src/test/webapp/favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"compilerOptions": {
"target": "ESNext",
"module": "ESNext",
"moduleResolution": "node",
"moduleResolution": "bundler",
"baseUrl": ".",
"paths": {
"*": [
Expand Down

0 comments on commit e004cbb

Please sign in to comment.