Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rewrite model to use analysis-model and coverage-model #271

Merged
merged 13 commits into from
Nov 21, 2023
Merged

Rewrite model to use analysis-model and coverage-model #271

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c44fa3c
Rewrite model to use analysis-model and coverage-model.
uhafner Nov 6, 2023
bb59114
Rewrite aggregation.
uhafner Nov 9, 2023
160bc8f
Make the API work for GitHub and Jenkins.
uhafner Nov 10, 2023
315d2a0
Improve coverage model in tests.
uhafner Nov 10, 2023
b002951
Improve summary.
uhafner Nov 10, 2023
0770359
Split coverage into code coverage and mutation coverage.
uhafner Nov 10, 2023
9943346
Change API to use exceptions when no result has been found.
uhafner Nov 13, 2023
31538da
Use coverage-model to store unit test results.
uhafner Nov 20, 2023
815b735
Bump version.
uhafner Nov 20, 2023
01e0c81
Improve Markdown of test failures.
uhafner Nov 21, 2023
b42fab8
Fix action.
uhafner Nov 21, 2023
47c8c42
Fix action.
uhafner Nov 21, 2023
5888654
Ignore Whitespace in test markdown.
uhafner Nov 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 24 additions & 23 deletions doc/dependency-graph.puml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,52 +6,53 @@ 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-logging\n\n1.2" 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 "coverage-model\n\n0.29.0" as edu_hm_hafner_coverage_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 "error_prone_annotations\n\n2.23.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 "codingstyle\n\n3.25.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
org_apache_commons_commons_digester3_jar -[#000000]-> commons_logging_commons_logging_jar
edu_hm_hafner_analysis_model_jar -[#000000]-> org_apache_commons_commons_digester3_jar
commons_beanutils_commons_beanutils_jar .[#FF0000].> commons_logging_commons_logging_jar: 1.2
commons_beanutils_commons_beanutils_jar .[#D3D3D3].> commons_logging_commons_logging_jar
commons_beanutils_commons_beanutils_jar -[#000000]-> commons_collections_commons_collections_jar
edu_hm_hafner_analysis_model_jar -[#000000]-> commons_beanutils_commons_beanutils_jar
edu_hm_hafner_analysis_model_jar -[#000000]-> org_apache_commons_commons_text_jar
Expand All @@ -68,11 +69,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
Expand All @@ -84,6 +84,7 @@ net_minidev_json_smart_jar -[#000000]-> net_minidev_accessors_smart_jar
edu_hm_hafner_analysis_model_jar -[#000000]-> net_minidev_json_smart_jar
edu_hm_hafner_analysis_model_jar -[#000000]-> org_slf4j_slf4j_api_jar
edu_hm_hafner_autograding_model_jar -[#000000]-> edu_hm_hafner_analysis_model_jar
edu_hm_hafner_autograding_model_jar -[#000000]-> edu_hm_hafner_coverage_model_jar
com_fasterxml_jackson_core_jackson_databind_jar -[#000000]-> com_fasterxml_jackson_core_jackson_annotations_jar
com_fasterxml_jackson_core_jackson_databind_jar -[#000000]-> com_fasterxml_jackson_core_jackson_core_jar
edu_hm_hafner_autograding_model_jar -[#000000]-> com_fasterxml_jackson_core_jackson_databind_jar
Expand Down
15 changes: 13 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -20,6 +20,8 @@

<jackson-databind.version>2.15.3</jackson-databind.version>
<analysis-model.version>11.13.0</analysis-model.version>
<coverage-model.version>0.33.0</coverage-model.version>
<java.version>17</java.version>

</properties>

Expand Down Expand Up @@ -48,6 +50,12 @@
<artifactId>analysis-model</artifactId>
<version>${analysis-model.version}</version>
</dependency>
<dependency>
<groupId>edu.hm.hafner</groupId>
<artifactId>coverage-model</artifactId>
<version>${coverage-model.version}</version>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
Expand All @@ -65,7 +73,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>
Expand Down
Loading
Loading