Skip to content

Commit

Permalink
Fix dependencies.
Browse files Browse the repository at this point in the history
  • Loading branch information
uhafner committed Dec 20, 2023
1 parent 0259387 commit ff994b9
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 26 deletions.
49 changes: 29 additions & 20 deletions doc/dependency-graph.puml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@ skinparam rectangle {
BackgroundColor<<runtime>> lightBlue
BackgroundColor<<provided>> lightGray
}
rectangle "jackson-databind\n\n2.16.0" as com_fasterxml_jackson_core_jackson_databind_jar
rectangle "jackson-annotations\n\n2.16.0" as com_fasterxml_jackson_core_jackson_annotations_jar
rectangle "jackson-core\n\n2.16.0" as com_fasterxml_jackson_core_jackson_core_jar
rectangle "autograding-model\n\n3.18.0" as edu_hm_hafner_autograding_model_jar
rectangle "autograding-github-action\n\n3.14.0-SNAPSHOT" as edu_hm_hafner_autograding_github_action_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-digester3\n\n3.2" as org_apache_commons_commons_digester3_jar
Expand Down Expand Up @@ -41,18 +36,20 @@ 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\n3.19.0" as edu_hm_hafner_autograding_model_jar
rectangle "coverage-model\n\n0.36.0" as edu_hm_hafner_coverage_model_jar
rectangle "jackson-databind\n\n2.16.0" as com_fasterxml_jackson_core_jackson_databind_jar
rectangle "jackson-annotations\n\n2.16.0" as com_fasterxml_jackson_core_jackson_annotations_jar
rectangle "jackson-core\n\n2.16.0" as com_fasterxml_jackson_core_jackson_core_jar
rectangle "autograding-github-action\n\n3.14.0" as edu_hm_hafner_autograding_github_action_jar
rectangle "github-api\n\n1.318" as org_kohsuke_github_api_jar
rectangle "commons-io\n\n2.15.1" as commons_io_commons_io_jar
rectangle "commons-io\n\n2.11.0" as commons_io_commons_io_jar
rectangle "commons-lang3\n\n3.14.0" as org_apache_commons_commons_lang3_jar
rectangle "spotbugs-annotations\n\n4.8.2" as com_github_spotbugs_spotbugs_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.30.0" as edu_hm_hafner_codingstyle_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
edu_hm_hafner_autograding_github_action_jar -[#000000]-> edu_hm_hafner_autograding_model_jar
rectangle "quality-monitor\n\n1.0.0-SNAPSHOT" as edu_hm_hafner_quality_monitor_jar
edu_hm_hafner_analysis_model_jar -[#000000]-> org_jsoup_jsoup_jar
org_apache_commons_commons_digester3_jar -[#000000]-> cglib_cglib_jar
org_apache_commons_commons_digester3_jar -[#000000]-> commons_logging_commons_logging_jar
Expand Down Expand Up @@ -87,14 +84,26 @@ edu_hm_hafner_analysis_model_jar -[#000000]-> net_sourceforge_pmd_pmd_java_jar
edu_hm_hafner_analysis_model_jar -[#000000]-> org_json_json_jar
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_github_action_jar -[#000000]-> edu_hm_hafner_analysis_model_jar
edu_hm_hafner_autograding_github_action_jar -[#000000]-> edu_hm_hafner_coverage_model_jar
edu_hm_hafner_analysis_model_jar .[#D3D3D3].> 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
edu_hm_hafner_autograding_github_action_jar -[#000000]-> edu_hm_hafner_autograding_model_jar
edu_hm_hafner_autograding_github_action_jar -[#000000]-> org_kohsuke_github_api_jar
edu_hm_hafner_autograding_github_action_jar -[#000000]-> commons_io_commons_io_jar
edu_hm_hafner_autograding_github_action_jar -[#000000]-> org_apache_commons_commons_lang3_jar
edu_hm_hafner_autograding_github_action_jar -[#000000]-> com_github_spotbugs_spotbugs_annotations_jar
edu_hm_hafner_autograding_github_action_jar -[#000000]-> com_google_errorprone_error_prone_annotations_jar
edu_hm_hafner_autograding_github_action_jar -[#000000]-> one_util_streamex_jar
edu_hm_hafner_autograding_github_action_jar -[#000000]-> edu_hm_hafner_codingstyle_jar
@enduml
edu_hm_hafner_autograding_github_action_jar .[#FF0000].> commons_io_commons_io_jar: 2.15.1
edu_hm_hafner_autograding_github_action_jar .[#D3D3D3].> org_apache_commons_commons_lang3_jar
edu_hm_hafner_autograding_github_action_jar .[#D3D3D3].> com_github_spotbugs_spotbugs_annotations_jar
edu_hm_hafner_autograding_github_action_jar .[#D3D3D3].> com_google_errorprone_error_prone_annotations_jar
edu_hm_hafner_autograding_github_action_jar .[#D3D3D3].> one_util_streamex_jar
edu_hm_hafner_autograding_github_action_jar .[#D3D3D3].> edu_hm_hafner_codingstyle_jar
edu_hm_hafner_quality_monitor_jar -[#000000]-> edu_hm_hafner_autograding_github_action_jar
edu_hm_hafner_quality_monitor_jar -[#000000]-> org_slf4j_slf4j_api_jar
edu_hm_hafner_quality_monitor_jar -[#000000]-> com_github_spotbugs_spotbugs_annotations_jar
edu_hm_hafner_quality_monitor_jar -[#000000]-> com_google_errorprone_error_prone_annotations_jar
edu_hm_hafner_quality_monitor_jar -[#000000]-> one_util_streamex_jar
edu_hm_hafner_quality_monitor_jar -[#000000]-> edu_hm_hafner_codingstyle_jar
edu_hm_hafner_quality_monitor_jar -[#000000]-> org_apache_commons_commons_lang3_jar
edu_hm_hafner_quality_monitor_jar -[#000000]-> commons_io_commons_io_jar
@enduml
4 changes: 1 addition & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,13 @@

<jib-maven-plugin.version>3.4.0</jib-maven-plugin.version>
<testcontainers.version>1.19.3</testcontainers.version>

<jackson-databind.version>2.16.0</jackson-databind.version>
</properties>

<dependencies>
<dependency>
<groupId>edu.hm.hafner</groupId>
<artifactId>autograding-github-action</artifactId>
<version>3.14.0-SNAPSHOT</version>
<version>3.14.0</version>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
Expand Down
10 changes: 8 additions & 2 deletions src/main/java/edu/hm/hafner/grading/github/QualityMonitor.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@
import edu.hm.hafner.util.VisibleForTesting;

/**
* GitHub action entrypoint for the autograding action.
* GitHub action entrypoint for the quality monitor action.
*
* @author Tobias Effner
* @author Ullrich Hafner
*/
public class QualityMonitor extends GitHubAutoGradingRunner {
static final String QUALITY_MONITOR = "Quality Monitor";

/**
* Public entry point for the GitHub action in the docker container, simply calls the action.
*
Expand All @@ -33,6 +34,11 @@ public QualityMonitor() {
super(printStream);
}

@Override
protected String getDisplayName() {
return QUALITY_MONITOR;
}

@Override
protected String getDefaultConfigurationPath() {
return "/default-no-score-config.json";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ private String readStandardOut(final GenericContainer<? extends GenericContainer

var composedConsumer = toStringConsumer.andThen(waitingConsumer);
container.followOutput(composedConsumer);
waitingConsumer.waitUntil(frame -> frame.getUtf8String().contains("End Grading"), 60, TimeUnit.SECONDS);
waitingConsumer.waitUntil(frame -> frame.getUtf8String().contains("End " + QualityMonitor.QUALITY_MONITOR), 60, TimeUnit.SECONDS);

return toStringConsumer.toUtf8String();
}
Expand Down

0 comments on commit ff994b9

Please sign in to comment.