Merge pull request #224 from i-Cell-Mobilsoft-Open-Source/feature/roa…

…ster-40-microprofile-verzio-emelese-4.x-re roaster #40 microprofile verzió emelése 4.x-re
i-Cell-Mobilsoft-Open-Source · Dec 29, 2021 · f352c53 · f352c53
2 parents 58f846d + 9ead30f
commit f352c53
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 4 deletions.
diff --git a/coffee-bom/pom.xml b/coffee-bom/pom.xml
@@ -27,7 +27,8 @@
 		<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.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>
@@ -38,7 +39,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.8.1</version.smallrye-config>
 	</properties>
 
 	<dependencyManagement>
@@ -356,6 +357,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>

diff --git 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
@@ -25,5 +25,11 @@
 			<artifactId>commons-collections</artifactId>
 		</dependency>
 
+		<!-- https://github.com/eclipse/microprofile-config/issues/716 javitas utan kiszedni -->
+		<dependency>
+			<groupId>org.osgi</groupId>
+			<artifactId>osgi.annotation</artifactId>
+		</dependency>
+
 	</dependencies>
 </project>
diff --git 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
@@ -31,5 +31,10 @@
 			<groupId>io.smallrye.config</groupId>
 			<artifactId>smallrye-config</artifactId>
 		</dependency>
+		<!-- https://github.com/eclipse/microprofile-config/issues/716 javitas utan kiszedni -->
+		<dependency>
+			<groupId>org.osgi</groupId>
+			<artifactId>osgi.annotation</artifactId>
+		</dependency>
 	</dependencies>
 </project>
diff --git a/docs/migration/migration170to180.adoc b/docs/migration/migration170to180.adoc
@@ -25,6 +25,13 @@ Config cache-eléshez a `ApplicationConfiguration` használatos, ami guava cache
 
 == Változások
 
+=== Általános
+
+==== BOM verzió emelések:
+* microprofile-config-api 1.3 -> 2.0
+* 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.
 * JaxbTool kiegészítése `byte[]` fogadására képes unmarshalXML metódusokkal