From 5af93d933e24dbd6f717d3ab48be35ed1988269f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=B3=20Bal=C3=A1zs?= <balazs.joo@icellmobilsoft.hu>
Date: Wed, 8 Dec 2021 13:21:13 +0100
Subject: [PATCH 1/4] =?UTF-8?q?roaster=20#40=20microprofile=20verzi=C3=B3?=
 =?UTF-8?q?=20emel=C3=A9se=204.x-re?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 coffee-bom/pom.xml                    | 4 ++--
 docs/migration/migration170to180.adoc | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/coffee-bom/pom.xml b/coffee-bom/pom.xml
index fef3bfe73..5085df585 100644
--- a/coffee-bom/pom.xml
+++ b/coffee-bom/pom.xml
@@ -26,7 +26,7 @@
 		<version.commons-codec>1.10</version.commons-codec>
 		<version.commons-collections>3.2.2</version.commons-collections>
 		<version.commons-io>2.8.0</version.commons-io>
-		<version.org.eclipse.microprofile.config>1.3</version.org.eclipse.microprofile.config>
+		<version.org.eclipse.microprofile.config>2.0</version.org.eclipse.microprofile.config>
 		<version.org.jboss.resteasy>3.6.2.Final</version.org.jboss.resteasy>
 		<version.org.hibernate>5.3.7.Final</version.org.hibernate>
 		<version.org.hibernate.validator>6.0.20.Final</version.org.hibernate.validator>
@@ -37,7 +37,7 @@
 		<version.org.jboss.weld.weld-junit5>2.0.1.Final</version.org.jboss.weld.weld-junit5>
 		<version.org.mockito>3.2.0</version.org.mockito>
 		<version.glassfish.javax.el>2.2.4</version.glassfish.javax.el>
-		<version.smallrye-config>1.7.0</version.smallrye-config>
+		<version.smallrye-config>2.0.2</version.smallrye-config>
 	</properties>
 
 	<dependencyManagement>
diff --git a/docs/migration/migration170to180.adoc b/docs/migration/migration170to180.adoc
index 86af6e3b3..e92b315cd 100644
--- a/docs/migration/migration170to180.adoc
+++ b/docs/migration/migration170to180.adoc
@@ -14,6 +14,15 @@ A változtatások nem eredményeznek átállási munkálatokat, visszafelé komp
 
 == Változások
 
+=== Általános
+
+==== BOM verzió emelések:
+* microprofile-config-api 1.3 -> 2.0
+* smallrye-config 1.7.0 -> 2.0.2
+
+==== Átállás
+A változtatások nem eredményeznek átállási munkálatokat, visszafelé kompatibilis.
+
 === coffee-rest
 * "coffee.app.name" paraméterben megadható érték már nem kötelező, alapértelmezetten a "java:app/AppName" van használva.
 * JaxbTool kiegészítése `byte[]` fogadására képes unmarshalXML metódusokkal

From 1be57b6c23a194603d6a6bc3f4ac6032c4562636 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=B3=20Bal=C3=A1zs?= <balazs.joo@icellmobilsoft.hu>
Date: Wed, 8 Dec 2021 14:08:06 +0100
Subject: [PATCH 2/4] =?UTF-8?q?roaster=20#40=20microprofile=20verzi=C3=B3?=
 =?UTF-8?q?=20emel=C3=A9se=204.x-re?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 coffee-bom/pom.xml                          | 15 +++++++++++++++
 coffee-dto/coffee-dto-gen/pom.xml           |  2 +-
 coffee-module/coffee-module-mongodb/pom.xml |  9 +++++++++
 coffee-module/coffee-module-mp/pom.xml      |  2 +-
 coffee-module/coffee-module-totp/pom.xml    |  8 ++++++++
 docs/migration/migration170to180.adoc       |  2 ++
 6 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/coffee-bom/pom.xml b/coffee-bom/pom.xml
index 5085df585..ffcf75bd3 100644
--- a/coffee-bom/pom.xml
+++ b/coffee-bom/pom.xml
@@ -38,6 +38,8 @@
 		<version.org.mockito>3.2.0</version.org.mockito>
 		<version.glassfish.javax.el>2.2.4</version.glassfish.javax.el>
 		<version.smallrye-config>2.0.2</version.smallrye-config>
+		<version.org.osgi.service.cdi>1.0.0</version.org.osgi.service.cdi>
+		<version.osgi.annotation>7.0.0</version.osgi.annotation>
 	</properties>
 
 	<dependencyManagement>
@@ -416,6 +418,19 @@
 					</exclusion>
 				</exclusions>
 			</dependency>
