Rewrite model to use analysis-model and coverage-model.

uhafner · Nov 6, 2023 · c44fa3c · c44fa3c
1 parent 84f47ff
commit c44fa3c
Show file tree

Hide file tree

Showing 40 changed files with 2,478 additions and 2,305 deletions.
diff --git a/doc/dependency-graph.puml b/doc/dependency-graph.puml
@@ -6,46 +6,46 @@ skinparam rectangle {
   BackgroundColor<<runtime>> lightBlue
   BackgroundColor<<provided>> lightGray
 }
-rectangle "analysis-model\n\n11.10.0" as edu_hm_hafner_analysis_model_jar
-rectangle "jsoup\n\n1.16.1" as org_jsoup_jsoup_jar
+rectangle "analysis-model\n\n11.13.0" as edu_hm_hafner_analysis_model_jar
+rectangle "jsoup\n\n1.16.2" as org_jsoup_jsoup_jar
 rectangle "commons-io\n\n2.11.0" as commons_io_commons_io_jar
 rectangle "commons-digester3\n\n3.2" as org_apache_commons_commons_digester3_jar
 rectangle "cglib\n\n2.2.2" as cglib_cglib_jar
 rectangle "commons-logging\n\n1.1.1" as commons_logging_commons_logging_jar
 rectangle "commons-beanutils\n\n1.9.4" as commons_beanutils_commons_beanutils_jar
 rectangle "commons-collections\n\n3.2.2" as commons_collections_commons_collections_jar
 rectangle "commons-text\n\n1.10.0" as org_apache_commons_commons_text_jar
-rectangle "violations-lib\n\n1.156.6" as se_bjurr_violations_violations_lib_jar
+rectangle "violations-lib\n\n1.156.7" as se_bjurr_violations_violations_lib_jar
 rectangle "j2html\n\n1.4.0" as com_j2html_j2html_jar
 rectangle "xercesImpl\n\n2.12.2" as xerces_xercesImpl_jar
 rectangle "xml-apis\n\n1.4.01" as xml_apis_xml_apis_jar
 rectangle "asm\n\n9.6" as org_ow2_asm_asm_jar
-rectangle "asm-analysis\n\n9.4" as org_ow2_asm_asm_analysis_jar
-rectangle "asm-tree\n\n9.4" as org_ow2_asm_asm_tree_jar
-rectangle "spotbugs\n\n4.7.3" as com_github_spotbugs_spotbugs_jar
-rectangle "asm-commons\n\n9.4" as org_ow2_asm_asm_commons_jar
-rectangle "asm-util\n\n9.4" as org_ow2_asm_asm_util_jar
-rectangle "jcip-annotations\n\n1.0" as net_jcip_jcip_annotations_jar
-rectangle "dom4j\n\n2.1.3" as org_dom4j_dom4j_jar
-rectangle "gson\n\n2.9.1" as com_google_code_gson_gson_jar
+rectangle "asm-analysis\n\n9.6" as org_ow2_asm_asm_analysis_jar
+rectangle "asm-tree\n\n9.6" as org_ow2_asm_asm_tree_jar
+rectangle "spotbugs\n\n4.8.0" as com_github_spotbugs_spotbugs_jar
+rectangle "asm-commons\n\n9.6" as org_ow2_asm_asm_commons_jar
+rectangle "asm-util\n\n9.6" as org_ow2_asm_asm_util_jar
+rectangle "jcip-annotations\n\n1.0-1" as com_github_stephenc_jcip_jcip_annotations_jar
+rectangle "dom4j\n\n2.1.4" as org_dom4j_dom4j_jar
+rectangle "gson\n\n2.10.1" as com_google_code_gson_gson_jar
 rectangle "bcel\n\n6.7.0" as org_apache_bcel_bcel_jar
-rectangle "commons-lang3\n\n3.13.0" as org_apache_commons_commons_lang3_jar
 rectangle "pmd-core\n\n6.55.0" as net_sourceforge_pmd_pmd_core_jar
 rectangle "antlr4-runtime\n\n4.7.2" as org_antlr_antlr4_runtime_jar
 rectangle "jcommander\n\n1.82" as com_beust_jcommander_jar
 rectangle "pmd-java\n\n6.55.0" as net_sourceforge_pmd_pmd_java_jar
-rectangle "json\n\n20230618" as org_json_json_jar
+rectangle "json\n\n20231013" as org_json_json_jar
 rectangle "json-smart\n\n2.5.0" as net_minidev_json_smart_jar
 rectangle "accessors-smart\n\n2.5.0" as net_minidev_accessors_smart_jar
 rectangle "slf4j-api\n\n2.0.9" as org_slf4j_slf4j_api_jar
