Skip to content

Update project to map.apps version 4.18.3 #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sholtkamp merged 1 commit into from
Dec 13, 2024
Merged

Update project to map.apps version 4.18.3 #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions .prettierrc
View file
Open in desktop

This file was deleted.

8 changes: 8 additions & 0 deletions .vscode/extensions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"recommendations": [
"dbaeumer.vscode-eslint",
"vue.volar",
"Esri.arcgis-jsapi-snippets",
"ctjdr.vscode-apprt-bundles"
]
}
15 changes: 15 additions & 0 deletions .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "chrome",
"request": "launch",
"name": "Launch Chrome against localhost",
"url": "http://localhost:9090",
"webRoot": "${workspaceFolder}/src/main"
}
]
}
6 changes: 3 additions & 3 deletions .vscode/tasks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"detail": "Run mapapps-github-manager development server",
"type": "shell",
"command": "mvn",
"args": ["compile", "-Denv=dev", "'-Dlocal.configfile=./build.properties'", "-Pinclude-mapapps-deps"],
"args": ["clean", "compile", "-Denv=dev", "'-Dlocal.configfile=./build.properties'", "-Pinclude-mapapps-deps"],
"group": "build",
"isBackground": true
},
Expand All @@ -22,7 +22,7 @@
"detail": "Run mapapps-github-manager development server in 'remote project' mode",
"type": "shell",
"command": "mvn",
"args": ["compile", "-Denv=dev", "'-Dlocal.configfile=./build.properties'"],
"args": ["clean", "compile", "-Denv=dev", "'-Dlocal.configfile=./build.properties'"],
"group": "build",
"isBackground": true
},
Expand All @@ -31,7 +31,7 @@
"detail": "Prepare bundles and apps for deployment on a map.apps instance",
"type": "shell",
"command": "mvn",
"args": ["install", "-Pcompress"],
"args": ["clean", "install", "-Pcompress"],
"group": "build",
"presentation": {
"reveal": "always",
Expand Down
124 changes: 0 additions & 124 deletions Jenkinsfile
View file
Open in desktop

This file was deleted.

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

#### Release Notes
- autogenerated SNAPSHOT-Release
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
"watch-types": "tsc -w --noEmit"
},
"devDependencies": {
"@conterra/ct-mapapps-typings": "~4.18.1",
"@conterra/ct-mapapps-typings": "~4.18.3",
"@conterra/mapapps-mocha-runner": "1.1.1",
"@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.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",
Expand Down
89 changes: 16 additions & 73 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,41 +40,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>
Expand Down Expand Up @@ -277,7 +259,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>
Expand All @@ -293,6 +274,8 @@
</goals>
<configuration>
<outputDirectory>${project.build.directory}/bundle-imports</outputDirectory>
<includeTypes>jar</includeTypes>
<stripVersion>true</stripVersion>
</configuration>
</execution>
</executions>
Expand Down Expand Up @@ -448,8 +431,7 @@
<goal>deployAppTemplate</goal>
</goals>
<configuration>
<templateFile>
${project.build.directory}/${project.artifactId}-sample-app.zip</templateFile>
<templateFile>${project.build.directory}/${project.artifactId}-sample-app.zip</templateFile>
<templateResources>
<templateResource>
<directory>${js.build.outputPath}/apps/manager</directory>
Expand Down Expand Up @@ -514,13 +496,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.3</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>
<ct.jsregistry.version>2.1.3</ct.jsregistry.version>

<!-- the default app, replaced in the *.html files to switch app names-->
<default.app.name>manager</default.app.name>
Expand Down Expand Up @@ -559,47 +540,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>
Expand Down
Loading
Loading