From be0259b82309a9b0b85e66efecb5eaf20c6a61fb Mon Sep 17 00:00:00 2001 From: uaysev Date: Mon, 12 Aug 2024 17:40:29 -0400 Subject: [PATCH 01/16] refactored pom dependencies for #1012 --- pom.xml | 42 +++++++++++++++++++++++++++++++- sootup.analysis/pom.xml | 3 --- sootup.callgraph/pom.xml | 11 +++------ sootup.codepropertygraph/pom.xml | 1 - sootup.examples/pom.xml | 10 ++------ sootup.java.bytecode/pom.xml | 2 -- sootup.java.core/pom.xml | 1 - sootup.java.sourcecode/pom.xml | 2 -- sootup.jimple.parser/pom.xml | 3 --- sootup.qilin/pom.xml | 4 --- sootup.tests/pom.xml | 6 ----- 11 files changed, 46 insertions(+), 39 deletions(-) diff --git a/pom.xml b/pom.xml index d7afd3dbe40..b2a5d1d6e22 100644 --- a/pom.xml +++ b/pom.xml @@ -371,8 +371,8 @@ + - org.slf4j slf4j-api @@ -412,7 +412,47 @@ 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} + test + + + org.soot-oss + sootup.java.sourcecode + ${project.version} + test + + + org.soot-oss + sootup.jimple.parser + ${project.version} + test + + + org.soot-oss + sootup.analysis + ${project.version} + + + diff --git a/sootup.analysis/pom.xml b/sootup.analysis/pom.xml index 7776aa8179c..985076bdf06 100644 --- a/sootup.analysis/pom.xml +++ b/sootup.analysis/pom.xml @@ -16,18 +16,15 @@ 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 diff --git a/sootup.callgraph/pom.xml b/sootup.callgraph/pom.xml index a408d80c47d..be1f36c5362 100644 --- a/sootup.callgraph/pom.xml +++ b/sootup.callgraph/pom.xml @@ -16,30 +16,25 @@ 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 diff --git a/sootup.codepropertygraph/pom.xml b/sootup.codepropertygraph/pom.xml index 3be19d8bfae..d8e49fb30b8 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 diff --git a/sootup.examples/pom.xml b/sootup.examples/pom.xml index 769679c247b..ba0c3ee8fc6 100644 --- a/sootup.examples/pom.xml +++ b/sootup.examples/pom.xml @@ -15,32 +15,26 @@ 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} diff --git a/sootup.java.bytecode/pom.xml b/sootup.java.bytecode/pom.xml index a868d167877..018298e2812 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 diff --git a/sootup.java.core/pom.xml b/sootup.java.core/pom.xml index 838555b0a42..a6b61b3c703 100644 --- a/sootup.java.core/pom.xml +++ b/sootup.java.core/pom.xml @@ -17,7 +17,6 @@ org.soot-oss sootup.core - ${project.version} diff --git a/sootup.java.sourcecode/pom.xml b/sootup.java.sourcecode/pom.xml index b14ac745301..8d10af0a1e0 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} diff --git a/sootup.jimple.parser/pom.xml b/sootup.jimple.parser/pom.xml index 0fb1260e12e..822bfeeff72 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} diff --git a/sootup.qilin/pom.xml b/sootup.qilin/pom.xml index 31556a65a5f..228cd7e7610 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} diff --git a/sootup.tests/pom.xml b/sootup.tests/pom.xml index 3289614075b..9a77d12ad42 100644 --- a/sootup.tests/pom.xml +++ b/sootup.tests/pom.xml @@ -17,32 +17,26 @@ 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} From 85f99b0f3052dff15e22f9718363e334afbf4a1d Mon Sep 17 00:00:00 2001 From: uaysev Date: Tue, 13 Aug 2024 16:51:52 -0400 Subject: [PATCH 02/16] removed scope on common submodules in general pom.xml file for #1012. --- pom.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/pom.xml b/pom.xml index b2a5d1d6e22..cbcbcee801e 100644 --- a/pom.xml +++ b/pom.xml @@ -431,19 +431,16 @@ 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 From 11eb74ac7b6d1f938dfe45fae2f740798c6b02f3 Mon Sep 17 00:00:00 2001 From: uaysev Date: Thu, 15 Aug 2024 16:47:05 -0400 Subject: [PATCH 03/16] relative path is added. --- sootup.core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sootup.core/pom.xml b/sootup.core/pom.xml index 1fa9104f3d2..5d332a98ef0 100644 --- a/sootup.core/pom.xml +++ b/sootup.core/pom.xml @@ -10,8 +10,8 @@ org.soot-oss sootup 1.3.1-SNAPSHOT + ../pom.xml - org.jgrapht From ff64e8d978e08e1fe392423918a796f564f2048d Mon Sep 17 00:00:00 2001 From: uaysev Date: Thu, 15 Aug 2024 17:07:55 -0400 Subject: [PATCH 04/16] necessary dependencies are added for sootup.core --- sootup.core/pom.xml | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/sootup.core/pom.xml b/sootup.core/pom.xml index 5d332a98ef0..2447b28b320 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 @@ -12,6 +12,7 @@ 1.3.1-SNAPSHOT ../pom.xml + org.jgrapht @@ -19,5 +20,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 + From 4044550e8950f356eb502851ca90bd7e062269f3 Mon Sep 17 00:00:00 2001 From: uaysev Date: Thu, 15 Aug 2024 17:10:22 -0400 Subject: [PATCH 05/16] necessary dependencies are added for sootup.jimple.parser --- sootup.jimple.parser/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sootup.jimple.parser/pom.xml b/sootup.jimple.parser/pom.xml index 822bfeeff72..fb78795d265 100644 --- a/sootup.jimple.parser/pom.xml +++ b/sootup.jimple.parser/pom.xml @@ -68,5 +68,10 @@ 4.9.3 + + org.junit.jupiter + junit-jupiter-api + + \ No newline at end of file From 0d2dc4a7ac2a36fc56c3f6a71895a9864d8a1886 Mon Sep 17 00:00:00 2001 From: uaysev Date: Thu, 15 Aug 2024 17:19:44 -0400 Subject: [PATCH 06/16] necessary dependencies are added for sootup.java.core --- sootup.java.core/pom.xml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/sootup.java.core/pom.xml b/sootup.java.core/pom.xml index a6b61b3c703..7073834405d 100644 --- a/sootup.java.core/pom.xml +++ b/sootup.java.core/pom.xml @@ -19,6 +19,26 @@ sootup.core + + org.slf4j + slf4j-api + + + + org.apache.commons + commons-lang3 + + + + com.google.guava + guava + + + + org.junit.jupiter + junit-jupiter-api + + From 19f87f02d62269afda87d9bb29bf1255c77f3fdf Mon Sep 17 00:00:00 2001 From: uaysev Date: Thu, 15 Aug 2024 17:29:31 -0400 Subject: [PATCH 07/16] necessary dependencies are added for sootup.java.bytecode --- sootup.java.bytecode/pom.xml | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/sootup.java.bytecode/pom.xml b/sootup.java.bytecode/pom.xml index 018298e2812..cdba91f9f6e 100644 --- a/sootup.java.bytecode/pom.xml +++ b/sootup.java.bytecode/pom.xml @@ -36,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 + + From e2c69891b77d06b5f01fa3311b1cc8f4e1dae123 Mon Sep 17 00:00:00 2001 From: uaysev Date: Thu, 15 Aug 2024 17:34:30 -0400 Subject: [PATCH 08/16] necessary dependencies are added for sootup.java.sourcecode --- sootup.java.sourcecode/pom.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sootup.java.sourcecode/pom.xml b/sootup.java.sourcecode/pom.xml index 8d10af0a1e0..26e25a47ff4 100644 --- a/sootup.java.sourcecode/pom.xml +++ b/sootup.java.sourcecode/pom.xml @@ -382,5 +382,17 @@ com.ibm.wala.dalvik ${wala.version} + + com.google.guava + guava + + + org.slf4j + slf4j-api + + + org.junit.jupiter + junit-jupiter-api + From fad26ee768dd5864ebf03b34aa550e24ffc63904 Mon Sep 17 00:00:00 2001 From: uaysev Date: Thu, 15 Aug 2024 17:35:42 -0400 Subject: [PATCH 09/16] necessary dependencies are added for sootup.tests --- sootup.tests/pom.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sootup.tests/pom.xml b/sootup.tests/pom.xml index 9a77d12ad42..45f08cbec7a 100644 --- a/sootup.tests/pom.xml +++ b/sootup.tests/pom.xml @@ -38,7 +38,12 @@ org.soot-oss sootup.callgraph - + + org.junit.jupiter + junit-jupiter-api + + + From de5f9071f3c287c49b713ad88e14c8a6987f0c65 Mon Sep 17 00:00:00 2001 From: uaysev Date: Thu, 15 Aug 2024 17:40:22 -0400 Subject: [PATCH 10/16] necessary dependencies are added for sootup.callgraph --- sootup.callgraph/pom.xml | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/sootup.callgraph/pom.xml b/sootup.callgraph/pom.xml index be1f36c5362..09a1b3b6b22 100644 --- a/sootup.callgraph/pom.xml +++ b/sootup.callgraph/pom.xml @@ -36,12 +36,32 @@ 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 + + From 32906ebf3d25e0a55e71d526bff56c298fbed878 Mon Sep 17 00:00:00 2001 From: uaysev Date: Thu, 15 Aug 2024 17:45:04 -0400 Subject: [PATCH 11/16] necessary dependencies are added for sootup.qilin --- sootup.qilin/pom.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sootup.qilin/pom.xml b/sootup.qilin/pom.xml index 228cd7e7610..b5b8f846811 100644 --- a/sootup.qilin/pom.xml +++ b/sootup.qilin/pom.xml @@ -54,6 +54,15 @@ 4.13.1 test + + org.apache.commons + commons-lang3 + + + commons-io + commons-io + + From f9646a37e376a11980dd2c0718ca625c0950f233 Mon Sep 17 00:00:00 2001 From: uaysev Date: Thu, 15 Aug 2024 17:53:08 -0400 Subject: [PATCH 12/16] necessary dependencies are added for sootup.examples --- sootup.examples/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sootup.examples/pom.xml b/sootup.examples/pom.xml index ba0c3ee8fc6..ea82e214df9 100644 --- a/sootup.examples/pom.xml +++ b/sootup.examples/pom.xml @@ -36,6 +36,11 @@ org.soot-oss sootup.jimple.parser + + org.junit.jupiter + junit-jupiter-api + + From 2fd63cd7c2f98f8111888152868c375418cc8aad Mon Sep 17 00:00:00 2001 From: uaysev Date: Thu, 15 Aug 2024 17:54:53 -0400 Subject: [PATCH 13/16] necessary dependencies are added for sootup.codepropertygraph --- sootup.codepropertygraph/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sootup.codepropertygraph/pom.xml b/sootup.codepropertygraph/pom.xml index d8e49fb30b8..aaaf9b0e16d 100644 --- a/sootup.codepropertygraph/pom.xml +++ b/sootup.codepropertygraph/pom.xml @@ -43,5 +43,9 @@ ${project.version} test + + org.junit.jupiter + junit-jupiter-api + From 13e16bb32ae6888ce121c09ef83bfe6388d3f962 Mon Sep 17 00:00:00 2001 From: uaysev Date: Thu, 15 Aug 2024 18:10:47 -0400 Subject: [PATCH 14/16] necessary dependencies are added for sootup.jimple.parser --- sootup.jimple.parser/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sootup.jimple.parser/pom.xml b/sootup.jimple.parser/pom.xml index fb78795d265..74f4b572942 100644 --- a/sootup.jimple.parser/pom.xml +++ b/sootup.jimple.parser/pom.xml @@ -73,5 +73,10 @@ junit-jupiter-api + + commons-io + commons-io + + \ No newline at end of file From 4bc0b5b4e12453009fd6fa33e22e9d74b3bd30e5 Mon Sep 17 00:00:00 2001 From: uaysev Date: Thu, 15 Aug 2024 18:13:17 -0400 Subject: [PATCH 15/16] necessary dependencies are added for sootup.analysis --- sootup.analysis/pom.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sootup.analysis/pom.xml b/sootup.analysis/pom.xml index 985076bdf06..3d7dbc75c4b 100644 --- a/sootup.analysis/pom.xml +++ b/sootup.analysis/pom.xml @@ -27,7 +27,10 @@ sootup.java.sourcecode test - + + org.junit.jupiter + junit-jupiter-api + de.upb.cs.swt heros From 7103a8b00d9dd798fa2339fd27fbcedbef2e3a1f Mon Sep 17 00:00:00 2001 From: Markus Schmidt Date: Fri, 16 Aug 2024 10:03:27 +0200 Subject: [PATCH 16/16] Update sootup.core/pom.xml --- sootup.core/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/sootup.core/pom.xml b/sootup.core/pom.xml index 2447b28b320..aceeddd6dd1 100644 --- a/sootup.core/pom.xml +++ b/sootup.core/pom.xml @@ -10,7 +10,6 @@ org.soot-oss sootup 1.3.1-SNAPSHOT - ../pom.xml