From cd2832c8d0270543214f9b66ab790ea98dc77782 Mon Sep 17 00:00:00 2001 From: Matthew Casperson Date: Tue, 31 Jan 2023 09:57:35 +1000 Subject: [PATCH] Testing new workflow --- .github/workflows/gradle.yml | 252 +++++++++--------- .idea/jarRepositories.xml | 4 +- .idea/libraries/Maven__antlr_antlr_2_7_7.xml | 13 - ..._ch_qos_logback_logback_classic_1_4_5.xml} | 8 +- ...en__ch_qos_logback_logback_core_1_4_5.xml} | 8 +- ...m_electronwill_night_config_core_3_6_6.xml | 13 + ...m_electronwill_night_config_toml_3_6_6.xml | 13 + ...ckson_core_jackson_annotations_2_14_1.xml} | 8 +- ...rxml_jackson_core_jackson_core_2_14_1.xml} | 8 +- ..._jackson_core_jackson_databind_2_14_1.xml} | 8 +- ...datatype_jackson_datatype_jdk8_2_14_1.xml} | 8 +- ...tatype_jackson_datatype_jsr310_2_14_1.xml} | 8 +- ...jackson_module_parameter_names_2_14_1.xml} | 8 +- .../Maven__com_h2database_h2_1_4_200.xml | 13 - .../Maven__com_h2database_h2_2_1_214.xml | 13 + ...__com_jayway_jsonpath_json_path_2_7_0.xml} | 8 +- ...un_activation_jakarta_activation_1_2_2.xml | 13 - ...n_istack_istack_commons_runtime_4_1_1.xml} | 8 +- .../Maven__com_zaxxer_HikariCP_4_0_3.xml | 13 - .../Maven__com_zaxxer_HikariCP_5_0_1.xml | 13 + ...o_micrometer_micrometer_commons_1_10_3.xml | 13 + ..._io_micrometer_micrometer_core_1_10_3.xml} | 8 +- ...crometer_micrometer_observation_1_10_3.xml | 13 + ...tivation_jakarta_activation_api_2_1_1.xml} | 8 +- ...notation_jakarta_annotation_api_2_1_1.xml} | 8 +- ...akarta_inject_jakarta_inject_api_2_0_0.xml | 13 + ...istence_jakarta_persistence_api_3_1_0.xml} | 8 +- ...saction_jakarta_transaction_api_2_0_1.xml} | 8 +- ...a_xml_bind_jakarta_xml_bind_api_4_0_0.xml} | 8 +- ...ven__net_bytebuddy_byte_buddy_1_12_22.xml} | 8 +- ...et_bytebuddy_byte_buddy_agent_1_12_22.xml} | 8 +- ...en__net_minidev_accessors_smart_2_4_8.xml} | 8 +- ...> Maven__net_minidev_json_smart_2_4_8.xml} | 8 +- ...Maven__org_antlr_antlr4_runtime_4_10_1.xml | 13 + ...apache_logging_log4j_log4j_api_2_19_0.xml} | 8 +- ...e_logging_log4j_log4j_to_slf4j_2_19_0.xml} | 8 +- ...tomcat_embed_tomcat_embed_core_10_1_5.xml} | 8 +- ...e_tomcat_embed_tomcat_embed_el_10_1_5.xml} | 8 +- ...t_embed_tomcat_embed_websocket_10_1_5.xml} | 8 +- ...org_apiguardian_apiguardian_api_1_1_2.xml} | 8 +- ...ven__org_aspectj_aspectjweaver_1_9_19.xml} | 8 +- ...aven__org_assertj_assertj_core_3_23_1.xml} | 8 +- .../Maven__org_dom4j_dom4j_2_1_3.xml | 13 - ...g_eclipse_angus_angus_activation_1_0_0.xml | 13 + ...Maven__org_flywaydb_flyway_core_9_5_1.xml} | 8 +- ...n__org_glassfish_jaxb_jaxb_core_4_0_1.xml} | 8 +- ..._org_glassfish_jaxb_jaxb_runtime_4_0_1.xml | 13 + ... Maven__org_glassfish_jaxb_txw2_4_0_1.xml} | 8 +- ...rnate_commons_annotations_6_0_2_Final.xml} | 8 +- ..._hibernate_hibernate_core_5_4_32_Final.xml | 13 - ...bernate_orm_hibernate_core_6_1_6_Final.xml | 13 + ...ven__org_javassist_javassist_3_27_0_GA.xml | 13 - .../Maven__org_jboss_jandex_2_2_3_Final.xml | 13 - .../Maven__org_jboss_jandex_2_4_2_Final.xml | 13 + ...oss_logging_jboss_logging_3_5_0_Final.xml} | 8 +- ...org_junit_jupiter_junit_jupiter_5_9_2.xml} | 8 +- ...junit_jupiter_junit_jupiter_api_5_9_2.xml} | 8 +- ...it_jupiter_junit_jupiter_engine_5_9_2.xml} | 8 +- ...it_jupiter_junit_jupiter_params_5_9_2.xml} | 8 +- ...platform_junit_platform_commons_1_9_2.xml} | 8 +- ..._platform_junit_platform_engine_1_9_2.xml} | 8 +- ...Maven__org_mockito_mockito_core_4_8_1.xml} | 8 +- ...g_mockito_mockito_junit_jupiter_4_8_1.xml} | 8 +- ...ven__org_postgresql_postgresql_42_5_1.xml} | 8 +- ...ven__org_skyscreamer_jsonassert_1_5_1.xml} | 8 +- ...> Maven__org_slf4j_jul_to_slf4j_2_0_6.xml} | 8 +- .../Maven__org_slf4j_slf4j_api_1_7_32.xml | 13 - .../Maven__org_slf4j_slf4j_api_2_0_6.xml | 13 + ...pringframework_boot_spring_boot_3_0_2.xml} | 8 +- ...ework_boot_spring_boot_actuator_3_0_2.xml} | 8 +- ...ing_boot_actuator_autoconfigure_3_0_2.xml} | 8 +- ..._boot_spring_boot_autoconfigure_3_0_2.xml} | 8 +- ...mework_boot_spring_boot_starter_3_0_2.xml} | 8 +- ...ot_spring_boot_starter_actuator_3_0_2.xml} | 8 +- ...rk_boot_spring_boot_starter_aop_3_0_2.xml} | 8 +- ...ot_spring_boot_starter_data_jpa_3_0_2.xml} | 8 +- ...k_boot_spring_boot_starter_jdbc_3_0_2.xml} | 8 +- ...k_boot_spring_boot_starter_json_3_0_2.xml} | 8 +- ...boot_spring_boot_starter_logging_2_5_4.xml | 13 - ...boot_spring_boot_starter_logging_3_0_2.xml | 13 + ...k_boot_spring_boot_starter_test_3_0_2.xml} | 8 +- ..._boot_spring_boot_starter_tomcat_2_5_4.xml | 13 - ..._boot_spring_boot_starter_tomcat_3_0_2.xml | 13 + ...rk_boot_spring_boot_starter_web_3_0_2.xml} | 8 +- ...framework_boot_spring_boot_test_3_0_2.xml} | 8 +- ..._spring_boot_test_autoconfigure_3_0_2.xml} | 8 +- ...mework_data_spring_data_commons_3_0_1.xml} | 8 +- ...gframework_data_spring_data_jpa_3_0_1.xml} | 8 +- ..._org_springframework_spring_aop_6_0_4.xml} | 8 +- ..._springframework_spring_aspects_6_0_4.xml} | 8 +- ...rg_springframework_spring_beans_6_0_4.xml} | 8 +- ..._springframework_spring_context_6_0_4.xml} | 8 +- ...org_springframework_spring_core_6_0_4.xml} | 8 +- ...pringframework_spring_expression_5_3_9.xml | 13 - ...pringframework_spring_expression_6_0_4.xml | 13 + ..._org_springframework_spring_jcl_6_0_4.xml} | 8 +- ...org_springframework_spring_jdbc_6_0_4.xml} | 8 +- ..._org_springframework_spring_orm_6_0_4.xml} | 8 +- ..._org_springframework_spring_test_5_3_9.xml | 13 - ..._org_springframework_spring_test_6_0_4.xml | 13 + ...__org_springframework_spring_tx_6_0_4.xml} | 8 +- ...__org_springframework_spring_web_5_3_9.xml | 13 - ...__org_springframework_spring_web_6_0_4.xml | 13 + ...g_springframework_spring_webmvc_6_0_4.xml} | 8 +- ...Maven__org_xmlunit_xmlunit_core_2_9_1.xml} | 8 +- .../Maven__org_yaml_snakeyaml_1_28.xml | 13 - .../Maven__org_yaml_snakeyaml_1_33.xml | 13 + .idea/misc.xml | 2 +- build.gradle.kts | 6 +- pom.xml | 6 +- randomquotes.iml | 180 +++++++------ .../com/octopus/RandomQuotesController.java | 4 +- src/main/java/com/octopus/entity/Author.java | 2 +- src/main/java/com/octopus/entity/Quote.java | 2 +- 114 files changed, 766 insertions(+), 702 deletions(-) delete mode 100644 .idea/libraries/Maven__antlr_antlr_2_7_7.xml rename .idea/libraries/{Maven__ch_qos_logback_logback_classic_1_2_5.xml => Maven__ch_qos_logback_logback_classic_1_4_5.xml} (60%) rename .idea/libraries/{Maven__ch_qos_logback_logback_core_1_2_5.xml => Maven__ch_qos_logback_logback_core_1_4_5.xml} (62%) create mode 100644 .idea/libraries/Maven__com_electronwill_night_config_core_3_6_6.xml create mode 100644 .idea/libraries/Maven__com_electronwill_night_config_toml_3_6_6.xml rename .idea/libraries/{Maven__com_fasterxml_jackson_core_jackson_annotations_2_12_4.xml => Maven__com_fasterxml_jackson_core_jackson_annotations_2_14_1.xml} (67%) rename .idea/libraries/{Maven__com_fasterxml_jackson_core_jackson_core_2_12_4.xml => Maven__com_fasterxml_jackson_core_jackson_core_2_14_1.xml} (67%) rename .idea/libraries/{Maven__com_fasterxml_jackson_core_jackson_databind_2_12_4.xml => Maven__com_fasterxml_jackson_core_jackson_databind_2_14_1.xml} (66%) rename .idea/libraries/{Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_12_4.xml => Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_14_1.xml} (59%) rename .idea/libraries/{Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_12_4.xml => Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_14_1.xml} (58%) rename .idea/libraries/{Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_12_4.xml => Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_14_1.xml} (55%) delete mode 100644 .idea/libraries/Maven__com_h2database_h2_1_4_200.xml create mode 100644 .idea/libraries/Maven__com_h2database_h2_2_1_214.xml rename .idea/libraries/{Maven__com_jayway_jsonpath_json_path_2_5_0.xml => Maven__com_jayway_jsonpath_json_path_2_7_0.xml} (62%) delete mode 100644 .idea/libraries/Maven__com_sun_activation_jakarta_activation_1_2_2.xml rename .idea/libraries/{Maven__com_sun_istack_istack_commons_runtime_3_0_12.xml => Maven__com_sun_istack_istack_commons_runtime_4_1_1.xml} (54%) delete mode 100644 .idea/libraries/Maven__com_zaxxer_HikariCP_4_0_3.xml create mode 100644 .idea/libraries/Maven__com_zaxxer_HikariCP_5_0_1.xml create mode 100644 .idea/libraries/Maven__io_micrometer_micrometer_commons_1_10_3.xml rename .idea/libraries/{Maven__io_micrometer_micrometer_core_1_7_3.xml => Maven__io_micrometer_micrometer_core_1_10_3.xml} (60%) create mode 100644 .idea/libraries/Maven__io_micrometer_micrometer_observation_1_10_3.xml rename .idea/libraries/{Maven__jakarta_activation_jakarta_activation_api_1_2_2.xml => Maven__jakarta_activation_jakarta_activation_api_2_1_1.xml} (67%) rename .idea/libraries/{Maven__jakarta_annotation_jakarta_annotation_api_1_3_5.xml => Maven__jakarta_annotation_jakarta_annotation_api_2_1_1.xml} (67%) create mode 100644 .idea/libraries/Maven__jakarta_inject_jakarta_inject_api_2_0_0.xml rename .idea/libraries/{Maven__jakarta_persistence_jakarta_persistence_api_2_2_3.xml => Maven__jakarta_persistence_jakarta_persistence_api_3_1_0.xml} (67%) rename .idea/libraries/{Maven__jakarta_transaction_jakarta_transaction_api_1_3_3.xml => Maven__jakarta_transaction_jakarta_transaction_api_2_0_1.xml} (67%) rename .idea/libraries/{Maven__jakarta_xml_bind_jakarta_xml_bind_api_2_3_3.xml => Maven__jakarta_xml_bind_jakarta_xml_bind_api_4_0_0.xml} (57%) rename .idea/libraries/{Maven__net_bytebuddy_byte_buddy_1_10_22.xml => Maven__net_bytebuddy_byte_buddy_1_12_22.xml} (63%) rename .idea/libraries/{Maven__net_bytebuddy_byte_buddy_agent_1_10_22.xml => Maven__net_bytebuddy_byte_buddy_agent_1_12_22.xml} (58%) rename .idea/libraries/{Maven__net_minidev_accessors_smart_2_4_7.xml => Maven__net_minidev_accessors_smart_2_4_8.xml} (61%) rename .idea/libraries/{Maven__net_minidev_json_smart_2_4_7.xml => Maven__net_minidev_json_smart_2_4_8.xml} (66%) create mode 100644 .idea/libraries/Maven__org_antlr_antlr4_runtime_4_10_1.xml rename .idea/libraries/{Maven__org_apache_logging_log4j_log4j_api_2_14_1.xml => Maven__org_apache_logging_log4j_log4j_api_2_19_0.xml} (59%) rename .idea/libraries/{Maven__org_apache_logging_log4j_log4j_to_slf4j_2_14_1.xml => Maven__org_apache_logging_log4j_log4j_to_slf4j_2_19_0.xml} (67%) rename .idea/libraries/{Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_52.xml => Maven__org_apache_tomcat_embed_tomcat_embed_core_10_1_5.xml} (67%) rename .idea/libraries/{Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_52.xml => Maven__org_apache_tomcat_embed_tomcat_embed_el_10_1_5.xml} (67%) rename .idea/libraries/{Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_52.xml => Maven__org_apache_tomcat_embed_tomcat_embed_websocket_10_1_5.xml} (67%) rename .idea/libraries/{Maven__org_apiguardian_apiguardian_api_1_1_0.xml => Maven__org_apiguardian_apiguardian_api_1_1_2.xml} (60%) rename .idea/libraries/{Maven__org_aspectj_aspectjweaver_1_9_7.xml => Maven__org_aspectj_aspectjweaver_1_9_19.xml} (62%) rename .idea/libraries/{Maven__org_assertj_assertj_core_3_19_0.xml => Maven__org_assertj_assertj_core_3_23_1.xml} (63%) delete mode 100644 .idea/libraries/Maven__org_dom4j_dom4j_2_1_3.xml create mode 100644 .idea/libraries/Maven__org_eclipse_angus_angus_activation_1_0_0.xml rename .idea/libraries/{Maven__org_flywaydb_flyway_core_7_7_3.xml => Maven__org_flywaydb_flyway_core_9_5_1.xml} (64%) rename .idea/libraries/{Maven__org_glassfish_jaxb_jaxb_runtime_2_3_5.xml => Maven__org_glassfish_jaxb_jaxb_core_4_0_1.xml} (60%) create mode 100644 .idea/libraries/Maven__org_glassfish_jaxb_jaxb_runtime_4_0_1.xml rename .idea/libraries/{Maven__org_glassfish_jaxb_txw2_2_3_5.xml => Maven__org_glassfish_jaxb_txw2_4_0_1.xml} (67%) rename .idea/libraries/{Maven__org_hibernate_common_hibernate_commons_annotations_5_1_2_Final.xml => Maven__org_hibernate_common_hibernate_commons_annotations_6_0_2_Final.xml} (55%) delete mode 100644 .idea/libraries/Maven__org_hibernate_hibernate_core_5_4_32_Final.xml create mode 100644 .idea/libraries/Maven__org_hibernate_orm_hibernate_core_6_1_6_Final.xml delete mode 100644 .idea/libraries/Maven__org_javassist_javassist_3_27_0_GA.xml delete mode 100644 .idea/libraries/Maven__org_jboss_jandex_2_2_3_Final.xml create mode 100644 .idea/libraries/Maven__org_jboss_jandex_2_4_2_Final.xml rename .idea/libraries/{Maven__org_jboss_logging_jboss_logging_3_4_2_Final.xml => Maven__org_jboss_logging_jboss_logging_3_5_0_Final.xml} (58%) rename .idea/libraries/{Maven__org_junit_jupiter_junit_jupiter_5_7_2.xml => Maven__org_junit_jupiter_junit_jupiter_5_9_2.xml} (60%) rename .idea/libraries/{Maven__org_junit_jupiter_junit_jupiter_api_5_7_2.xml => Maven__org_junit_jupiter_junit_jupiter_api_5_9_2.xml} (58%) rename .idea/libraries/{Maven__org_junit_jupiter_junit_jupiter_engine_5_7_2.xml => Maven__org_junit_jupiter_junit_jupiter_engine_5_9_2.xml} (67%) rename .idea/libraries/{Maven__org_junit_jupiter_junit_jupiter_params_5_7_2.xml => Maven__org_junit_jupiter_junit_jupiter_params_5_9_2.xml} (67%) rename .idea/libraries/{Maven__org_junit_platform_junit_platform_commons_1_7_2.xml => Maven__org_junit_platform_junit_platform_commons_1_9_2.xml} (67%) rename .idea/libraries/{Maven__org_junit_platform_junit_platform_engine_1_7_2.xml => Maven__org_junit_platform_junit_platform_engine_1_9_2.xml} (67%) rename .idea/libraries/{Maven__org_mockito_mockito_core_3_9_0.xml => Maven__org_mockito_mockito_core_4_8_1.xml} (64%) rename .idea/libraries/{Maven__org_mockito_mockito_junit_jupiter_3_9_0.xml => Maven__org_mockito_mockito_junit_jupiter_4_8_1.xml} (57%) rename .idea/libraries/{Maven__org_postgresql_postgresql_42_2_23.xml => Maven__org_postgresql_postgresql_42_5_1.xml} (62%) rename .idea/libraries/{Maven__org_skyscreamer_jsonassert_1_5_0.xml => Maven__org_skyscreamer_jsonassert_1_5_1.xml} (64%) rename .idea/libraries/{Maven__org_slf4j_jul_to_slf4j_1_7_32.xml => Maven__org_slf4j_jul_to_slf4j_2_0_6.xml} (64%) delete mode 100644 .idea/libraries/Maven__org_slf4j_slf4j_api_1_7_32.xml create mode 100644 .idea/libraries/Maven__org_slf4j_slf4j_api_2_0_6.xml rename .idea/libraries/{Maven__org_springframework_boot_spring_boot_2_5_4.xml => Maven__org_springframework_boot_spring_boot_3_0_2.xml} (59%) rename .idea/libraries/{Maven__org_springframework_boot_spring_boot_actuator_2_5_4.xml => Maven__org_springframework_boot_spring_boot_actuator_3_0_2.xml} (67%) rename .idea/libraries/{Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_2_5_4.xml => Maven__org_springframework_boot_spring_boot_actuator_autoconfigure_3_0_2.xml} (54%) rename .idea/libraries/{Maven__org_springframework_boot_spring_boot_autoconfigure_2_5_4.xml => Maven__org_springframework_boot_spring_boot_autoconfigure_3_0_2.xml} (60%) rename .idea/libraries/{Maven__org_springframework_boot_spring_boot_starter_2_5_4.xml => Maven__org_springframework_boot_spring_boot_starter_3_0_2.xml} (67%) rename .idea/libraries/{Maven__org_springframework_boot_spring_boot_starter_actuator_2_5_4.xml => Maven__org_springframework_boot_spring_boot_starter_actuator_3_0_2.xml} (58%) rename .idea/libraries/{Maven__org_springframework_boot_spring_boot_starter_aop_2_5_4.xml => Maven__org_springframework_boot_spring_boot_starter_aop_3_0_2.xml} (67%) rename .idea/libraries/{Maven__org_springframework_boot_spring_boot_starter_data_jpa_2_5_4.xml => Maven__org_springframework_boot_spring_boot_starter_data_jpa_3_0_2.xml} (58%) rename .idea/libraries/{Maven__org_springframework_boot_spring_boot_starter_test_2_5_4.xml => Maven__org_springframework_boot_spring_boot_starter_jdbc_3_0_2.xml} (68%) rename .idea/libraries/{Maven__org_springframework_boot_spring_boot_starter_jdbc_2_5_4.xml => Maven__org_springframework_boot_spring_boot_starter_json_3_0_2.xml} (68%) delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_5_4.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_3_0_2.xml rename .idea/libraries/{Maven__org_springframework_boot_spring_boot_starter_json_2_5_4.xml => Maven__org_springframework_boot_spring_boot_starter_test_3_0_2.xml} (68%) delete mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_5_4.xml create mode 100644 .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_3_0_2.xml rename .idea/libraries/{Maven__org_springframework_boot_spring_boot_starter_web_2_5_4.xml => Maven__org_springframework_boot_spring_boot_starter_web_3_0_2.xml} (67%) rename .idea/libraries/{Maven__org_springframework_boot_spring_boot_test_2_5_4.xml => Maven__org_springframework_boot_spring_boot_test_3_0_2.xml} (67%) rename .idea/libraries/{Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_5_4.xml => Maven__org_springframework_boot_spring_boot_test_autoconfigure_3_0_2.xml} (57%) rename .idea/libraries/{Maven__org_springframework_data_spring_data_commons_2_5_4.xml => Maven__org_springframework_data_spring_data_commons_3_0_1.xml} (67%) rename .idea/libraries/{Maven__org_springframework_data_spring_data_jpa_2_5_4.xml => Maven__org_springframework_data_spring_data_jpa_3_0_1.xml} (67%) rename .idea/libraries/{Maven__org_springframework_spring_aop_5_3_9.xml => Maven__org_springframework_spring_aop_6_0_4.xml} (62%) rename .idea/libraries/{Maven__org_springframework_spring_aspects_5_3_9.xml => Maven__org_springframework_spring_aspects_6_0_4.xml} (59%) rename .idea/libraries/{Maven__org_springframework_spring_beans_5_3_9.xml => Maven__org_springframework_spring_beans_6_0_4.xml} (60%) rename .idea/libraries/{Maven__org_springframework_spring_context_5_3_9.xml => Maven__org_springframework_spring_context_6_0_4.xml} (59%) rename .idea/libraries/{Maven__org_springframework_spring_core_5_3_9.xml => Maven__org_springframework_spring_core_6_0_4.xml} (61%) delete mode 100644 .idea/libraries/Maven__org_springframework_spring_expression_5_3_9.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_expression_6_0_4.xml rename .idea/libraries/{Maven__org_springframework_spring_orm_5_3_9.xml => Maven__org_springframework_spring_jcl_6_0_4.xml} (62%) rename .idea/libraries/{Maven__org_springframework_spring_jdbc_5_3_9.xml => Maven__org_springframework_spring_jdbc_6_0_4.xml} (61%) rename .idea/libraries/{Maven__org_springframework_spring_jcl_5_3_9.xml => Maven__org_springframework_spring_orm_6_0_4.xml} (62%) delete mode 100644 .idea/libraries/Maven__org_springframework_spring_test_5_3_9.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_test_6_0_4.xml rename .idea/libraries/{Maven__org_springframework_spring_tx_5_3_9.xml => Maven__org_springframework_spring_tx_6_0_4.xml} (62%) delete mode 100644 .idea/libraries/Maven__org_springframework_spring_web_5_3_9.xml create mode 100644 .idea/libraries/Maven__org_springframework_spring_web_6_0_4.xml rename .idea/libraries/{Maven__org_springframework_spring_webmvc_5_3_9.xml => Maven__org_springframework_spring_webmvc_6_0_4.xml} (60%) rename .idea/libraries/{Maven__org_xmlunit_xmlunit_core_2_8_2.xml => Maven__org_xmlunit_xmlunit_core_2_9_1.xml} (64%) delete mode 100644 .idea/libraries/Maven__org_yaml_snakeyaml_1_28.xml create mode 100644 .idea/libraries/Maven__org_yaml_snakeyaml_1_33.xml diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 4df4839..8dfb1ce 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -1,5 +1,8 @@ # The following workflow provides an opinionated template you can customize for your own needs. # +# If you are not an Octopus user, the "Push to Octopus", "Generate Octopus Deploy build information", +# and "Create Octopus Release" steps can be safely deleted. +# # To configure Octopus, set the OCTOPUS_API_TOKEN secret to the Octopus API key, and # set the OCTOPUS_SERVER_URL secret to the Octopus URL. # @@ -8,129 +11,134 @@ # # Get a trial Octopus instance from https://octopus.com/start -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1 - with: - fetch-depth: '0' - - name: Install GitVersion - uses: gittools/actions/gitversion/setup@v0.9.7 - with: - versionSpec: 5.x - - id: determine_version - name: Determine Version - uses: gittools/actions/gitversion/execute@v0.9.7 - with: - additionalArguments: /overrideconfig mode=Mainline - - name: Install Octopus Deploy CLI - uses: OctopusDeploy/install-octocli@v1.1.1 - with: - version: latest - - name: Set up JDK 1.17 - uses: actions/setup-java@v2 - with: - java-version: '17' - distribution: adopt - - name: List Dependencies - run: gradle dependencies --console=plain > dependencies.txt - shell: bash - - name: Collect Dependencies - uses: actions/upload-artifact@v2 - with: - name: Dependencies - path: dependencies.txt - - name: Test - run: gradle check --console=plain || true - shell: bash - - if: always() - name: Report - uses: dorny/test-reporter@v1 - with: - name: Gradle Tests - path: build/test-results/**/*.xml - reporter: java-junit - fail-on-error: 'false' - - name: Package - run: gradle clean assemble --console=plain - shell: bash - - id: get_artifact - name: Get Artifact Path - run: |- - # Find the largest WAR or JAR, and assume that was what we intended to build. - echo "::set-output name=artifact::$(find build -type f \( -iname \*.jar -o -iname \*.war \) -printf "%p\n" | sort -n | head -1)" - shell: bash - - id: get_artifact_name - name: Get Artifact Name - run: |- - # Get the filename without a path - path="${{ steps.get_artifact.outputs.artifact }}" - echo "::set-output name=artifact::${path##*/}" - shell: bash - - name: Tag Release - uses: mathieudutour/github-tag-action@v6.0 - with: - custom_tag: ${{ steps.determine_version.outputs.semVer }} - github_token: ${{ secrets.GITHUB_TOKEN }} - - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - id: create_release - name: Create Release - uses: actions/create-release@v1 - with: - tag_name: ${{ steps.determine_version.outputs.semVer }}+run${{ github.run_number }}-attempt${{ github.run_attempt }} - release_name: Release ${{ steps.determine_version.outputs.semVer }} Run ${{ github.run_number }} Attempt ${{ github.run_attempt }} - draft: 'false' - prerelease: 'false' - - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Upload Release Asset - uses: actions/upload-release-asset@v1 - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ${{ steps.get_artifact.outputs.artifact }} - asset_name: ${{ steps.get_artifact_name.outputs.artifact }} - asset_content_type: application/octet-stream - - id: get_octopus_artifact - name: Create Octopus Artifact - run: | - # Octopus expects artifacts to have a specific file format - file="${{ steps.get_artifact.outputs.artifact }}" - extension="${file##*.}" - octofile="RandomQuotes-Java.${{ steps.determine_version.outputs.semVer }}.${extension}" - cp ${file} ${octofile} - echo "::set-output name=artifact::${octofile}" - # The version used when creating a release is the package id, colon, and version - octoversion="RandomQuotes-Java:${{ steps.determine_version.outputs.semVer }}" - echo "::set-output name=octoversion::${octoversion}" - shell: bash - - name: Push to Octopus - uses: OctopusDeploy/push-package-action@v1.1.1 - with: - api_key: ${{ secrets.OCTOPUS_API_TOKEN }} - packages: ${{ steps.get_octopus_artifact.outputs.artifact }} - server: ${{ secrets.OCTOPUS_SERVER_URL }} - overwrite_mode: OverwriteExisting - - name: Generate Octopus Deploy build information - uses: xo-energy/action-octopus-build-information@v1.1.2 - with: - octopus_api_key: ${{ secrets.OCTOPUS_API_TOKEN }} - octopus_project: RandomQuotes-Java - octopus_server: ${{ secrets.OCTOPUS_SERVER_URL }} - push_version: ${{ steps.determine_version.outputs.semVer }} - push_package_ids: RandomQuotes-Java - push_overwrite_mode: OverwriteExisting - output_path: octopus - - name: Create Octopus Release - uses: OctopusDeploy/create-release-action@v1.1.1 - with: - api_key: ${{ secrets.OCTOPUS_API_TOKEN }} - project: RandomQuotes-Java - server: ${{ secrets.OCTOPUS_SERVER_URL }} - deploy_to: Dev - packages: ${{ steps.get_octopus_artifact.outputs.octoversion }} name: Java Gradle Build 'on': workflow_dispatch: {} push: {} +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: '0' + - name: Install GitVersion + uses: gittools/actions/gitversion/setup@v0.9.15 + with: + versionSpec: 5.x + - id: determine_version + name: Determine Version + uses: gittools/actions/gitversion/execute@v0.9.15 + with: + additionalArguments: /overrideconfig mode=Mainline + - name: Install Octopus Deploy CLI + uses: OctopusDeploy/install-octopus-cli-action@v1 + with: + version: latest + - name: Set up JDK 1.17 + uses: actions/setup-java@v2 + with: + java-version: '17' + distribution: adopt + - name: List Dependencies + run: ./gradlew dependencies --console=plain > dependencies.txt + shell: bash + - name: Collect Dependencies + uses: actions/upload-artifact@v2 + with: + name: Dependencies + path: dependencies.txt + - name: Test + run: ./gradlew check --console=plain + shell: bash + - if: always() + name: Report + uses: dorny/test-reporter@v1 + with: + name: Gradle Tests + path: build/test-results/**/*.xml + reporter: java-junit + fail-on-error: 'false' + - name: Package + run: ./gradlew clean assemble --console=plain + shell: bash + - id: get_artifact + name: Get Artifact Path + run: |- + # Find the largest WAR or JAR, and assume that was what we intended to build. + echo "::set-output name=artifact::$(find build -type f \( -iname \*.jar -o -iname \*.war \) -printf "%p\n" | sort -n | head -1)" + shell: bash + - id: get_artifact_name + name: Get Artifact Name + run: |- + # Get the filename without a path + path="${{ steps.get_artifact.outputs.artifact }}" + echo "::set-output name=artifact::${path##*/}" + shell: bash + - name: Tag Release + uses: mathieudutour/github-tag-action@v6.1 + with: + custom_tag: ${{ steps.determine_version.outputs.semVer }} + github_token: ${{ secrets.GITHUB_TOKEN }} + - id: create_release + name: Create Release + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ steps.determine_version.outputs.semVer }}+run${{ github.run_number }}-attempt${{ github.run_attempt }} + release_name: Release ${{ steps.determine_version.outputs.semVer }} Run ${{ github.run_number }} Attempt ${{ github.run_attempt }} + draft: 'false' + prerelease: 'false' + - name: Upload Release Asset + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: ${{ steps.get_artifact.outputs.artifact }} + asset_name: ${{ steps.get_artifact_name.outputs.artifact }} + asset_content_type: application/octet-stream + - id: get_octopus_artifact + name: Create Octopus Artifact + run: | + # Octopus expects artifacts to have a specific file format + file="${{ steps.get_artifact.outputs.artifact }}" + extension="${file##*.}" + octofile="SampleGradleProject-SpringBoot.${{ steps.determine_version.outputs.semVer }}.${extension}" + cp ${file} ${octofile} + echo "::set-output name=artifact::${octofile}" + # The version used when creating a release is the package id, colon, and version + octoversion="SampleGradleProject-SpringBoot:${{ steps.determine_version.outputs.semVer }}" + echo "::set-output name=octoversion::${octoversion}" + shell: bash + - name: Push packages to Octopus Deploy + uses: OctopusDeploy/push-package-action@v2 + env: + OCTOPUS_API_KEY: ${{ secrets.OCTOPUS_API_TOKEN }} + OCTOPUS_CLI_SERVER: ${{ secrets.OCTOPUS_SERVER_URL }} + with: + packages: ${{ steps.get_octopus_artifact.outputs.artifact }} + overwrite_mode: OverwriteExisting + - name: Generate Octopus Deploy build information + uses: OctopusDeploy/push-build-information-action@v3 + env: + OCTOPUS_API_KEY: ${{ secrets.OCTOPUS_API_TOKEN }} + OCTOPUS_URL: ${{ secrets.OCTOPUS_SERVER_URL }} + OCTOPUS_SPACE: ${{ secrets.OCTOPUS_SPACE }} + with: + version: ${{ steps.determine_version.outputs.semVer }} + packages: SampleGradleProject-SpringBoot + overwrite_mode: OverwriteExisting + - name: Create Octopus Release + uses: OctopusDeploy/create-release-action@v1 + with: + api_key: ${{ secrets.OCTOPUS_API_TOKEN }} + project: SampleGradleProject-SpringBoot + server: ${{ secrets.OCTOPUS_SERVER_URL }} + deploy_to: Development + packages: ${{ steps.get_octopus_artifact.outputs.octoversion }} +permissions: + id-token: write + checks: write + contents: write diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml index defce7b..17395d3 100644 --- a/.idea/jarRepositories.xml +++ b/.idea/jarRepositories.xml @@ -29,12 +29,12 @@