roaster #40 microprofile verzió emelése 4.x-re

i-Cell-Mobilsoft-Open-Source · Dec 8, 2021 · 1be57b6 · 1be57b6
1 parent 5af93d9
commit 1be57b6
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 2 deletions.
diff --git 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
@@ -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,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>
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,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
@@ -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