From 529126bc2709ed85f7ab4d234a78439a5085e056 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Fuch=C3=9F?= <dominik.fuchss@kit.edu>
Date: Mon, 28 Jul 2025 16:06:11 +0200
Subject: [PATCH] Update to ArDoCo V2

---
 pom.xml                                       | 44 ++-----------------
 .../ardoco/codemodelextractor/cli/Cli.java    |  8 ++--
 2 files changed, 8 insertions(+), 44 deletions(-)

diff --git a/pom.xml b/pom.xml
index 37c545d..fadd25f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,9 +2,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>io.github.ardoco.core</groupId>
+    <groupId>io.github.ardoco</groupId>
     <artifactId>parent</artifactId>
-    <version>1.0.0</version>
+    <version>2.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>code-model-extractor-cli</artifactId>
 
@@ -20,11 +20,6 @@
       <artifactId>model-provider</artifactId>
       <version>${ardoco.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>${slf4j.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
@@ -44,48 +39,15 @@
         <enabled>true</enabled>
       </snapshots>
       <id>mavenSnapshot</id>
-      <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
+      <url>https://central.sonatype.com/repository/maven-snapshots/</url>
     </repository>
   </repositories>
 
   <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-assembly-plugin</artifactId>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-failsafe-plugin</artifactId>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-gpg-plugin</artifactId>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-jar-plugin</artifactId>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-        </plugin>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>flatten-maven-plugin</artifactId>
-        </plugin>
-      </plugins>
-    </pluginManagement>
     <plugins>
       <plugin>
         <groupId>com.diffplug.spotless</groupId>
         <artifactId>spotless-maven-plugin</artifactId>
-        <version>${spotless.version}</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
diff --git a/src/main/java/edu/kit/kastel/mcse/ardoco/codemodelextractor/cli/Cli.java b/src/main/java/edu/kit/kastel/mcse/ardoco/codemodelextractor/cli/Cli.java
index 1e4fe18..114d83c 100644
--- a/src/main/java/edu/kit/kastel/mcse/ardoco/codemodelextractor/cli/Cli.java
+++ b/src/main/java/edu/kit/kastel/mcse/ardoco/codemodelextractor/cli/Cli.java
@@ -6,8 +6,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.CodeModel;
-import edu.kit.kastel.mcse.ardoco.core.api.models.arcotl.code.CodeItemRepository;
+import edu.kit.kastel.mcse.ardoco.core.api.models.CodeModel;
+import edu.kit.kastel.mcse.ardoco.core.api.models.Metamodel;
+import edu.kit.kastel.mcse.ardoco.core.api.models.code.CodeItemRepository;
 import edu.kit.kastel.mcse.ardoco.tlr.models.connectors.generators.code.AllLanguagesExtractor;
 
 public final class Cli {
@@ -33,7 +34,8 @@ public static void main(String[] args) {
         }
 
         CodeItemRepository codeItemRepository = new CodeItemRepository();
-        AllLanguagesExtractor codeExtractor = new AllLanguagesExtractor(codeItemRepository, codeDirectory.getAbsolutePath());
+        AllLanguagesExtractor codeExtractor = new AllLanguagesExtractor(codeItemRepository, codeDirectory.getAbsolutePath(),
+                Metamodel.CODE_WITH_COMPILATION_UNITS_AND_PACKAGES);
         CodeModel model = codeExtractor.extractModel();
         codeExtractor.writeOutCodeModel(model, destination);
     }