-rectangle "autograding-model\n\n2.0.0" as edu_hm_hafner_autograding_model_jar
-rectangle "jackson-databind\n\n2.15.2" as com_fasterxml_jackson_core_jackson_databind_jar
-rectangle "jackson-annotations\n\n2.15.2" as com_fasterxml_jackson_core_jackson_annotations_jar
-rectangle "jackson-core\n\n2.15.2" as com_fasterxml_jackson_core_jackson_core_jar
+rectangle "autograding-model\n\n3.0.0-SNAPSHOT" as edu_hm_hafner_autograding_model_jar
+rectangle "jackson-databind\n\n2.15.3" as com_fasterxml_jackson_core_jackson_databind_jar
+rectangle "jackson-annotations\n\n2.15.3" as com_fasterxml_jackson_core_jackson_annotations_jar
+rectangle "jackson-core\n\n2.15.3" as com_fasterxml_jackson_core_jackson_core_jar
 rectangle "spotbugs-annotations\n\n4.7.3" as com_github_spotbugs_spotbugs_annotations_jar
 rectangle "error_prone_annotations\n\n2.22.0" as com_google_errorprone_error_prone_annotations_jar
 rectangle "streamex\n\n0.8.2" as one_util_streamex_jar
 rectangle "codingstyle\n\n3.24.0" as edu_hm_hafner_codingstyle_jar
+rectangle "commons-lang3\n\n3.13.0" as org_apache_commons_commons_lang3_jar
 edu_hm_hafner_analysis_model_jar -[#000000]-> org_jsoup_jsoup_jar
 edu_hm_hafner_analysis_model_jar .[#D3D3D3].> commons_io_commons_io_jar
 org_apache_commons_commons_digester3_jar -[#000000]-> cglib_cglib_jar
@@ -68,11 +68,10 @@ com_github_spotbugs_spotbugs_jar -[#000000]-> org_ow2_asm_asm_tree_jar
 org_ow2_asm_asm_util_jar .[#D3D3D3].> org_ow2_asm_asm_tree_jar
 org_ow2_asm_asm_util_jar .[#D3D3D3].> org_ow2_asm_asm_analysis_jar
 com_github_spotbugs_spotbugs_jar -[#000000]-> org_ow2_asm_asm_util_jar
-com_github_spotbugs_spotbugs_jar -[#000000]-> net_jcip_jcip_annotations_jar
+com_github_spotbugs_spotbugs_jar -[#000000]-> com_github_stephenc_jcip_jcip_annotations_jar
 com_github_spotbugs_spotbugs_jar -[#000000]-> org_dom4j_dom4j_jar
 com_github_spotbugs_spotbugs_jar -[#000000]-> com_google_code_gson_gson_jar
 edu_hm_hafner_analysis_model_jar -[#000000]-> com_github_spotbugs_spotbugs_jar
-org_apache_bcel_bcel_jar .[#FF0000].> org_apache_commons_commons_lang3_jar: 3.12.0
 edu_hm_hafner_analysis_model_jar -[#000000]-> org_apache_bcel_bcel_jar
 net_sourceforge_pmd_pmd_core_jar -[#000000]-> org_antlr_antlr4_runtime_jar
 edu_hm_hafner_analysis_model_jar -[#000000]-> net_sourceforge_pmd_pmd_core_jar

diff --git a/pom.xml b/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>edu.hm.hafner</groupId>
     <artifactId>codingstyle-pom</artifactId>
-    <version>3.33.0</version>
+    <version>3.35.0</version>
     <relativePath />
   </parent>
 
   <groupId>edu.hm.hafner</groupId>
   <artifactId>autograding-model</artifactId>
-  <version>2.1.0-SNAPSHOT</version>
+  <version>3.0.0-SNAPSHOT</version>
   <name>Autograding Model</name>
 
   <description>This module autogrades Java projects based on a configurable set of metrics.</description>
@@ -20,6 +20,7 @@
 
     <jackson-databind.version>2.15.3</jackson-databind.version>
     <analysis-model.version>11.13.0</analysis-model.version>
+    <java.version>17</java.version>
 
   </properties>
 
@@ -48,6 +49,12 @@
       <artifactId>analysis-model</artifactId>
       <version>${analysis-model.version}</version>
     </dependency>
+    <dependency>
+      <groupId>edu.hm.hafner</groupId>
+      <artifactId>coverage-model</artifactId>
+      <version>0.29.0</version>
+    </dependency>
+
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
@@ -65,7 +72,10 @@
             <package>edu.hm.hafner.grading</package>
           </packages>
           <excludes>
+            <exclude>.*\.Score</exclude>
             <exclude>.*\.Supplier</exclude>
+            <exclude>.*\.JacksonFacade</exclude>
+            <exclude>.*Builder</exclude>
           </excludes>
           <entryPointClassPackage>edu.hm.hafner.grading.assertions</entryPointClassPackage>
         </configuration>