diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77e3d3869edd62608be5ad2a4f7519670fdac4e9..cf5d9a1d391f3595f50b95a5d34f4aae9f56d0cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
Alle nennenswerten Änderungen an diesem Projekt werden in dieser Datei dokumentiert.
+## Version 7.1.1 (2024-02-09)
+
+### Fehlerbehebungen
+- Fehler bei der Installation der XPlanManagerAPI, XPlanValidatorAPI und XPlanDokumenteAPI im Tomcat behoben
+- Fehler beim Editieren eines Plans, bei dem sonstPlanArt gesetzt ist und keine Ganzzahl beinhaltet behoben
+- Fehler bei der Flächenschlussprüfung, wenn der Geltungsbereich von Bereich und PlanFeature nicht übereinstimmen behoben
+
## Version 7.1 (2023-12-13)
### Erweiterungen
diff --git a/pom.xml b/pom.xml
index 3bae9576dec78ac2a6a6c7dac59e1a75865a9549..75382e24873da4b23496c7365c33dc1d6b6e4768 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplanbox</artifactId>
<packaging>pom</packaging>
- <version>7.1</version>
+ <version>7.1.1</version>
<name>xPlanBox</name>
<description>Software zur Verwaltung von XPlanGML Daten</description>
<inceptionYear>2008</inceptionYear>
@@ -1566,7 +1566,7 @@
<connection>scm:git:git@bitbucket.org:latlon/xplanbox.git</connection>
<developerConnection>scm:git:git@bitbucket.org:latlon/xplanbox.git</developerConnection>
<url>https://bitbucket.org/latlon/xplanbox</url>
- <tag>xplanbox-7.1</tag>
+ <tag>xplanbox-7.1.1</tag>
</scm>
<repositories>
diff --git a/xplan-api/pom.xml b/xplan-api/pom.xml
index c7039d96fe53ef80332a45475c81ac3069a371bc..35756cacb86ede879af2bc9d317ea2781af140b7 100644
--- a/xplan-api/pom.xml
+++ b/xplan-api/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplanbox</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<modules>
diff --git a/xplan-api/xplan-api-commons/pom.xml b/xplan-api/xplan-api-commons/pom.xml
index d08f817c48d39b49218300c59b8b078c9976fa37..cceaaad3a69f5dac5fa76278b689415e1518bf58 100644
--- a/xplan-api/xplan-api-commons/pom.xml
+++ b/xplan-api/xplan-api-commons/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-api</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<dependencies>
diff --git a/xplan-api/xplan-api-dokumente/pom.xml b/xplan-api/xplan-api-dokumente/pom.xml
index 72ead1aeba7dc8f668ca20d57b445a5fc3f81465..8399c38f91ecbdc2c6d9db1dea40c0ff93c929f2 100755
--- a/xplan-api/xplan-api-dokumente/pom.xml
+++ b/xplan-api/xplan-api-dokumente/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-api</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<dependencyManagement>
diff --git a/xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/SpringBootApp.java b/xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/SpringBootApp.java
index 6321535e0316cddcd1d0c146a928cf5c1c1c0a4a..58956b22a6b63ebe2fcda0330f62c5529e74b91c 100644
--- a/xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/SpringBootApp.java
+++ b/xplan-api/xplan-api-dokumente/src/main/java/de/latlon/xplanbox/api/dokumente/SpringBootApp.java
@@ -22,14 +22,26 @@ package de.latlon.xplanbox.api.dokumente;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.context.annotation.ComponentScan;
@SpringBootApplication
@ComponentScan(basePackages = { "de.latlon.xplanbox.api.dokumente.config" })
-public class SpringBootApp {
+public class SpringBootApp extends SpringBootServletInitializer {
public static void main(String[] args) {
SpringApplication.run(SpringBootApp.class, args);
}
+ /**
+ * Runs the application as deployable WAR.
+ * @param application Spring application builder
+ * @return Spring application builder with this application configured
+ */
+ @Override
+ protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+ return application.sources(SpringBootApp.class);
+ }
+
}
diff --git a/xplan-api/xplan-api-manager/pom.xml b/xplan-api/xplan-api-manager/pom.xml
index 74fc29194c9fa02c9853cc2ea8fb13283773a270..8fbdac52210192ee6eb5a8335b0918112f23d032 100644
--- a/xplan-api/xplan-api-manager/pom.xml
+++ b/xplan-api/xplan-api-manager/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-api</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<dependencyManagement>
diff --git a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/SpringBootApp.java b/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/SpringBootApp.java
index d817847a574bb83d0418b1ce681abc6495837720..7fd9ee65cabc49a0a013987d511601397ec99f66 100644
--- a/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/SpringBootApp.java
+++ b/xplan-api/xplan-api-manager/src/main/java/de/latlon/xplanbox/api/manager/SpringBootApp.java
@@ -26,16 +26,28 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration;
import org.springframework.boot.autoconfigure.quartz.QuartzAutoConfiguration;
import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.context.annotation.ComponentScan;
@SpringBootApplication
@ComponentScan(basePackages = { "de.latlon.xplanbox.api.manager.config" })
@EnableAutoConfiguration(
exclude = { QuartzAutoConfiguration.class, LiquibaseAutoConfiguration.class, SecurityAutoConfiguration.class })
-public class SpringBootApp {
+public class SpringBootApp extends SpringBootServletInitializer {
public static void main(String[] args) {
SpringApplication.run(SpringBootApp.class, args);
}
+ /**
+ * Runs the application as deployable WAR.
+ * @param application Spring application builder
+ * @return Spring application builder with this application configured
+ */
+ @Override
+ protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+ return application.sources(SpringBootApp.class);
+ }
+
}
diff --git a/xplan-api/xplan-api-validator/pom.xml b/xplan-api/xplan-api-validator/pom.xml
index f4ead0858b7e00c7fd3ea8015ae3cf4d7022c023..644154aabb38e964c80596ea246f81be73738b70 100755
--- a/xplan-api/xplan-api-validator/pom.xml
+++ b/xplan-api/xplan-api-validator/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-api</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<dependencyManagement>
diff --git a/xplan-api/xplan-api-validator/src/main/java/de/latlon/xplanbox/api/validator/SpringBootApp.java b/xplan-api/xplan-api-validator/src/main/java/de/latlon/xplanbox/api/validator/SpringBootApp.java
index efb3215d534a2022f4c31669c939c35c83c49131..ce190ab55e7c9a15fb5a1671859da36756fce3d1 100644
--- a/xplan-api/xplan-api-validator/src/main/java/de/latlon/xplanbox/api/validator/SpringBootApp.java
+++ b/xplan-api/xplan-api-validator/src/main/java/de/latlon/xplanbox/api/validator/SpringBootApp.java
@@ -8,12 +8,12 @@
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* #L%
@@ -24,15 +24,27 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.context.annotation.ComponentScan;
@SpringBootApplication
@ComponentScan(basePackages = { "de.latlon.xplanbox.api.validator.config" })
@EnableAutoConfiguration(exclude = { SecurityAutoConfiguration.class })
-public class SpringBootApp {
+public class SpringBootApp extends SpringBootServletInitializer {
public static void main(String[] args) {
SpringApplication.run(SpringBootApp.class, args);
}
+ /**
+ * Runs the application as deployable WAR.
+ * @param application Spring application builder
+ * @return Spring application builder with this application configured
+ */
+ @Override
+ protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+ return application.sources(SpringBootApp.class);
+ }
+
}
diff --git a/xplan-cli/pom.xml b/xplan-cli/pom.xml
index 4e9c25d3aaaac45f7091052d0dfc856ad420e9bf..38047f12e14cd2e0a4f17627dd07aae92a6b02bb 100644
--- a/xplan-cli/pom.xml
+++ b/xplan-cli/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplanbox</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<modules>
diff --git a/xplan-cli/xplan-cli-docker/pom.xml b/xplan-cli/xplan-cli-docker/pom.xml
index bbd9186a0d2c3e9cd4016771285aae02b41f1121..f686cb64b393bc0f13a24ce7f244270dea0d1b6c 100644
--- a/xplan-cli/xplan-cli-docker/pom.xml
+++ b/xplan-cli/xplan-cli-docker/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-cli</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<properties>
diff --git a/xplan-cli/xplan-evaluation-schema-synchronize-cli/pom.xml b/xplan-cli/xplan-evaluation-schema-synchronize-cli/pom.xml
index 4ff5be0725b4f3b4b4572a9f5621ddc7b3106a41..8f8d40c093b988c7d98453abded704dd3d4b31af 100644
--- a/xplan-cli/xplan-evaluation-schema-synchronize-cli/pom.xml
+++ b/xplan-cli/xplan-evaluation-schema-synchronize-cli/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-cli</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<properties>
diff --git a/xplan-cli/xplan-manager-cli/pom.xml b/xplan-cli/xplan-manager-cli/pom.xml
index d6a3971978cad54bfdb99f2b62f3c695979fa545..21ebf8fd756ef1f0e2c4ade616d8c156ba35d53a 100644
--- a/xplan-cli/xplan-manager-cli/pom.xml
+++ b/xplan-cli/xplan-manager-cli/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-cli</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<properties>
diff --git a/xplan-cli/xplan-transform-cli/pom.xml b/xplan-cli/xplan-transform-cli/pom.xml
index 7302087cd780aa288fe5eedf071a2a53f9e1f839..45e79dccd7acfb71692fa4b44ecf55695696c7e3 100644
--- a/xplan-cli/xplan-transform-cli/pom.xml
+++ b/xplan-cli/xplan-transform-cli/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-cli</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<properties>
diff --git a/xplan-cli/xplan-update-data-cli/pom.xml b/xplan-cli/xplan-update-data-cli/pom.xml
index 1a879a914b7bf61838ce0977d02b3a7613f2250e..38b5f73c8e9969014afdbe33b1251632bf1ce676 100644
--- a/xplan-cli/xplan-update-data-cli/pom.xml
+++ b/xplan-cli/xplan-update-data-cli/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-cli</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<dependencyManagement>
diff --git a/xplan-cli/xplan-validatedb-cli/pom.xml b/xplan-cli/xplan-validatedb-cli/pom.xml
index 3ef7440cb95ede6ee36a7f16ebc027285c138ece..760223ad18e1aaf06a71f438b1f92d3761358f48 100644
--- a/xplan-cli/xplan-validatedb-cli/pom.xml
+++ b/xplan-cli/xplan-validatedb-cli/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-cli</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<properties>
diff --git a/xplan-cli/xplan-validator-cli/pom.xml b/xplan-cli/xplan-validator-cli/pom.xml
index 682ba29d3a4296f9a0e709bd989f4d20c2dd9b48..00b608495f14b0f5508af1f22ab43330cbcca91d 100644
--- a/xplan-cli/xplan-validator-cli/pom.xml
+++ b/xplan-cli/xplan-validator-cli/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-cli</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<properties>
diff --git a/xplan-configuration/pom.xml b/xplan-configuration/pom.xml
index 0871c8d249c72cbf2cd3c8d72131ecefe9ba7208..865068173ec1a51ee149c36b08d224cdb9a3947d 100644
--- a/xplan-configuration/pom.xml
+++ b/xplan-configuration/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplanbox</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<modules>
diff --git a/xplan-configuration/xplan-dokumenten-config/pom.xml b/xplan-configuration/xplan-dokumenten-config/pom.xml
index 290e37e97e1a4ef5f9acced1b9192cbced1972f6..22339ed162087537b383ab7a8f9c5b0c90397688 100644
--- a/xplan-configuration/xplan-dokumenten-config/pom.xml
+++ b/xplan-configuration/xplan-dokumenten-config/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-configuration</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<build>
diff --git a/xplan-configuration/xplan-manager-config/pom.xml b/xplan-configuration/xplan-manager-config/pom.xml
index 58376a77a35e7ce59056bf51a0f25dcb025def8d..daa2a8d19b252954780a0465c5d43864e73de072 100644
--- a/xplan-configuration/xplan-manager-config/pom.xml
+++ b/xplan-configuration/xplan-manager-config/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-configuration</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<build>
diff --git a/xplan-configuration/xplan-mapproxy-config/pom.xml b/xplan-configuration/xplan-mapproxy-config/pom.xml
index 802aad4c8d752924c934b163fce4dab71d83fae8..5da06bd336d0d05941f0a3f42942698fea90d944 100644
--- a/xplan-configuration/xplan-mapproxy-config/pom.xml
+++ b/xplan-configuration/xplan-mapproxy-config/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-configuration</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<build>
diff --git a/xplan-configuration/xplan-mapserver-config/pom.xml b/xplan-configuration/xplan-mapserver-config/pom.xml
index 9821f5a5d338faa93e2cb89a6412c5db233ef2d5..a92b95308b2c3b08838a675ca9a9e93f6fb98366 100644
--- a/xplan-configuration/xplan-mapserver-config/pom.xml
+++ b/xplan-configuration/xplan-mapserver-config/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-configuration</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<build>
diff --git a/xplan-configuration/xplan-validator-config/pom.xml b/xplan-configuration/xplan-validator-config/pom.xml
index 270cfeb07d7d60de771ca31f9da86a1a23e0f3f4..e555993f4d24a2bee9ee6998c6b8fc39c53ecf35 100644
--- a/xplan-configuration/xplan-validator-config/pom.xml
+++ b/xplan-configuration/xplan-validator-config/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-configuration</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<build>
diff --git a/xplan-core/pom.xml b/xplan-core/pom.xml
index 2a231e850eaf49ad9f2a64c4e58c7f9735de648f..1ac4feb8558f40a72f23193e23fdd667b6200425 100644
--- a/xplan-core/pom.xml
+++ b/xplan-core/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplanbox</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<modules>
diff --git a/xplan-core/xplan-commons-cli/pom.xml b/xplan-core/xplan-commons-cli/pom.xml
index c1d1e6edc7ba23a5c142ccc205beae8f21b4bf1a..580c1903bb94c63f0b65b01261f73fbbdef6581a 100644
--- a/xplan-core/xplan-commons-cli/pom.xml
+++ b/xplan-core/xplan-commons-cli/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-core</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<dependencies>
diff --git a/xplan-core/xplan-commons/pom.xml b/xplan-core/xplan-commons/pom.xml
index ff5ec24c414a230d0d29d5266b059cf6fa681280..fb14321ee0a8139db5706fc86f394633f928f5ab 100644
--- a/xplan-core/xplan-commons/pom.xml
+++ b/xplan-core/xplan-commons/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-core</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<build>
diff --git a/xplan-core/xplan-core-job/pom.xml b/xplan-core/xplan-core-job/pom.xml
index dd78f05f23e4e9bd23c918174b91a6c04aaf9223..141f76998260060e599786c497642af8315cd866 100644
--- a/xplan-core/xplan-core-job/pom.xml
+++ b/xplan-core/xplan-core-job/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-core</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<artifactId>xplan-core-job</artifactId>
diff --git a/xplan-core/xplan-core-manager-db/pom.xml b/xplan-core/xplan-core-manager-db/pom.xml
index 962447124180bfd0977050a2aeee1781e34187ed..f2aa2326ed98f94765ecd33cbef50057eee2a317 100644
--- a/xplan-core/xplan-core-manager-db/pom.xml
+++ b/xplan-core/xplan-core-manager-db/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-core</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<dependencies>
diff --git a/xplan-core/xplan-core-manager-deegree/pom.xml b/xplan-core/xplan-core-manager-deegree/pom.xml
index 589b68eb5c5fb7e88d816f82e4b027457a1f3c6e..043bb2972af0e0b672cb810e062b7ef009ecebad 100644
--- a/xplan-core/xplan-core-manager-deegree/pom.xml
+++ b/xplan-core/xplan-core-manager-deegree/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-core</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<build>
diff --git a/xplan-core/xplan-inspireplu-transformation/pom.xml b/xplan-core/xplan-inspireplu-transformation/pom.xml
index 93b5e7d824ad722a09b032db367da78d50ce5733..4cbc54d896882ebdeda12c580f04a5d688531630 100644
--- a/xplan-core/xplan-inspireplu-transformation/pom.xml
+++ b/xplan-core/xplan-inspireplu-transformation/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-core</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<dependencies>
diff --git a/xplan-core/xplan-manager-core/pom.xml b/xplan-core/xplan-manager-core/pom.xml
index 0cb5b22f7ae87a233d5b4fa8524c2473bea46191..d99779bcd1417d52b55db7f19e63e2756e731139 100644
--- a/xplan-core/xplan-manager-core/pom.xml
+++ b/xplan-core/xplan-manager-core/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-core</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<dependencies>
@@ -181,7 +181,7 @@
<dependency>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-core-manager-deegree</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/edit/XPlanToEditFactory.java b/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/edit/XPlanToEditFactory.java
index 08481ddfe5901d011f8692183441cd61d5aa25ff..415ab0fe4f792aaf819e01fac0b1659414c0d87c 100644
--- a/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/edit/XPlanToEditFactory.java
+++ b/xplan-core/xplan-manager-core/src/main/java/de/latlon/xplan/manager/edit/XPlanToEditFactory.java
@@ -156,7 +156,14 @@ public class XPlanToEditFactory {
baseData.setPlanTypeCode(asInteger(propertyValue));
}
else if ("sonstPlanArt".equals(propertyName)) {
- baseData.setOtherPlanTypeCode(asInteger(propertyValue));
+ try {
+ int sonstPlanArtValue = Integer.parseInt(propertyValue.toString());
+ baseData.setOtherPlanTypeCode(sonstPlanArtValue);
+ }
+ catch (NumberFormatException e) {
+ LOG.warn("sonstPlanArt is not an integer value. Currently only integer values are supported.");
+ baseData.setOtherPlanTypeCode(-1);
+ }
}
else if ("verfahren".equals(propertyName)) {
baseData.setMethodCode(asInteger(propertyValue));
diff --git a/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan54/BPlan002_5-4.gml b/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan54/BPlan002_5-4.gml
index c117b9821579fcf16595e9d8c3cb93e5b2d9fb51..fa8a450ae921d03ad56b0049e981ba7626e78eba 100644
--- a/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan54/BPlan002_5-4.gml
+++ b/xplan-core/xplan-manager-core/src/test/resources/de/latlon/xplan/manager/edit/xplan54/BPlan002_5-4.gml
@@ -59,6 +59,7 @@
</xplan:XP_Gemeinde>
</xplan:gemeinde>
<xplan:planArt>1000</xplan:planArt>
+ <xplan:sonstPlanArt codeSpace="https://registry.gdi-de.org/codelist/de.xleitstelle.xplanung/BP_SonstPlanArt" >9999_4</xplan:sonstPlanArt>
<xplan:verfahren>1000</xplan:verfahren>
<xplan:rechtsstand>3000</xplan:rechtsstand>
<xplan:veraenderungssperre>false</xplan:veraenderungssperre>
diff --git a/xplan-core/xplan-synthesizer/pom.xml b/xplan-core/xplan-synthesizer/pom.xml
index 7a0fb2be1e8737db714e5a745f8e7bdeb0c8ca9a..2b7b3e7f0409c6d70c5001a138254fd7570d7e40 100644
--- a/xplan-core/xplan-synthesizer/pom.xml
+++ b/xplan-core/xplan-synthesizer/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-core</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<dependencies>
diff --git a/xplan-core/xplan-validator-core/pom.xml b/xplan-core/xplan-validator-core/pom.xml
index 3220e09bf5146d2f14dfae64db87273893163544..b8cf1f82e698c5d7ace42736d66139f753f7369b 100644
--- a/xplan-core/xplan-validator-core/pom.xml
+++ b/xplan-core/xplan-validator-core/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-core</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<build>
diff --git a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/OptimisedFlaechenschlussInspector.java b/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/OptimisedFlaechenschlussInspector.java
index f96d475055905d20a9b3b556e8edf35210b91be4..85263ee811699f7b99a729079e211007cb2bb26d 100644
--- a/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/OptimisedFlaechenschlussInspector.java
+++ b/xplan-core/xplan-validator-core/src/main/java/de/latlon/xplan/validator/geometric/inspector/flaechenschluss/OptimisedFlaechenschlussInspector.java
@@ -76,7 +76,6 @@ import org.slf4j.LoggerFactory;
import java.math.BigDecimal;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -554,8 +553,11 @@ public class OptimisedFlaechenschlussInspector implements GeometricFeatureInspec
}
else if (geltungsbereichFeature instanceof PlanFeature) {
FeaturesUnderTest planFeaturesUnderTest = new FeaturesUnderTest(flaechenschlussUnion, featuresUnderTest);
- planFeaturesWithFeaturesUnderTest.put((PlanFeature) geltungsbereichFeature,
- Collections.singletonList(planFeaturesUnderTest));
+ PlanFeature planFeature = (PlanFeature) geltungsbereichFeature;
+ if (!planFeaturesWithFeaturesUnderTest.containsKey(planFeature)) {
+ planFeaturesWithFeaturesUnderTest.put(planFeature, new ArrayList<>());
+ }
+ planFeaturesWithFeaturesUnderTest.get(planFeature).add(planFeaturesUnderTest);
}
}
diff --git a/xplan-distribution/pom.xml b/xplan-distribution/pom.xml
index e0cda068a4d9031c5a2fd3f7fe535810011d8104..ca3d759fef798999a8661d15fdd330497d0c5a30 100644
--- a/xplan-distribution/pom.xml
+++ b/xplan-distribution/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplanbox</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<build>
diff --git a/xplan-docker/pom.xml b/xplan-docker/pom.xml
index 274ce7b1f1482e3154072a4dea393628a26282fc..bb74a32bcbdaa1f48742a24429aa362d73a96e50 100644
--- a/xplan-docker/pom.xml
+++ b/xplan-docker/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplanbox</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<modules>
diff --git a/xplan-docker/xplan-docker-mapproxy/pom.xml b/xplan-docker/xplan-docker-mapproxy/pom.xml
index 2ab8c1826aa4fe4d85060846c4a4427b3aa8259f..4561bac36d9feb6fa0690456db31b76ddcfac925 100644
--- a/xplan-docker/xplan-docker-mapproxy/pom.xml
+++ b/xplan-docker/xplan-docker-mapproxy/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-docker</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<properties>
diff --git a/xplan-docker/xplan-docker-mapserver/pom.xml b/xplan-docker/xplan-docker-mapserver/pom.xml
index 421d5936be18559dc480941a9b0bdbdd635d9a48..abd250b9528274f6d920c34bed6023aba870fc41 100644
--- a/xplan-docker/xplan-docker-mapserver/pom.xml
+++ b/xplan-docker/xplan-docker-mapserver/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-docker</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<properties>
diff --git a/xplan-docker/xplan-docker-tomcat-gdal/pom.xml b/xplan-docker/xplan-docker-tomcat-gdal/pom.xml
index 9ee7d8fd85ad806a54b77bb738641de570fc6f53..3682496ada725ceb7309c3e1a9c80e0c35eddfe3 100644
--- a/xplan-docker/xplan-docker-tomcat-gdal/pom.xml
+++ b/xplan-docker/xplan-docker-tomcat-gdal/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-docker</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<properties>
diff --git a/xplan-docker/xplan-docker-tomcat/pom.xml b/xplan-docker/xplan-docker-tomcat/pom.xml
index 816c75e6b5274f07f8d8a0d953c45729f7c59cdf..3521344a26f41bd9d35cab1a96a431af931c73d5 100644
--- a/xplan-docker/xplan-docker-tomcat/pom.xml
+++ b/xplan-docker/xplan-docker-tomcat/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-docker</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<properties>
diff --git a/xplan-docker/xplan-docker-volume-init/pom.xml b/xplan-docker/xplan-docker-volume-init/pom.xml
index 33b6796269c0818f850cb2eca7547010ba810662..4f409d7c38955a7e0702d8e65a01d4dc8720f8b2 100644
--- a/xplan-docker/xplan-docker-volume-init/pom.xml
+++ b/xplan-docker/xplan-docker-volume-init/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-docker</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<properties>
diff --git a/xplan-documentation/pom.xml b/xplan-documentation/pom.xml
index 7505cbebaad612eceb022e24da0284dda5effd9c..ef482051d3c05851ebbdd4a7093aa8d362b99c82 100644
--- a/xplan-documentation/pom.xml
+++ b/xplan-documentation/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplanbox</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<properties>
diff --git a/xplan-documentation/xplan-benutzerhandbuch/pom.xml b/xplan-documentation/xplan-benutzerhandbuch/pom.xml
index 80946d06a20712fb38cfe64a63a8b4fc2a424fe7..eebcca047342f65a47209890e6e697d816db2999 100644
--- a/xplan-documentation/xplan-benutzerhandbuch/pom.xml
+++ b/xplan-documentation/xplan-benutzerhandbuch/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-documentation</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<build>
diff --git a/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/aenderungsHistorie.adoc b/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/aenderungsHistorie.adoc
index 96dd70ce9c9aefafe6ae0a0bd0d4fde9f02a7228..1ecb68e617ae866ac560a89e523c132277de4232 100644
--- a/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/aenderungsHistorie.adoc
+++ b/xplan-documentation/xplan-benutzerhandbuch/src/main/asciidoc/aenderungsHistorie.adoc
@@ -2,6 +2,14 @@
[[Aenderungshistorie]]
== Änderungshistorie der xPlanBox
+[[Aenderungshistorie-7.1.1]]
+=== Version 7.1.1
+
+==== Fehlerbehebungen
+- Fehler bei der Installation der XPlanManagerAPI, XPlanValidatorAPI und XPlanDokumenteAPI im Tomcat behoben
+- Fehler beim Editieren eines Plans, bei dem sonstPlanArt gesetzt ist und keine Ganzzahl beinhaltet behoben
+- Fehler bei der Flächenschlussprüfung, wenn der Geltungsbereich von Bereich und PlanFeature nicht übereinstimmen behoben
+
[[Aenderungshistorie-7.1]]
=== Version 7.1
diff --git a/xplan-documentation/xplan-betriebshandbuch/pom.xml b/xplan-documentation/xplan-betriebshandbuch/pom.xml
index bc892f460c5f497e6f79a0a7e31533ace36a2260..e59c3248598fa0257dd3824f4f25c145613c3d2e 100644
--- a/xplan-documentation/xplan-betriebshandbuch/pom.xml
+++ b/xplan-documentation/xplan-betriebshandbuch/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-documentation</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<build>
diff --git a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/aktualisierung.adoc b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/aktualisierung.adoc
index e133c5bd2ac0f89e418ad969294aed8e91f1795c..7a7707977602888d8a4e1c6a53a3e3ad4ff13eaa 100644
--- a/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/aktualisierung.adoc
+++ b/xplan-documentation/xplan-betriebshandbuch/src/main/asciidoc/aktualisierung.adoc
@@ -80,6 +80,7 @@ Die Aktualisierungswerkzeuge und -skripte werden nur für die genannten Versione
| 7.0.1 | ja (<<aktualisierung-version-7.0.1, Details>>) | nein
| 7.0.2 | ja (<<aktualisierung-version-7.0.2, Details>>) | nein
| 7.1 | ja (<<aktualisierung-version-7.1, Details>>) | ja (<<aktualisierung-version-7.1, Details>>)
+| 7.1.1 | nein | nein
|Durchzuführende Aktualisierungen | <<aktualisierung-der-betroffenen-konfigurationsdateien-in-den-workspaces>> | <<aktualisierung-der-schemas>> und <<aktualisierung-der-daten>>
|===
@@ -290,3 +291,17 @@ Bei unerwartetem Verhalten der xPlanBox nach einer Aktualisierung können folgen
* Löschen des Verzeichnisses _<CATALINA_HOME>/work/_ des Tomcat-Servers. Der Tomcat-Server muss zuvor gestoppt und anschließend neu gestartet werden.
* Reload der Workspaces der XPlanDienste.
* Löschen des Browser-Caches.
+
+[[aktualisierung-version-7.1.1]]
+=== Aktualisierung auf die Version 7.1.1
+
+Für eine Installation der Bugfix-Version müssen folgende Schritte ausgeführt werden:
+
+* Austausch der Webapps:
+** _xplan-api-validator.war_
+** _xplan-api-manager.war_
+** _xplan-validator-web.war_
+** _xplan-manager-web.war_
+** _xplan-api-dokumente.war_
+
+TIP: Alle anderen Komponenten sind unverändert und müssen nicht aktualisiert werden.
\ No newline at end of file
diff --git a/xplan-resources/pom.xml b/xplan-resources/pom.xml
index f8f13687bd3dd6549acab665d46a72df323fb674..789ead135e443d3d1529df1c007e26b8f1b2b351 100644
--- a/xplan-resources/pom.xml
+++ b/xplan-resources/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplanbox</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<modules>
diff --git a/xplan-resources/xplan-database-scripts/pom.xml b/xplan-resources/xplan-database-scripts/pom.xml
index 00c539a2db98383270ed09c1f4f7e1c22cfe1562..86d296273ecda4451d5111f064217def684a2328 100644
--- a/xplan-resources/xplan-database-scripts/pom.xml
+++ b/xplan-resources/xplan-database-scripts/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-resources</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<build>
diff --git a/xplan-resources/xplan-schemas/pom.xml b/xplan-resources/xplan-schemas/pom.xml
index 6ea89e1ca4e35190238422783a898373da5921f4..42803815437087af80ea5be3cdad54668b51f27c 100644
--- a/xplan-resources/xplan-schemas/pom.xml
+++ b/xplan-resources/xplan-schemas/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-resources</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<build>
diff --git a/xplan-resources/xplan-sql-scripts/pom.xml b/xplan-resources/xplan-sql-scripts/pom.xml
index 001381d6eb18b977e55412586ec38ae49fc89947..db9dcbdc65bfc942629a05b9be12c45eb3b7a6a9 100644
--- a/xplan-resources/xplan-sql-scripts/pom.xml
+++ b/xplan-resources/xplan-sql-scripts/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-resources</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<build>
diff --git a/xplan-security/pom.xml b/xplan-security/pom.xml
index ad8d63a784631ff80816d8e05530c263fc2e4dd3..7f3cef45537576ee395d3ebeaa9da98cde4e7c95 100644
--- a/xplan-security/pom.xml
+++ b/xplan-security/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplanbox</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<dependencies>
diff --git a/xplan-tests/pom.xml b/xplan-tests/pom.xml
index f4ce4f9712c130302e85cfe794e422b18454618a..9668c3290429bb197406ac967109e8d89db0e353 100644
--- a/xplan-tests/pom.xml
+++ b/xplan-tests/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplanbox</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<properties>
diff --git a/xplan-tests/xplan-tests-manual/pom.xml b/xplan-tests/xplan-tests-manual/pom.xml
index f3ae250de2f43878e10e5c7e14e39edbb9bfe22a..d8558edc044098d0e8d8c8dc3751a0cc6c7ead7d 100644
--- a/xplan-tests/xplan-tests-manual/pom.xml
+++ b/xplan-tests/xplan-tests-manual/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-tests</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
</project>
diff --git a/xplan-tests/xplan-tests-resources/pom.xml b/xplan-tests/xplan-tests-resources/pom.xml
index e4ba2ce5ae35adfd1bda1e346a5e5c9fdb897ce8..70b51a54f9a1153d1898d5fd770b0ff8803f884d 100644
--- a/xplan-tests/xplan-tests-resources/pom.xml
+++ b/xplan-tests/xplan-tests-resources/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-tests</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
</project>
\ No newline at end of file
diff --git a/xplan-tests/xplan-tests-soapui/pom.xml b/xplan-tests/xplan-tests-soapui/pom.xml
index 4c492dd25eb7652b1e845312798503df090a289b..76d0cf450b6365c5e831041ed0af9cf2b9953b06 100644
--- a/xplan-tests/xplan-tests-soapui/pom.xml
+++ b/xplan-tests/xplan-tests-soapui/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-tests</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<build>
diff --git a/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-api-manager/plans/BP_6.0.gml b/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-api-manager/plans/BP_6.0.gml
index 6f62f641d2c956e318148a6a6d716b7ed0404c34..b9d1c0625a57dcbfdda6cfdabe35e65c216d0f0e 100644
--- a/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-api-manager/plans/BP_6.0.gml
+++ b/xplan-tests/xplan-tests-soapui/src/main/resources/xplan-api-manager/plans/BP_6.0.gml
@@ -43,6 +43,7 @@
</xplan:XP_Gemeinde>
</xplan:gemeinde>
<xplan:planArt>1000</xplan:planArt>
+ <xplan:sonstPlanArt codeSpace="https://registry.gdi-de.org/codelist/de.xleitstelle.xplanung/BP_SonstPlanArt" >9999_4</xplan:sonstPlanArt>
<xplan:rechtsstand>3000</xplan:rechtsstand>
<xplan:staedtebaulicherVertrag>false</xplan:staedtebaulicherVertrag>
<xplan:erschliessungsVertrag>false</xplan:erschliessungsVertrag>
diff --git a/xplan-webapps/pom.xml b/xplan-webapps/pom.xml
index c596f3c87072446b1b021ffc7f8d5a163245218d..b821b999d3d45e832eb505abd55210a2694d26ee 100644
--- a/xplan-webapps/pom.xml
+++ b/xplan-webapps/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplanbox</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<modules>
diff --git a/xplan-webapps/xplan-commons-web/pom.xml b/xplan-webapps/xplan-commons-web/pom.xml
index 014c53afb9d17670a064f475f84a20cfabf1ab68..9486f285d8bb506df6f03c84b739ac299c9aef9e 100644
--- a/xplan-webapps/xplan-commons-web/pom.xml
+++ b/xplan-webapps/xplan-commons-web/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-webapps</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<build>
diff --git a/xplan-webapps/xplan-manager-web/Dockerfile b/xplan-webapps/xplan-manager-web/Dockerfile
index a9c544002b39f5b23b408edf4990682210e74b15..cd8faeacd9acde9c1ed14e3298a258b4ca06f87e 100644
--- a/xplan-webapps/xplan-manager-web/Dockerfile
+++ b/xplan-webapps/xplan-manager-web/Dockerfile
@@ -5,7 +5,7 @@ FROM ${XPLANBOX_IMAGE_NAME_PREFIX}/xplan-docker-tomcat-gdal:$XPLANBOX_VERSION
ARG BUILD_DATE=?
ARG DOCKER_IMAGE_NAME=?
ARG GIT_REVISION=?
-ARG WEB_CONTEXT=ROOT
+ARG WEB_CONTEXT=xplan-manager-web
ARG XPLANBOX_VERSION=latest
# see https://github.com/opencontainers/image-spec/blob/main/annotations.md#pre-defined-annotation-keys
@@ -22,10 +22,12 @@ LABEL "org.opencontainers.image.created"="$BUILD_DATE" \
# set environment variables
ENV TOMCAT_ADDITIONAL_ARG_APP="-DXPLANBOX_CONFIG=/xplanbox/xplan-manager-config/ -Djavax.xml.transform.TransformerFactory=net.sf.saxon.TransformerFactoryImpl -Djts.overlay=ng -Duser.timezone=Europe/Berlin"
-# add xplan-manager-web
-# TODO: add unpacked
-COPY target/xplan-manager-web-*.war /usr/local/tomcat/webapps/xplan-manager-web.war
-
+# add xplan-manager-web directly unpacked
+COPY target/xplan-manager-web-*.war /tmp/
+RUN mkdir /usr/local/tomcat/webapps/$WEB_CONTEXT \
+ && cd /usr/local/tomcat/webapps/$WEB_CONTEXT \
+ && jar xf /tmp/xplan-manager-web-*.war \
+ && rm /tmp/xplan-manager-web-*.war
# run tomcat
CMD ["/usr/local/tomcat/bin/catalina.sh", "run"]
diff --git a/xplan-webapps/xplan-manager-web/DockerfileHale b/xplan-webapps/xplan-manager-web/DockerfileHale
index 3ca005985525d487ce557963e24ac9c06584edc0..7a467e6737793741db0b1b68f21058de585cb2a3 100644
--- a/xplan-webapps/xplan-manager-web/DockerfileHale
+++ b/xplan-webapps/xplan-manager-web/DockerfileHale
@@ -2,20 +2,37 @@ ARG XPLANBOX_VERSION=latest
ARG XPLANBOX_IMAGE_NAME_PREFIX=xplanbox
FROM ${XPLANBOX_IMAGE_NAME_PREFIX}/xplan-docker-tomcat-gdal:$XPLANBOX_VERSION
-ARG WEB_CONTEXT=ROOT
+ARG BUILD_DATE=?
+ARG DOCKER_IMAGE_NAME=?
+ARG GIT_REVISION=?
+ARG WEB_CONTEXT=xplan-manager-web
+ARG XPLANBOX_VERSION=latest
+
+# see https://github.com/opencontainers/image-spec/blob/main/annotations.md#pre-defined-annotation-keys
+LABEL "org.opencontainers.image.created"="$BUILD_DATE" \
+ "org.opencontainers.image.description"="ozgxplanung xPlanBox component" \
+ "org.opencontainers.image.licenses"="GNU Affero General Public License & others" \
+ "org.opencontainers.image.ref.name"="$DOCKER_IMAGE_NAME" \
+ "org.opencontainers.image.revision"="$GIT_REVISION" \
+ "org.opencontainers.image.title"="ozgxplanung - $DOCKER_IMAGE_NAME" \
+ "org.opencontainers.image.url"="https://gitlab.opencode.de/diplanung/ozgxplanung" \
+ "org.opencontainers.image.vendor"="lat/lon GmbH" \
+ "org.opencontainers.image.version"="$XPLANBOX_VERSION"
# set environment variables
-ENV TOMCAT_ADDITIONAL_ARG_APP="-DXPLANBOX_CONFIG=/xplanbox/xplan-manager-config/ -Dlog4j2.configurationFile=classpath:/log4j2.yaml -Djavax.xml.transform.TransformerFactory=net.sf.saxon.TransformerFactoryImpl -Djts.overlay=ng -Duser.timezone=Europe/Berlin"
+ENV TOMCAT_ADDITIONAL_ARG_APP="-DXPLANBOX_CONFIG=/xplanbox/xplan-manager-config/ -Djavax.xml.transform.TransformerFactory=net.sf.saxon.TransformerFactoryImpl -Djts.overlay=ng -Duser.timezone=Europe/Berlin"
# add hale-cli which is using Java 8 JDK
RUN cd / && wget https://github.com/halestudio/hale-cli/releases/download/v3.4.0/hale-cli-3.4.0.zip && unzip hale-cli-3.4.0.zip
RUN apt update && apt -y install openjdk-8-jdk
RUN sed -i '2iJAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64' /hale/bin/hale
-# add xplan-manager-web
-# TODO: add unpacked
-COPY target/xplan-manager-web-*.war /usr/local/tomcat/webapps/xplan-manager-web.war
-
+# add xplan-manager-web directly unpacked
+COPY target/xplan-manager-web-*.war /tmp/
+RUN mkdir /usr/local/tomcat/webapps/$WEB_CONTEXT \
+ && cd /usr/local/tomcat/webapps/$WEB_CONTEXT \
+ && jar xf /tmp/xplan-manager-web-*.war \
+ && rm /tmp/xplan-manager-web-*.war
# run tomcat
CMD ["/usr/local/tomcat/bin/catalina.sh", "run"]
diff --git a/xplan-webapps/xplan-manager-web/pom.xml b/xplan-webapps/xplan-manager-web/pom.xml
index 5788a85d8fe584a9121d20cd48782afb2b871fdb..167351a8cf7ebfd7b6dd6b1953d02e6cc9fe4a66 100644
--- a/xplan-webapps/xplan-manager-web/pom.xml
+++ b/xplan-webapps/xplan-manager-web/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-webapps</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<properties>
diff --git a/xplan-webapps/xplan-root/pom.xml b/xplan-webapps/xplan-root/pom.xml
index 4dc583804877fc89f8e323c445cc24519b2998bd..6171ee9d11e95fd3df1b1376ca3b9eb0d04aff94 100644
--- a/xplan-webapps/xplan-root/pom.xml
+++ b/xplan-webapps/xplan-root/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-webapps</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<build>
diff --git a/xplan-webapps/xplan-validator-web-commons/pom.xml b/xplan-webapps/xplan-validator-web-commons/pom.xml
index f4e8d455bcc8921522405d3d493637ec73d14e66..8bbed430f2455f5171fa8d5e9e07e0dd8ca30934 100644
--- a/xplan-webapps/xplan-validator-web-commons/pom.xml
+++ b/xplan-webapps/xplan-validator-web-commons/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-webapps</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<build>
diff --git a/xplan-webapps/xplan-validator-web/pom.xml b/xplan-webapps/xplan-validator-web/pom.xml
index 551d3a9658c4715c609bd28132126ed6888b3dae..fd8e737e7f169f5d0520bf633610715560328846 100644
--- a/xplan-webapps/xplan-validator-web/pom.xml
+++ b/xplan-webapps/xplan-validator-web/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-webapps</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<properties>
diff --git a/xplan-webservices/pom.xml b/xplan-webservices/pom.xml
index 1340ace0635aa16d152ff16c78e21b7333c34cec..d34c29492b59545cb7f5b1be78b592125c14a9cf 100644
--- a/xplan-webservices/pom.xml
+++ b/xplan-webservices/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplanbox</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<modules>
diff --git a/xplan-webservices/xplan-commons-webservices/pom.xml b/xplan-webservices/xplan-commons-webservices/pom.xml
index 30eda8aaa0045a750437938d86a124c24039862a..a9e1edd297bfa50e132240e387e6b6965d458f6e 100644
--- a/xplan-webservices/xplan-commons-webservices/pom.xml
+++ b/xplan-webservices/xplan-commons-webservices/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-webservices</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<build>
diff --git a/xplan-webservices/xplan-inspireplu/pom.xml b/xplan-webservices/xplan-inspireplu/pom.xml
index 2dbe40bf9d6a5db059314cb7b0438588b83f8c35..96b98019a92450b88b8965662a1f75abf2d61dbc 100644
--- a/xplan-webservices/xplan-inspireplu/pom.xml
+++ b/xplan-webservices/xplan-inspireplu/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-webservices</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<dependencies>
diff --git a/xplan-webservices/xplan-services-docker/pom.xml b/xplan-webservices/xplan-services-docker/pom.xml
index 769f4cb7fc5d884a7c68fa05ec02f71fccb824be..b2ecab584f922551c55c6584d921cd5c723c71c9 100644
--- a/xplan-webservices/xplan-services-docker/pom.xml
+++ b/xplan-webservices/xplan-services-docker/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-webservices</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<properties>
diff --git a/xplan-webservices/xplan-validator-wms/pom.xml b/xplan-webservices/xplan-validator-wms/pom.xml
index 91bbc41777d704a9ab1a340498b1a36b0f9513c3..f2eef7a3ae29d77e3c598e3a3e8dc4059ff1363c 100644
--- a/xplan-webservices/xplan-validator-wms/pom.xml
+++ b/xplan-webservices/xplan-validator-wms/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-webservices</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<dependencies>
diff --git a/xplan-webservices/xplan-wfs/pom.xml b/xplan-webservices/xplan-wfs/pom.xml
index 96f7889518b981f41fb82ca5d4a2065b510dcbc6..94c7d49e90599b90bd14ded79725ce1fa2f04b31 100644
--- a/xplan-webservices/xplan-wfs/pom.xml
+++ b/xplan-webservices/xplan-wfs/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-webservices</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<dependencies>
diff --git a/xplan-webservices/xplan-wms/pom.xml b/xplan-webservices/xplan-wms/pom.xml
index 36be17f56d0f565a879f0f35e7a7ff8cd53eee29..de2e0baed644c6c9390eae76877509adb9678d9e 100644
--- a/xplan-webservices/xplan-wms/pom.xml
+++ b/xplan-webservices/xplan-wms/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-webservices</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<build>
diff --git a/xplan-webservices/xplansyn-wfs/pom.xml b/xplan-webservices/xplansyn-wfs/pom.xml
index eb6d07a4695cfe2665b03dbf4547cfa0e4e010a6..4bc6c8dee6352c2973c1fc971bcca401b378b647 100644
--- a/xplan-webservices/xplansyn-wfs/pom.xml
+++ b/xplan-webservices/xplansyn-wfs/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplan-webservices</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<dependencies>
diff --git a/xplan-workspaces/pom.xml b/xplan-workspaces/pom.xml
index 81d0870be5bca972d57511b5dd702190512f1b2c..4427e2c4aa937d745975157b65f352a6aa5aa8e7 100644
--- a/xplan-workspaces/pom.xml
+++ b/xplan-workspaces/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>de.latlon.product.xplanbox</groupId>
<artifactId>xplanbox</artifactId>
- <version>7.1</version>
+ <version>7.1.1</version>
</parent>
<build>