+
+			<dependency>
+				<groupId>org.osgi</groupId>
+				<artifactId>org.osgi.service.cdi</artifactId>
+				<version>${version.org.osgi.service.cdi}</version>
+				<scope>provided</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.osgi</groupId>
+				<artifactId>osgi.annotation</artifactId>
+				<version>${version.osgi.annotation}</version>
+				<scope>provided</scope>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 
diff --git a/coffee-dto/coffee-dto-gen/pom.xml b/coffee-dto/coffee-dto-gen/pom.xml
index 6ab62de28..b0fcbe586 100644
--- a/coffee-dto/coffee-dto-gen/pom.xml
+++ b/coffee-dto/coffee-dto-gen/pom.xml
@@ -21,7 +21,7 @@
 		<dependency>
 			<groupId>org.eclipse.microprofile.openapi</groupId>
 			<artifactId>microprofile-openapi-api</artifactId>
-			<version>1.0.1</version>
+			<version>2.0</version>
 		</dependency>
 
 		<!--Test dependecies -->
diff --git a/coffee-module/coffee-module-mongodb/pom.xml b/coffee-module/coffee-module-mongodb/pom.xml
index f5aed034e..6f6eef26c 100644
--- a/coffee-module/coffee-module-mongodb/pom.xml
+++ b/coffee-module/coffee-module-mongodb/pom.xml
@@ -25,5 +25,14 @@
 			<artifactId>commons-collections</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.osgi</groupId>
+			<artifactId>org.osgi.service.cdi</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.osgi</groupId>
+			<artifactId>osgi.annotation</artifactId>
+		</dependency>
+
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/coffee-module/coffee-module-mp/pom.xml b/coffee-module/coffee-module-mp/pom.xml
index 1d57e883b..4ae4f87c2 100644
--- a/coffee-module/coffee-module-mp/pom.xml
+++ b/coffee-module/coffee-module-mp/pom.xml
@@ -19,7 +19,7 @@
 			<dependency>
 				<groupId>org.eclipse.microprofile</groupId>
 				<artifactId>microprofile</artifactId>
-				<version>3.1</version>
+				<version>4.0</version>
 				<scope>import</scope>
 				<type>pom</type>
 			</dependency>
diff --git a/coffee-module/coffee-module-totp/pom.xml b/coffee-module/coffee-module-totp/pom.xml
index ee4ac1be7..68eeff513 100644
--- a/coffee-module/coffee-module-totp/pom.xml
+++ b/coffee-module/coffee-module-totp/pom.xml
@@ -31,5 +31,13 @@
 			<groupId>io.smallrye.config</groupId>
 			<artifactId>smallrye-config</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.osgi</groupId>
+			<artifactId>org.osgi.service.cdi</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.osgi</groupId>
+			<artifactId>osgi.annotation</artifactId>
+		</dependency>
 	</dependencies>
 </project>
diff --git a/docs/migration/migration170to180.adoc b/docs/migration/migration170to180.adoc
index e92b315cd..3e8635d93 100644
--- a/docs/migration/migration170to180.adoc
+++ b/docs/migration/migration170to180.adoc
@@ -17,7 +17,9 @@ A változtatások nem eredményeznek átállási munkálatokat, visszafelé komp
 === Általános
 
 ==== BOM verzió emelések:
+* microprofile 3.1 -> 4.0
 * microprofile-config-api 1.3 -> 2.0
+* microprofile-openapi-api 1.0.1 -> 2.0
 * smallrye-config 1.7.0 -> 2.0.2
 
 ==== Átállás

From 14f9663f0bc5c2f3c810b02ccfd46589057a3866 Mon Sep 17 00:00:00 2001
From: Imre Scheffer <imre.scheffer@icellmobilsoft.hu>
Date: Wed, 29 Dec 2021 12:15:33 +0100
Subject: [PATCH 3/4] =?UTF-8?q?#40=20microprofile=20verzi=C3=B3=20emel?=
 =?UTF-8?q?=C3=A9se=204.x-re?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

dependency clearing
---
 coffee-bom/pom.xml                          | 25 ++++++++-------------
 coffee-module/coffee-module-mongodb/pom.xml |  5 +----
 coffee-module/coffee-module-totp/pom.xml    |  5 +----
 3 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/coffee-bom/pom.xml b/coffee-bom/pom.xml
index ffcf75bd3..7ab11f100 100644
--- a/coffee-bom/pom.xml
+++ b/coffee-bom/pom.xml
@@ -27,6 +27,7 @@
 		<version.commons-collections>3.2.2</version.commons-collections>
 		<version.commons-io>2.8.0</version.commons-io>
 		<version.org.eclipse.microprofile.config>2.0</version.org.eclipse.microprofile.config>
+		<version.osgi.annotation>7.0.0</version.osgi.annotation>
 		<version.org.jboss.resteasy>3.6.2.Final</version.org.jboss.resteasy>
 		<version.org.hibernate>5.3.7.Final</version.org.hibernate>
 		<version.org.hibernate.validator>6.0.20.Final</version.org.hibernate.validator>
