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 cb4cd29 commit 82e78ca
Show file tree
Hide file tree
Showing 16 changed files with 33 additions and 20 deletions.
8 changes: 4 additions & 4 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"extends": "eslint-config-ct-prodeng",
"plugins": [
"vue"
]
"extends": "eslint-config-ct-prodeng",
"plugins": [
"vue"
]
}
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 RELEASE.md
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.1 / Line 4

#### Release Notes
- autogenerated SNAPSHOT-Release
4 changes: 2 additions & 2 deletions gulpfile.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2023 con terra GmbH ([email protected])
* Copyright (C) 2024 con terra GmbH ([email protected])
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -149,7 +149,7 @@ gulp.task("run-tests",
function transportTestUrls() {
// transport test url to run-browser-tests
// eslint-disable-next-line max-len
const testsAt = mapappsBrowserSync.state.url + "/resources/jsregistry/root/@conterra/mapapps-mocha-runner/latest/mocha.html?boot=/js/tests/test-init.js&timeout=5000&test=dn_sketchingenhanced/tests/all&reporter=tap";
const testsAt = mapappsBrowserSync.state.url + "/resources/jsregistry/root/@conterra/mapapps-mocha-runner/latest/mocha.html?boot=/js/tests/test-init.js&timeout=5000&test=tests/tests/all&reporter=tap";
runBrowserTests.push(testsAt);
return Promise.resolve();
},
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (C) 2023 con terra GmbH ([email protected])
Copyright (C) 2024 con terra GmbH ([email protected])
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -16,7 +16,8 @@
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>de.conterra.devnet</groupId>
Expand Down Expand Up @@ -76,7 +77,6 @@
<version>${ct.jsrt-test.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>de.conterra.devnet</groupId>
<artifactId>mapapps-vue-color</artifactId>
Expand Down Expand Up @@ -352,7 +352,7 @@
<properties>
<owner>con terra GmbH</owner>
<email>[email protected]</email>
<project.inceptionYear>2023</project.inceptionYear>
<project.inceptionYear>2024</project.inceptionYear>
</properties>
<includes>
<include>src/main/js/**/*.js</include>
Expand Down
2 changes: 1 addition & 1 deletion src/main/config/assembly.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--
Copyright (C) 2023 con terra GmbH ([email protected])
Copyright (C) 2024 con terra GmbH ([email protected])
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
1 change: 1 addition & 0 deletions src/main/types/mocha-global.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
declare const testConfig: (opts?: Record<string, any>) => void;
7 changes: 7 additions & 0 deletions src/main/types/thirdparty.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/*
* Copyright (C) con terra GmbH
*/

declare module "dojo/*";
declare module "dijit/*";
declare module "dojox/*";
4 changes: 4 additions & 0 deletions src/main/types/vue-shim.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
declare module "*.vue" {
import Vue from "vue";
export default Vue;
}
2 changes: 1 addition & 1 deletion src/test/resources/application.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (C) 2023 con terra GmbH ([email protected])
# Copyright (C) 2024 con terra GmbH ([email protected])
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/test/webapp/index.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--
Copyright (C) 2023 con terra GmbH ([email protected])
Copyright (C) 2024 con terra GmbH ([email protected])
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/test/webapp/init.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2023 con terra GmbH ([email protected])
* Copyright (C) 2024 con terra GmbH ([email protected])
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/test/webapp/js/tests/init-packs.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2023 con terra GmbH ([email protected])
* Copyright (C) 2024 con terra GmbH ([email protected])
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
4 changes: 2 additions & 2 deletions src/test/webapp/js/tests/runTests.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--
Copyright (C) 2023 con terra GmbH ([email protected])
Copyright (C) 2024 con terra GmbH ([email protected])
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -19,7 +19,7 @@
<html>
<head>
<title>Tests</title>
<meta http-equiv="REFRESH" content="0; url=../../../resources/jsregistry/root/@conterra/mapapps-mocha-runner/latest/mocha.html?boot=/js/tests/test-init.js&timeout=5000&test=dn_sketchingenhanced/tests/all"/>
<meta http-equiv="REFRESH" content="0; url=../../../resources/jsregistry/root/@conterra/mapapps-mocha-runner/latest/mocha.html?boot=/js/tests/test-init.js&timeout=5000&test=tests/tests/all"/>
</head>
<body>
Redirecting to test runner.
Expand Down
2 changes: 1 addition & 1 deletion src/test/webapp/js/tests/test-init.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2023 con terra GmbH ([email protected])
* Copyright (C) 2024 con terra GmbH ([email protected])
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/test/webapp/login.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2023 con terra GmbH ([email protected])
* Copyright (C) 2024 con terra GmbH ([email protected])
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down

0 comments on commit 82e78ca

Please sign in to comment.