Merge pull request #826: [infra] O2-Czech-Republic#316 fix dependenci…

…es pom in generated pom
datadrivencz · Aug 21, 2023 · b824947 · b824947
2 parents 2d5edad + 6779e3b
commit b824947
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -413,24 +413,24 @@ def publishArtifacts(project, scope) {
             }
 
             configurations.compileClasspath.allDependencies
-                .findAll {!configurations.intoShadow.dependencies.contains(it) }
+                .findAll { isExplicitScope(configurations, it) }
                 .each {
 
               processDependency(dependenciesNode, it, "compile")
             }
 
             configurations.runtimeClasspath.allDependencies
-                .findAll {!configurations.intoShadow.allDependencies.contains(it) }
-                .findAll {!configurations.compileClasspath.allDependencies.contains(it) }
+                .findAll { !configurations.compileClasspath.allDependencies.contains(it) }
+                .findAll { isExplicitScope(configurations, it) }
                 .each {
 
               processDependency(dependenciesNode, it, "runtime")
             }
 
             configurations.testRuntimeClasspath.allDependencies
-                .findAll {!configurations.intoShadow.allDependencies.contains(it) }
-                .findAll {!configurations.compileClasspath.allDependencies.contains(it) }
-                .findAll {!configurations.runtimeClasspath.allDependencies.contains(it) }
+                .findAll { !configurations.compileClasspath.allDependencies.contains(it)
+                    && !configurations.runtimeClasspath.allDependencies.contains(it) }
+                .findAll { isExplicitScope(configurations, it) }
                 .each {
 
               processDependency(dependenciesNode, it, "test")
@@ -501,3 +501,10 @@ def publishArtifacts(project, scope) {
     }
   }
 }
+
+def isExplicitScope(configurations, dependency) {
+  !configurations.intoShadow.allDependencies.contains(dependency)
+    && !configurations.compileOnly.allDependencies.contains(dependency)
+    && !configurations.compileAnnotationProcessor.allDependencies.contains(dependency)
+    && !configurations.provided.allDependencies.contains(dependency)
+}
diff --git a/buildSrc/src/main/groovy/cz.o2.proxima.java-conventions.gradle b/buildSrc/src/main/groovy/cz.o2.proxima.java-conventions.gradle
@@ -51,7 +51,7 @@ ext.libraries = [
   beam_extensions_kryo: "org.apache.beam:beam-sdks-java-extensions-kryo:${beam_version}",
   beam_io_google_cloud: "org.apache.beam:beam-sdks-java-io-google-cloud-platform:${beam_version}",
   beam_runners_direct: "org.apache.beam:beam-runners-direct-java:${beam_version}",
-  beam_runners_flink: "org.apache.beam:beam-runners-flink-1.15:${beam_version}",
+  beam_runners_flink: "org.apache.beam:beam-runners-flink-1.16:${beam_version}",
   beam_runners_spark: "org.apache.beam:beam-runners-spark-3:${beam_version}",
   flink_clients: "org.apache.flink:flink-clients:${flink_version}",
   flink_runtime: "org.apache.flink:flink-runtime:${flink_version}",