From 596119ebd7b661dc534140fd3e8638ef6b6571db Mon Sep 17 00:00:00 2001 From: Victor Aysev Date: Fri, 16 Aug 2024 03:26:42 -0500 Subject: [PATCH] refactored pom dependencies for #1012 (#1018) use dependency management + specify only the needed dependecies in submodules --- pom.xml | 39 +++++++++++++++++++++++++++++++- sootup.analysis/pom.xml | 8 +++---- sootup.callgraph/pom.xml | 33 +++++++++++++++++++-------- sootup.codepropertygraph/pom.xml | 5 +++- sootup.core/pom.xml | 34 +++++++++++++++++++++++++--- sootup.examples/pom.xml | 15 ++++++------ sootup.java.bytecode/pom.xml | 30 +++++++++++++++++++++--- sootup.java.core/pom.xml | 21 ++++++++++++++++- sootup.java.sourcecode/pom.xml | 14 ++++++++++-- sootup.jimple.parser/pom.xml | 13 ++++++++--- sootup.qilin/pom.xml | 13 +++++++---- sootup.tests/pom.xml | 13 +++++------ 12 files changed, 192 insertions(+), 46 deletions(-) diff --git a/pom.xml b/pom.xml index d7afd3dbe40..cbcbcee801e 100644 --- a/pom.xml +++ b/pom.xml @@ -371,8 +371,8 @@ + - org.slf4j slf4j-api @@ -412,7 +412,44 @@ jsr305 3.0.2 + + org.soot-oss + sootup.callgraph + ${project.version} + + + org.soot-oss + sootup.core + ${project.version} + + + org.soot-oss + sootup.java.core + ${project.version} + + + org.soot-oss + sootup.java.bytecode + ${project.version} + + + org.soot-oss + sootup.java.sourcecode + ${project.version} + + + org.soot-oss + sootup.jimple.parser + ${project.version} + + + org.soot-oss + sootup.analysis + ${project.version} + + + diff --git a/sootup.analysis/pom.xml b/sootup.analysis/pom.xml index 7776aa8179c..3d7dbc75c4b 100644 --- a/sootup.analysis/pom.xml +++ b/sootup.analysis/pom.xml @@ -16,21 +16,21 @@ org.soot-oss sootup.callgraph - ${project.version} org.soot-oss sootup.java.bytecode - ${project.version} test org.soot-oss sootup.java.sourcecode - ${project.version} test - + + org.junit.jupiter + junit-jupiter-api + de.upb.cs.swt heros diff --git a/sootup.callgraph/pom.xml b/sootup.callgraph/pom.xml index a408d80c47d..09a1b3b6b22 100644 --- a/sootup.callgraph/pom.xml +++ b/sootup.callgraph/pom.xml @@ -16,37 +16,52 @@ org.soot-oss sootup.core - ${project.version} org.soot-oss sootup.java.core - ${project.version} org.soot-oss sootup.java.bytecode - ${project.version} test org.soot-oss sootup.java.sourcecode - ${project.version} test - org.soot-oss - sootup.jimple.parser - ${project.version} - test + org.soot-oss + sootup.jimple.parser + test - org.jgrapht jgrapht-core 1.3.1 + + com.google.code.findbugs + jsr305 + + + org.slf4j + slf4j-api + + + com.google.guava + guava + + + org.apache.commons + commons-lang3 + + + org.junit.jupiter + junit-jupiter-api + + diff --git a/sootup.codepropertygraph/pom.xml b/sootup.codepropertygraph/pom.xml index 3be19d8bfae..aaaf9b0e16d 100644 --- a/sootup.codepropertygraph/pom.xml +++ b/sootup.codepropertygraph/pom.xml @@ -36,7 +36,6 @@ org.soot-oss sootup.analysis - ${project.version} org.soot-oss @@ -44,5 +43,9 @@ ${project.version} test + + org.junit.jupiter + junit-jupiter-api + diff --git a/sootup.core/pom.xml b/sootup.core/pom.xml index 1fa9104f3d2..aceeddd6dd1 100644 --- a/sootup.core/pom.xml +++ b/sootup.core/pom.xml @@ -1,10 +1,10 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 SootUp Core - sootup.core + sootup.core jar org.soot-oss @@ -19,5 +19,33 @@ 1.3.1 compile + + + com.google.guava + guava + + + + + org.slf4j + slf4j-api + + + + + com.google.code.findbugs + jsr305 + + + + org.apache.commons + commons-lang3 + + + + org.junit.jupiter + junit-jupiter-api + test + diff --git a/sootup.examples/pom.xml b/sootup.examples/pom.xml index 769679c247b..ea82e214df9 100644 --- a/sootup.examples/pom.xml +++ b/sootup.examples/pom.xml @@ -15,33 +15,32 @@ org.soot-oss sootup.callgraph - ${project.version} org.soot-oss sootup.core - ${project.version} org.soot-oss - sootup.java.bytecode - ${project.version} + sootup.java.core org.soot-oss - sootup.java.core - ${project.version} + sootup.java.bytecode org.soot-oss sootup.java.sourcecode - ${project.version} org.soot-oss sootup.jimple.parser - ${project.version} + + org.junit.jupiter + junit-jupiter-api + + diff --git a/sootup.java.bytecode/pom.xml b/sootup.java.bytecode/pom.xml index a868d167877..cdba91f9f6e 100644 --- a/sootup.java.bytecode/pom.xml +++ b/sootup.java.bytecode/pom.xml @@ -16,12 +16,10 @@ org.soot-oss sootup.core - ${project.version} org.soot-oss sootup.java.core - ${project.version} org.ow2.asm @@ -38,6 +36,32 @@ dex2jar 2.4.16 - + + com.google.code.findbugs + jsr305 + 3.0.2 + + + org.slf4j + slf4j-api + ${slf4j.version} + + + com.google.guava + guava + + + commons-io + commons-io + + + org.junit.jupiter + junit-jupiter-api + + + org.apache.commons + commons-lang3 + + diff --git a/sootup.java.core/pom.xml b/sootup.java.core/pom.xml index 838555b0a42..7073834405d 100644 --- a/sootup.java.core/pom.xml +++ b/sootup.java.core/pom.xml @@ -17,9 +17,28 @@ org.soot-oss sootup.core - ${project.version} + + org.slf4j + slf4j-api + + + + org.apache.commons + commons-lang3 + + + + com.google.guava + guava + + + + org.junit.jupiter + junit-jupiter-api + + diff --git a/sootup.java.sourcecode/pom.xml b/sootup.java.sourcecode/pom.xml index b14ac745301..26e25a47ff4 100644 --- a/sootup.java.sourcecode/pom.xml +++ b/sootup.java.sourcecode/pom.xml @@ -69,12 +69,10 @@ org.soot-oss sootup.core - ${project.version} org.soot-oss sootup.java.core - ${project.version} @@ -384,5 +382,17 @@ com.ibm.wala.dalvik ${wala.version} + + com.google.guava + guava + + + org.slf4j + slf4j-api + + + org.junit.jupiter + junit-jupiter-api + diff --git a/sootup.jimple.parser/pom.xml b/sootup.jimple.parser/pom.xml index 0fb1260e12e..74f4b572942 100644 --- a/sootup.jimple.parser/pom.xml +++ b/sootup.jimple.parser/pom.xml @@ -49,19 +49,16 @@ org.soot-oss sootup.core - ${project.version} org.soot-oss sootup.java.sourcecode - ${project.version} org.soot-oss sootup.java.core - ${project.version} @@ -71,5 +68,15 @@ 4.9.3 + + org.junit.jupiter + junit-jupiter-api + + + + commons-io + commons-io + + \ No newline at end of file diff --git a/sootup.qilin/pom.xml b/sootup.qilin/pom.xml index 31556a65a5f..b5b8f846811 100644 --- a/sootup.qilin/pom.xml +++ b/sootup.qilin/pom.xml @@ -17,22 +17,18 @@ org.soot-oss sootup.core - ${project.version} org.soot-oss sootup.java.core - ${project.version} org.soot-oss sootup.java.bytecode - ${project.version} org.soot-oss sootup.callgraph - ${project.version} @@ -58,6 +54,15 @@ 4.13.1 test + + org.apache.commons + commons-lang3 + + + commons-io + commons-io + + diff --git a/sootup.tests/pom.xml b/sootup.tests/pom.xml index 3289614075b..45f08cbec7a 100644 --- a/sootup.tests/pom.xml +++ b/sootup.tests/pom.xml @@ -17,34 +17,33 @@ org.soot-oss sootup.core - ${project.version} org.soot-oss sootup.java.core - ${project.version} org.soot-oss sootup.java.bytecode - ${project.version} org.soot-oss sootup.java.sourcecode - ${project.version} org.soot-oss sootup.jimple.parser - ${project.version} org.soot-oss sootup.callgraph - ${project.version} - + + org.junit.jupiter + junit-jupiter-api + + +