From 428ed59ed33e23d0916475f65f34858cf83a0380 Mon Sep 17 00:00:00 2001 From: Philip Helger Date: Fri, 19 Aug 2022 15:16:09 +0200 Subject: [PATCH 1/7] Using unique names --- .../eu/de4a/connector/api/controller/ServiceController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/de4a-connector/src/main/java/eu/de4a/connector/api/controller/ServiceController.java b/de4a-connector/src/main/java/eu/de4a/connector/api/controller/ServiceController.java index ecef83c9..513f28d6 100644 --- a/de4a-connector/src/main/java/eu/de4a/connector/api/controller/ServiceController.java +++ b/de4a-connector/src/main/java/eu/de4a/connector/api/controller/ServiceController.java @@ -38,7 +38,7 @@ public class ServiceController private ServiceUtils serviceUtils; @GetMapping (value = "/ial/{cot}", produces = MediaType.APPLICATION_XML_VALUE) - public ResponseEntity lookupRoutingInformation (@Valid @PathVariable @NotNull final String cot) + public ResponseEntity callIalCot (@Valid @PathVariable @NotNull final String cot) { if (LOGGER.isInfoEnabled ()) LOGGER.info ("Request to API '/service/ial/" + cot + "' received"); @@ -64,8 +64,8 @@ public class ServiceController } @GetMapping (value = "/ial/{cot}/{atu}", produces = MediaType.APPLICATION_XML_VALUE) - public ResponseEntity lookupRoutingInformation (@Valid @PathVariable @NotNull final String cot, - @Valid @PathVariable @NotNull final String atu) + public ResponseEntity callIalCotAtu (@Valid @PathVariable @NotNull final String cot, + @Valid @PathVariable @NotNull final String atu) { if (LOGGER.isInfoEnabled ()) LOGGER.info ("Request to API '/service/ial/" + cot + "/" + atu + "' received"); From 379b1aa403031ef78bad663679703af81ea0b2ca Mon Sep 17 00:00:00 2001 From: Philip Helger Date: Fri, 19 Aug 2022 16:11:17 +0200 Subject: [PATCH 2/7] Added release notes --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index ffc37de3..cd7e3273 100644 --- a/README.md +++ b/README.md @@ -263,6 +263,8 @@ Once you have deployed the `war` file, there are several **checks to ensure that # News and Noteworthy +* v0.2.4 - 2022-08-19 + * Fixed a Spring problem with the `/service/ial` APIs when run in a Docker container (same name of resolved method) * v0.2.3 - 2022-08-18 * The `/service/ial` queries no longer require the `application/xml` Content Type * Updated the Iteration 1 code bindings to avoid conflicting paths (de4a-iem 0.1.13) From b8911d3d6183eb983391d3549c770571ebce8910 Mon Sep 17 00:00:00 2001 From: Philip Helger Date: Fri, 19 Aug 2022 16:33:10 +0200 Subject: [PATCH 3/7] Ignore more --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 98b0ce5f..dea5b19f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ .settings/ target/ phase4-dumps/ +ph/ #Ignore out of scope project modules .idea/ From cdc3d6a6ea6e5153a2292ed254257f23f70a8db3 Mon Sep 17 00:00:00 2001 From: Philip Helger Date: Fri, 19 Aug 2022 16:35:24 +0200 Subject: [PATCH 4/7] Updated --- build-release-docker.cmd => build-and-push-docker-release.cmd | 2 +- ...ush-docker.cmd => compile-build-and-push-docker-snapshot.cmd | 0 ...-run-docker.cmd => compile-build-and-run-docker-snapshot.cmd | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename build-release-docker.cmd => build-and-push-docker-release.cmd (95%) rename build-and-push-docker.cmd => compile-build-and-push-docker-snapshot.cmd (100%) rename build-and-run-docker.cmd => compile-build-and-run-docker-snapshot.cmd (100%) diff --git a/build-release-docker.cmd b/build-and-push-docker-release.cmd similarity index 95% rename from build-release-docker.cmd rename to build-and-push-docker-release.cmd index a1152023..dd5ea4dd 100644 --- a/build-release-docker.cmd +++ b/build-and-push-docker-release.cmd @@ -1,7 +1,7 @@ @echo off :: The version to release -set VER=0.2.3 +set VER=0.2.4 cd de4a-connector docker build --pull -t de4a/connector:%VER% . diff --git a/build-and-push-docker.cmd b/compile-build-and-push-docker-snapshot.cmd similarity index 100% rename from build-and-push-docker.cmd rename to compile-build-and-push-docker-snapshot.cmd diff --git a/build-and-run-docker.cmd b/compile-build-and-run-docker-snapshot.cmd similarity index 100% rename from build-and-run-docker.cmd rename to compile-build-and-run-docker-snapshot.cmd From 59fdca8329ec4e31a4cc55787e6f875d082cb34c Mon Sep 17 00:00:00 2001 From: Philip Helger Date: Fri, 19 Aug 2022 16:37:20 +0200 Subject: [PATCH 5/7] [maven-release-plugin] prepare release de4a-parent-pom-0.2.4 --- de4a-connector/pom.xml | 2 +- pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/de4a-connector/pom.xml b/de4a-connector/pom.xml index 9e2cad1d..57f4d4bd 100644 --- a/de4a-connector/pom.xml +++ b/de4a-connector/pom.xml @@ -4,7 +4,7 @@ eu.de4a de4a-parent-pom - 0.2.4-SNAPSHOT + 0.2.4 de4a-connector war diff --git a/pom.xml b/pom.xml index 95d34008..8a74350f 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ eu.de4a de4a-parent-pom - 0.2.4-SNAPSHOT + 0.2.4 pom de4a-parent-pom Base POM to build the DE4A projects @@ -26,7 +26,7 @@ scm:git:git@github.com:de4a-wp5/de4a.git scm:git:git@github.com:de4a-wp5/de4a.git http://github.com/de4a-wp5/de4a - HEAD + de4a-parent-pom-0.2.4 From 533e7b3b06b37967310072bb963921a900df7449 Mon Sep 17 00:00:00 2001 From: Philip Helger Date: Fri, 19 Aug 2022 16:37:24 +0200 Subject: [PATCH 6/7] [maven-release-plugin] prepare for next development iteration --- de4a-connector/pom.xml | 2 +- pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/de4a-connector/pom.xml b/de4a-connector/pom.xml index 57f4d4bd..625a135c 100644 --- a/de4a-connector/pom.xml +++ b/de4a-connector/pom.xml @@ -4,7 +4,7 @@ eu.de4a de4a-parent-pom - 0.2.4 + 0.2.5-SNAPSHOT de4a-connector war diff --git a/pom.xml b/pom.xml index 8a74350f..4ddec7dd 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ eu.de4a de4a-parent-pom - 0.2.4 + 0.2.5-SNAPSHOT pom de4a-parent-pom Base POM to build the DE4A projects @@ -26,7 +26,7 @@ scm:git:git@github.com:de4a-wp5/de4a.git scm:git:git@github.com:de4a-wp5/de4a.git http://github.com/de4a-wp5/de4a - de4a-parent-pom-0.2.4 + HEAD From 8efe0805e4973ac21435abba90519cd53ac06eb0 Mon Sep 17 00:00:00 2001 From: Philip Helger Date: Fri, 19 Aug 2022 16:38:00 +0200 Subject: [PATCH 7/7] [maven-release-plugin] rollback the release of de4a-parent-pom-0.2.4 --- de4a-connector/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/de4a-connector/pom.xml b/de4a-connector/pom.xml index 625a135c..9e2cad1d 100644 --- a/de4a-connector/pom.xml +++ b/de4a-connector/pom.xml @@ -4,7 +4,7 @@ eu.de4a de4a-parent-pom - 0.2.5-SNAPSHOT + 0.2.4-SNAPSHOT de4a-connector war diff --git a/pom.xml b/pom.xml index 4ddec7dd..95d34008 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ eu.de4a de4a-parent-pom - 0.2.5-SNAPSHOT + 0.2.4-SNAPSHOT pom de4a-parent-pom Base POM to build the DE4A projects