From 316b94c2fc9b82e8cd7a3f64c91d44a31fa4a6e7 Mon Sep 17 00:00:00 2001
From: Roeland Luykx <roeland.luykx@raly.ch>
Date: Thu, 5 Dec 2024 16:43:31 +0100
Subject: [PATCH 1/3] fix possible publish error with linebreak (#24)

---
 .../husky-fhir-emed-ch-epr-narrative/pom.xml           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/husky-fhir/husky-fhir-emed-ch/husky-fhir-emed-ch-epr-narrative/pom.xml b/husky-fhir/husky-fhir-emed-ch/husky-fhir-emed-ch-epr-narrative/pom.xml
index a24161e5e6..dac6f6a627 100644
--- a/husky-fhir/husky-fhir-emed-ch/husky-fhir-emed-ch-epr-narrative/pom.xml
+++ b/husky-fhir/husky-fhir-emed-ch/husky-fhir-emed-ch-epr-narrative/pom.xml
@@ -1,9 +1,9 @@
-<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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>
-		husky-fhir-emed-ch-epr-narrative</artifactId>
-	<name>Husky FHIR eMedication
-		Switzerland EPR Narrative</name>
+	<artifactId>husky-fhir-emed-ch-epr-narrative</artifactId>
+	<name>Husky FHIR eMed EPR Narrative</name>
 	<parent>
 		<artifactId>husky-fhir-emed-ch</artifactId>
 		<groupId>org.projecthusky.fhir.emed.ch</groupId>

From ca9a6568d7106cb258ac1337e6f14aed584ac7e9 Mon Sep 17 00:00:00 2001
From: Roeland Luykx <roeland.luykx@raly.ch>
Date: Thu, 5 Dec 2024 16:44:37 +0100
Subject: [PATCH 2/3] some cleanup and plugin version updates

---
 husky-common/husky-common-at/pom.xml          |  9 --
 husky-common/husky-common-ch/pom.xml          |  9 --
 husky-common/husky-common-gen/pom.xml         |  9 --
 .../husky-fhir-structures-ch/pom.xml          |  9 --
 .../husky-fhir-structures-gen/pom.xml         | 25 ++----
 pom.xml                                       | 87 ++++++++-----------
 6 files changed, 46 insertions(+), 102 deletions(-)

diff --git a/husky-common/husky-common-at/pom.xml b/husky-common/husky-common-at/pom.xml
index e7cb5d8785..581a5d0b8c 100644
--- a/husky-common/husky-common-at/pom.xml
+++ b/husky-common/husky-common-at/pom.xml
@@ -44,15 +44,6 @@
 	</dependencies>
 
 	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-jar-plugin</artifactId>
-					<version>2.6</version>
-				</plugin>
-			</plugins>
-		</pluginManagement>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
diff --git a/husky-common/husky-common-ch/pom.xml b/husky-common/husky-common-ch/pom.xml
index 6e98b6f4d7..cddb296683 100644
--- a/husky-common/husky-common-ch/pom.xml
+++ b/husky-common/husky-common-ch/pom.xml
@@ -43,15 +43,6 @@
 	</dependencies>
 
 	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-jar-plugin</artifactId>
-					<version>2.6</version>
-				</plugin>
-			</plugins>
-		</pluginManagement>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
diff --git a/husky-common/husky-common-gen/pom.xml b/husky-common/husky-common-gen/pom.xml
index 87b33acbd3..c786db9134 100644
--- a/husky-common/husky-common-gen/pom.xml
+++ b/husky-common/husky-common-gen/pom.xml
@@ -103,15 +103,6 @@
 	</dependencies>
 
 	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-jar-plugin</artifactId>
-					<version>2.6</version>
-				</plugin>
-			</plugins>
-		</pluginManagement>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
diff --git a/husky-fhir/husky-fhir-structures/husky-fhir-structures-ch/pom.xml b/husky-fhir/husky-fhir-structures/husky-fhir-structures-ch/pom.xml
index 3f7a8ed0e7..4dbad57442 100644
--- a/husky-fhir/husky-fhir-structures/husky-fhir-structures-ch/pom.xml
+++ b/husky-fhir/husky-fhir-structures/husky-fhir-structures-ch/pom.xml
@@ -36,15 +36,6 @@
 	</dependencies>
 
 	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-jar-plugin</artifactId>
-					<version>2.6</version>
-				</plugin>
-			</plugins>
-		</pluginManagement>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
diff --git a/husky-fhir/husky-fhir-structures/husky-fhir-structures-gen/pom.xml b/husky-fhir/husky-fhir-structures/husky-fhir-structures-gen/pom.xml
index 4ee206c2d4..93e32d8f73 100644
--- a/husky-fhir/husky-fhir-structures/husky-fhir-structures-gen/pom.xml
+++ b/husky-fhir/husky-fhir-structures/husky-fhir-structures-gen/pom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0"?>
-<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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>husky-fhir-structures-gen</artifactId>
 	<name>Husky FHIR Structures Generic</name>
@@ -14,9 +16,9 @@
 	<dependencies>
 		<!-- own modules -->
 		<dependency>
-                        <groupId>org.projecthusky.common</groupId>
-                        <artifactId>husky-common-gen</artifactId>
-                        <version>3.0.2-SNAPSHOT</version>
+			<groupId>org.projecthusky.common</groupId>
+			<artifactId>husky-common-gen</artifactId>
+			<version>3.0.2-SNAPSHOT</version>
 		</dependency>
 
 		<!-- other dependencies -->
@@ -25,9 +27,9 @@
 			<artifactId>hapi-fhir-structures-r4</artifactId>
 		</dependency>
 		<dependency>
-                        <groupId>ca.uhn.hapi.fhir</groupId>
-                        <artifactId>hapi-fhir-validation-resources-r4</artifactId>
-                </dependency>
+			<groupId>ca.uhn.hapi.fhir</groupId>
+			<artifactId>hapi-fhir-validation-resources-r4</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
@@ -47,15 +49,6 @@
 	</dependencies>
 
 	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-jar-plugin</artifactId>
-					<version>2.6</version>
-				</plugin>
-			</plugins>
-		</pluginManagement>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
diff --git a/pom.xml b/pom.xml
index 9f471f95b3..96fde09027 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,6 @@
-<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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.projecthusky</groupId>
 	<artifactId>husky-api</artifactId>
@@ -70,11 +72,6 @@
 			<name>husky-snapshots</name>
 			<url>https://archiva.et-innovations.org/repository/snapshots/</url>
 		</snapshotRepository>
-		<repository>
-			<id>husky-releases</id>
-			<name>husky-releases</name>
-			<url>https://archiva.et-innovations.org/repository/internal/</url>
-		</repository>
 	</distributionManagement>
 	<dependencyManagement>
 		<dependencies>
@@ -929,32 +926,32 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-dependency-plugin</artifactId>
-					<version>3.5.0</version>
+					<version>3.8.1</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.10.1</version>
+					<version>3.13.0</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-site-plugin</artifactId>
-					<version>3.12.1</version>
+					<version>3.21.0</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-release-plugin</artifactId>
-					<version>2.5.3</version>
+					<version>3.1.1</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-assembly-plugin</artifactId>
-					<version>3.4.2</version>
+					<version>3.7.1</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-jar-plugin</artifactId>
-					<version>3.3.0</version>
+					<version>3.4.2</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -964,17 +961,17 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>3.6.3</version>
+					<version>3.11.1</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-project-info-reports-plugin</artifactId>
-					<version>3.4.2</version>
+					<version>3.8.0</version>
 				</plugin>
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>build-helper-maven-plugin</artifactId>
-					<version>3.3.0</version>
+					<version>3.6.0</version>
 				</plugin>
 				<plugin>
 					<groupId>com.googlecode.maven-java-formatter-plugin</groupId>
@@ -989,7 +986,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-resources-plugin</artifactId>
-					<version>3.3.0</version>
+					<version>3.3.1</version>
 				</plugin>
 			</plugins>
 		</pluginManagement>
@@ -1214,6 +1211,16 @@
 		</license>
 	</licenses>
 	<profiles>
+		<profile>
+			<id>etinnovations</id>
+			<distributionManagement>
+				<repository>
+					<id>husky-releases</id>
+					<name>husky-releases</name>
+					<url>https://archiva.et-innovations.org/repository/internal/</url>
+				</repository>
+			</distributionManagement>
+		</profile>
 		<profile>
 			<id>release</id>
 			<distributionManagement>
@@ -1229,31 +1236,21 @@
 				</repository>
 			</distributionManagement>
 			<build>
+				<pluginManagement>
+					<plugins>
+						<plugin>
+							<groupId>org.sonatype.plugins</groupId>
+							<artifactId>nexus-staging-maven-plugin</artifactId>
+							<version>1.6.8</version>
+						</plugin>
+						<plugin>
+							<groupId>org.apache.maven.plugins</groupId>
+							<artifactId>maven-gpg-plugin</artifactId>
+							<version>3.2.7</version>
+						</plugin>
+					</plugins>
+				</pluginManagement>
 				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-source-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>attach-sources</id>
-								<goals>
-									<goal>jar-no-fork</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-javadoc-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>attach-javadocs</id>
-								<goals>
-									<goal>jar</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
@@ -1271,16 +1268,6 @@
 							</execution>
 						</executions>
 					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-release-plugin</artifactId>
-						<configuration>
-							<autoVersionSubmodules>true</autoVersionSubmodules>
-							<useReleaseProfile>false</useReleaseProfile>
-							<releaseProfiles>release</releaseProfiles>
-							<goals>deploy</goals>
-						</configuration>
-					</plugin>
 					<plugin>
 						<groupId>org.sonatype.plugins</groupId>
 						<artifactId>nexus-staging-maven-plugin</artifactId>

From 9c7bc6a495a7d28245d4a5c8dadb6f185d2e0485 Mon Sep 17 00:00:00 2001
From: Roeland Luykx <roeland.luykx@raly.ch>
Date: Thu, 5 Dec 2024 16:51:22 +0100
Subject: [PATCH 3/3] add release plugin back

---
 pom.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pom.xml b/pom.xml
index 96fde09027..72b525afa7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1268,6 +1268,16 @@
 							</execution>
 						</executions>
 					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-release-plugin</artifactId>
+						<configuration>
+							<autoVersionSubmodules>true</autoVersionSubmodules>
+							<useReleaseProfile>false</useReleaseProfile>
+							<releaseProfiles>release</releaseProfiles>
+							<goals>deploy</goals>
+						</configuration>
+					</plugin>
 					<plugin>
 						<groupId>org.sonatype.plugins</groupId>
 						<artifactId>nexus-staging-maven-plugin</artifactId>