@@ -37,9 +38,7 @@
 		<version.org.jboss.weld.weld-junit5>2.0.1.Final</version.org.jboss.weld.weld-junit5>
 		<version.org.mockito>3.2.0</version.org.mockito>
 		<version.glassfish.javax.el>2.2.4</version.glassfish.javax.el>
-		<version.smallrye-config>2.0.2</version.smallrye-config>
-		<version.org.osgi.service.cdi>1.0.0</version.org.osgi.service.cdi>
-		<version.osgi.annotation>7.0.0</version.osgi.annotation>
+		<version.smallrye-config>2.8.1</version.smallrye-config>
 	</properties>
 
 	<dependencyManagement>
@@ -341,6 +340,13 @@
 				<artifactId>microprofile-config-api</artifactId>
 				<version>${version.org.eclipse.microprofile.config}</version>
 			</dependency>
+			<!-- microprofile-config-api 2.0 bug: https://github.com/eclipse/microprofile-config/issues/716 javitas utan kiszedni -->
+			<dependency>
+				<groupId>org.osgi</groupId>
+				<artifactId>osgi.annotation</artifactId>
+				<version>${version.osgi.annotation}</version>
+				<scope>provided</scope>
+			</dependency>
 
 			<dependency>
 				<groupId>org.jboss.resteasy</groupId>
@@ -418,19 +424,6 @@
 					</exclusion>
 				</exclusions>
 			</dependency>
-
-			<dependency>
-				<groupId>org.osgi</groupId>
-				<artifactId>org.osgi.service.cdi</artifactId>
-				<version>${version.org.osgi.service.cdi}</version>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.osgi</groupId>
-				<artifactId>osgi.annotation</artifactId>
-				<version>${version.osgi.annotation}</version>
-				<scope>provided</scope>
-			</dependency>
 		</dependencies>
 	</dependencyManagement>
 
diff --git a/coffee-module/coffee-module-mongodb/pom.xml b/coffee-module/coffee-module-mongodb/pom.xml
index 6f6eef26c..3e2472366 100644
--- a/coffee-module/coffee-module-mongodb/pom.xml
+++ b/coffee-module/coffee-module-mongodb/pom.xml
@@ -25,10 +25,7 @@
 			<artifactId>commons-collections</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>org.osgi</groupId>
-			<artifactId>org.osgi.service.cdi</artifactId>
-		</dependency>
+		<!-- https://github.com/eclipse/microprofile-config/issues/716 javitas utan kiszedni -->
 		<dependency>
 			<groupId>org.osgi</groupId>
 			<artifactId>osgi.annotation</artifactId>
diff --git a/coffee-module/coffee-module-totp/pom.xml b/coffee-module/coffee-module-totp/pom.xml
index 68eeff513..198b87976 100644
--- a/coffee-module/coffee-module-totp/pom.xml
+++ b/coffee-module/coffee-module-totp/pom.xml
@@ -31,10 +31,7 @@
 			<groupId>io.smallrye.config</groupId>
 			<artifactId>smallrye-config</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.osgi</groupId>
-			<artifactId>org.osgi.service.cdi</artifactId>
-		</dependency>
+		<!-- https://github.com/eclipse/microprofile-config/issues/716 javitas utan kiszedni -->
 		<dependency>
 			<groupId>org.osgi</groupId>
 			<artifactId>osgi.annotation</artifactId>

From 9ead30fad54cef6a01ff9428ad53260dad19fcc4 Mon Sep 17 00:00:00 2001
From: Imre Scheffer <imre.scheffer@icellmobilsoft.hu>
Date: Wed, 29 Dec 2021 12:19:27 +0100
Subject: [PATCH 4/4] =?UTF-8?q?#40=20microprofile=20verzi=C3=B3=20emel?=
 =?UTF-8?q?=C3=A9se=204.x-re?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

doc clearing
---
 docs/migration/migration170to180.adoc | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/docs/migration/migration170to180.adoc b/docs/migration/migration170to180.adoc
index 3e8635d93..8c9a0bec9 100644
--- a/docs/migration/migration170to180.adoc
+++ b/docs/migration/migration170to180.adoc
@@ -17,13 +17,9 @@ A változtatások nem eredményeznek átállási munkálatokat, visszafelé komp
 === Általános
 
 ==== BOM verzió emelések:
-* microprofile 3.1 -> 4.0
 * microprofile-config-api 1.3 -> 2.0
-* microprofile-openapi-api 1.0.1 -> 2.0
-* smallrye-config 1.7.0 -> 2.0.2
-
-==== Átállás
-A változtatások nem eredményeznek átállási munkálatokat, visszafelé kompatibilis.
+* smallrye-config 1.7.0 -> 2.8.1
+* opencsv 3.9 -> 5.5.2
 
 === coffee-rest
 * "coffee.app.name" paraméterben megadható érték már nem kötelező, alapértelmezetten a "java:app/AppName" van használva.