Merge branch 'master' into vdrokov_fix_TESB-31516_master

2021-01-22 15:12:44 +02:00 · 2021-01-21 12:09:41 +02:00 · 2020-12-23 15:03:50 +02:00 · 2020-12-22 18:48:00 +02:00
2 changed files with 10 additions and 5 deletions
--- a/main/plugins/org.talend.designer.maven.tos/resources/components/pom.xml
+++ b/main/plugins/org.talend.designer.maven.tos/resources/components/pom.xml
@@ -56,13 +56,13 @@
                <version>17</version>
                <type>pom</type>
            </dependency>             
-            <!-- It fixes provided dependency scope to compile, because maven-dependency-plugin is setup to include
-             only compile and runtime scopes, but provided is also required. It's not possible to setup plugin to
+            <!-- It fixes provided dependency scope to compile, because maven-dependency-plugin is setup to include
+             only compile and runtime scopes, but provided is also required. It's not possible to setup plugin to
             include all: compile, runtime and provided dependencies -->
            <dependency>
                <groupId>biz.aQute.bnd</groupId>
                <artifactId>annotation</artifactId>
-                <version>2.4.0</version>
+                <version>3.5.0</version>
                <scope>compile</scope>
            </dependency>
            <dependency>
@@ -161,7 +161,7 @@
            <artifactId>components-api</artifactId>
            <version>${components.version}</version>
        </dependency>
-        <!-- Dependencies in provided scope should be explicitly added as dependency in this module,
+        <!-- Dependencies in provided scope should be explicitly added as dependency in this module,
            because provided scope is not transitive -->
 		<dependency>
            <groupId>org.osgi</groupId>
--- a/main/plugins/org.talend.libraries.apache/pom.xml
+++ b/main/plugins/org.talend.libraries.apache/pom.xml
@@ -11,7 +11,7 @@
 	<packaging>eclipse-plugin</packaging>
 	<properties>
 		<log4j.version>1.2.17</log4j.version>
-		<slf4j.version>1.7.25</slf4j.version>
+		<slf4j.version>1.7.29</slf4j.version>
 		<log4j2.version>2.12.1</log4j2.version>
 	</properties>
 	<dependencies>
@@ -35,6 +35,11 @@
 			<artifactId>jcl-over-slf4j</artifactId>
 			<version>${slf4j.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>${slf4j.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>jul-to-slf4j</artifactId>
Author	SHA1	Message	Date
vdrokov	ecabaed53b	Merge branch 'master' into vdrokov_fix_TESB-31516_master	2021-01-22 15:12:44 +02:00
vdrokov	09919a9c12	Merge branch 'master' into vdrokov_fix_TESB-31516_master	2021-01-21 12:09:41 +02:00
vdrokov	12623a96ef	Merge branch 'master' into vdrokov_fix_TESB-31516_master	2020-12-23 15:03:50 +02:00
vdrokov	29aa5a968d	TESB-31516: Fail to Build Route to get result kar file in studio and CI	2020-12-22 18:48:00 +02:00