Skip to content

Commit 72e611b

Browse files
offtherailzofftherailz
authored
Updated to 2022.02.02 (#43)
1 parent 7c35798 commit 72e611b

11 files changed

Lines changed: 255 additions & 321 deletions

File tree

‎MapStore2‎

Submodule MapStore2 updated 41 files

‎backend/pom.xml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,6 @@
1616
</properties>
1717

1818
<dependencies>
19-
<!-- ================================================================ -->
20-
<!-- JACKSON -->
21-
<!-- ================================================================ -->
22-
<dependency>
23-
<groupId>org.codehaus.jackson</groupId>
24-
<artifactId>jackson-mapper-asl</artifactId>
25-
</dependency>
26-
<dependency>
27-
<groupId>com.fasterxml.jackson.core</groupId>
28-
<artifactId>jackson-databind</artifactId>
29-
<version>${jackson.databind-version}</version>
30-
</dependency>
3119
<!-- ================================================================ -->
3220
<!-- SPRING -->
3321
<!-- ================================================================ -->

‎index.html‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,7 @@
8383
}
8484
</style>
8585
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Raleway" type='text/css'>
86-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.3.1/leaflet.css" />
87-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet.draw/1.0.2/leaflet.draw.css" />
8886
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" />
89-
<link rel="shortcut icon" type="image/png" href="https://cdn.jslibs.mapstore2.geo-solutions.it/leaflet/favicon.ico" />
90-
<script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.3.1/leaflet.js"></script>
91-
<script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet.draw/1.0.2/leaflet.draw.js"></script>
92-
9387
</head>
9488
<body>
9589
<div id="container">

‎package.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,10 @@
121121
"postinstall": "node MapStore2/utility/build/postInstall.js",
122122
"clean": "rimraf dist",
123123
"compile": "npm run clean && mkdirp ./dist && node --max_old_space_size=2048 ./node_modules/webpack/bin/webpack.js --config prod-webpack.config.js --env.production",
124-
"start": "webpack serve --progress --color --port 8081 --hot --inline --content-base .",
124+
"fe:start": "webpack serve --progress --color --port 8081 --hot --inline --content-base .",
125+
"start": "concurrently -n frontend,backend -c green,blue \"npm:fe:start\" \"npm:be:start\"",
126+
"be:start": "npm run be:build && mvn cargo:run -f ./web/pom.xml",
127+
"be:build": "mvn clean install",
125128
"ext:startapp": "webpack serve --progress --color --port 8081 --hot --inline --content-base . --config build/extension/module.app.webpack.config.js",
126129
"ext:start": "webpack serve --progress --color --port 8082 --hot --inline --config build/extension/webpack.config.js",
127130
"ext:build": "rimraf ./dist && mkdirp ./dist && webpack --progress --color --config build/extension/prod-webpack.config.js",

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
<modules>
2020
<module>web</module>
21-
<module>MapStore2/backend</module>
21+
<module>MapStore2/java/services</module>
2222
</modules>
2323

2424
</project>

0 commit comments

Comments
 (0)