Skip to content

Commit

Permalink
Merge branch 'release/4.9.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
@olliefreeman
olliefreeman committed Aug 24, 2021
2 parents 01f6a0f + 4cea94b commit 9448222
Show file tree
Hide file tree
Showing 42 changed files with 2,863 additions and 775 deletions.
4 changes: 2 additions & 2 deletions gradle.properties
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Core Info
version=4.8.0
version=4.9.0
group=uk.ac.ox.softeng.maurodatamapper
# Gradle
gradleVersion=6.7.1
Expand All @@ -10,7 +10,7 @@ sourceCompatibility=12
targetCompatibility=12
# Deployment & Build
artifactory_contextUrl=https://jenkins.cs.ox.ac.uk/artifactory
oxbrcinformaticsGradlePluginsVersion=3.13
oxbrcinformaticsGradlePluginsVersion=3.14
licenseGradlePluginVersion=0.15.0
licenseGradlePluginSpringCoreOverrideVersion=5.1.14.RELEASE
## Grails
Expand Down
245 changes: 6 additions & 239 deletions gradle/OxfordBRC_Intellij_CodeStyle.xml
View file
Original file line number Diff line number Diff line change
@@ -1,55 +1,6 @@
<code_scheme name="OxfordBRC" version="173">
<option name="LINE_SEPARATOR" value="&#xA;" />
<option name="RIGHT_MARGIN" value="150" />
<option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="true" />
<DB2CodeStyleSettings version="2">
<option name="ALIAS_CASE" value="4" />
<option name="KEYWORD_CASE" value="0" />
<option name="TYPE_CASE" value="3" />
<option name="QUERY_IN_ONE_STRING" value="1" />
<option name="WITH_ALIGN_AS" value="true" />
<option name="SELECT_NEW_LINE_AFTER_ALL_DISTINCT" value="true" />
<option name="SELECT_KEEP_N_ITEMS_IN_LINE" value="0" />
<option name="FROM_INDENT_JOIN" value="false" />
<option name="WHERE_EL_BOUND" value="2" />
<option name="ORDER_EL_WRAP" value="1" />
<option name="TABLE_OPENING" value="1" />
<option name="TABLE_CONTENT" value="2" />
<option name="TABLE_CLOSING" value="3" />
<option name="TABLE_ALTER_INSTRUCTION_ALIGN" value="false" />
<option name="POST_OPT_WRAP_1" value="true" />
<option name="IMP_DECLARE_EL_WRAP" value="1" />
<option name="IMP_IF_THEN_WRAP_THEN" value="true" />
<option name="CORTEGE_SPACE_BEFORE_L_PAREN" value="false" />
<option name="EXPR_CASE_THEN_WRAP" value="true" />
<option name="EXPR_CASE_THEN_ALIGN" value="true" />
<option name="EXPR_CASE_END" value="1" />
<option name="PRIMARY_KEY_NAME_TEMPLATE" value="{table}_{columns}_pk" />
</DB2CodeStyleSettings>
<DerbyCodeStyleSettings version="2">
<option name="ALIAS_CASE" value="4" />
<option name="KEYWORD_CASE" value="0" />
<option name="TYPE_CASE" value="3" />
<option name="QUERY_IN_ONE_STRING" value="1" />
<option name="WITH_ALIGN_AS" value="true" />
<option name="SELECT_NEW_LINE_AFTER_ALL_DISTINCT" value="true" />
<option name="SELECT_KEEP_N_ITEMS_IN_LINE" value="0" />
<option name="FROM_INDENT_JOIN" value="false" />
<option name="WHERE_EL_BOUND" value="2" />
<option name="ORDER_EL_WRAP" value="1" />
<option name="TABLE_OPENING" value="1" />
<option name="TABLE_CONTENT" value="2" />
<option name="TABLE_CLOSING" value="3" />
<option name="TABLE_ALTER_INSTRUCTION_ALIGN" value="false" />
<option name="POST_OPT_WRAP_1" value="true" />
<option name="IMP_DECLARE_EL_WRAP" value="1" />
<option name="IMP_IF_THEN_WRAP_THEN" value="true" />
<option name="CORTEGE_SPACE_BEFORE_L_PAREN" value="false" />
<option name="EXPR_CASE_THEN_WRAP" value="true" />
<option name="EXPR_CASE_THEN_ALIGN" value="true" />
<option name="EXPR_CASE_END" value="1" />
<option name="PRIMARY_KEY_NAME_TEMPLATE" value="{table}_{columns}_pk" />
</DerbyCodeStyleSettings>
<option name="RIGHT_MARGIN" value="175" />
<GroovyCodeStyleSettings>
<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="9999" />
<option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="9999" />
Expand All @@ -75,50 +26,6 @@
</value>
</option>
</GroovyCodeStyleSettings>
<H2CodeStyleSettings version="2">
<option name="ALIAS_CASE" value="4" />
<option name="KEYWORD_CASE" value="0" />
<option name="TYPE_CASE" value="3" />
<option name="QUERY_IN_ONE_STRING" value="1" />
<option name="WITH_ALIGN_AS" value="true" />
<option name="SELECT_NEW_LINE_AFTER_ALL_DISTINCT" value="true" />
<option name="SELECT_KEEP_N_ITEMS_IN_LINE" value="0" />
<option name="FROM_INDENT_JOIN" value="false" />
<option name="WHERE_EL_BOUND" value="2" />
<option name="ORDER_EL_WRAP" value="1" />
<option name="TABLE_OPENING" value="1" />
<option name="TABLE_CONTENT" value="2" />
<option name="TABLE_CLOSING" value="3" />
<option name="TABLE_ALTER_INSTRUCTION_ALIGN" value="false" />
<option name="POST_OPT_WRAP_1" value="true" />
<option name="CORTEGE_SPACE_BEFORE_L_PAREN" value="false" />
<option name="EXPR_CASE_THEN_WRAP" value="true" />
<option name="EXPR_CASE_THEN_ALIGN" value="true" />
<option name="EXPR_CASE_END" value="1" />
<option name="PRIMARY_KEY_NAME_TEMPLATE" value="{table}_{columns}_pk" />
</H2CodeStyleSettings>
<HSQLCodeStyleSettings version="2">
<option name="ALIAS_CASE" value="4" />
<option name="KEYWORD_CASE" value="0" />
<option name="TYPE_CASE" value="3" />
<option name="QUERY_IN_ONE_STRING" value="1" />
<option name="WITH_ALIGN_AS" value="true" />
<option name="SELECT_NEW_LINE_AFTER_ALL_DISTINCT" value="true" />
<option name="SELECT_KEEP_N_ITEMS_IN_LINE" value="0" />
<option name="FROM_INDENT_JOIN" value="false" />
<option name="WHERE_EL_BOUND" value="2" />
<option name="ORDER_EL_WRAP" value="1" />
<option name="TABLE_OPENING" value="1" />
<option name="TABLE_CONTENT" value="2" />
<option name="TABLE_CLOSING" value="3" />
<option name="TABLE_ALTER_INSTRUCTION_ALIGN" value="false" />
<option name="POST_OPT_WRAP_1" value="true" />
<option name="CORTEGE_SPACE_BEFORE_L_PAREN" value="false" />
<option name="EXPR_CASE_THEN_WRAP" value="true" />
<option name="EXPR_CASE_THEN_ALIGN" value="true" />
<option name="EXPR_CASE_END" value="1" />
<option name="PRIMARY_KEY_NAME_TEMPLATE" value="{table}_{columns}_pk" />
</HSQLCodeStyleSettings>
<JavaCodeStyleSettings>
<option name="ANNOTATION_PARAMETER_WRAP" value="1" />
<option name="ALIGN_MULTILINE_ANNOTATION_PARAMETERS" value="true" />
Expand Down Expand Up @@ -149,127 +56,11 @@
<option name="JD_ADD_BLANK_AFTER_RETURN" value="true" />
<option name="JD_P_AT_EMPTY_LINES" value="false" />
</JavaCodeStyleSettings>
<MSSQLCodeStyleSettings version="2">
<option name="ALIAS_CASE" value="4" />
<option name="KEYWORD_CASE" value="0" />
<SqlCodeStyleSettings version="6">
<option name="KEYWORD_CASE" value="2" />
<option name="TYPE_CASE" value="3" />
<option name="QUERY_IN_ONE_STRING" value="1" />
<option name="WITH_ALIGN_AS" value="true" />
<option name="SELECT_NEW_LINE_AFTER_ALL_DISTINCT" value="true" />
<option name="SELECT_KEEP_N_ITEMS_IN_LINE" value="0" />
<option name="FROM_INDENT_JOIN" value="false" />
<option name="WHERE_EL_BOUND" value="2" />
<option name="ORDER_EL_WRAP" value="1" />
<option name="TABLE_OPENING" value="1" />
<option name="TABLE_CONTENT" value="2" />
<option name="TABLE_CLOSING" value="3" />
<option name="TABLE_ALTER_INSTRUCTION_ALIGN" value="false" />
<option name="POST_OPT_WRAP_1" value="true" />
<option name="IMP_DECLARE_EL_WRAP" value="1" />
<option name="IMP_IF_THEN_WRAP_THEN" value="true" />
<option name="CORTEGE_SPACE_BEFORE_L_PAREN" value="false" />
<option name="EXPR_CASE_THEN_WRAP" value="true" />
<option name="EXPR_CASE_THEN_ALIGN" value="true" />
<option name="EXPR_CASE_END" value="1" />
<option name="PRIMARY_KEY_NAME_TEMPLATE" value="{table}_{columns}_pk" />
</MSSQLCodeStyleSettings>
<MySQLCodeStyleSettings version="2">
<option name="CUSTOM_TYPE_CASE" value="3" />
<option name="ALIAS_CASE" value="4" />
<option name="KEYWORD_CASE" value="0" />
<option name="TYPE_CASE" value="3" />
<option name="QUERY_IN_ONE_STRING" value="1" />
<option name="WITH_ALIGN_AS" value="true" />
<option name="SELECT_NEW_LINE_AFTER_ALL_DISTINCT" value="true" />
<option name="SELECT_KEEP_N_ITEMS_IN_LINE" value="0" />
<option name="FROM_INDENT_JOIN" value="false" />
<option name="WHERE_EL_BOUND" value="2" />
<option name="ORDER_EL_WRAP" value="1" />
<option name="TABLE_OPENING" value="1" />
<option name="TABLE_CONTENT" value="2" />
<option name="TABLE_CLOSING" value="3" />
<option name="TABLE_ALTER_INSTRUCTION_ALIGN" value="false" />
<option name="POST_OPT_WRAP_1" value="true" />
<option name="IMP_IF_THEN_WRAP_THEN" value="true" />
<option name="CORTEGE_SPACE_BEFORE_L_PAREN" value="false" />
<option name="EXPR_CASE_THEN_WRAP" value="true" />
<option name="EXPR_CASE_THEN_ALIGN" value="true" />
<option name="EXPR_CASE_END" value="1" />
<option name="PRIMARY_KEY_NAME_TEMPLATE" value="{table}_{columns}_pk" />
</MySQLCodeStyleSettings>
<OracleCodeStyleSettings version="2">
<option name="ALIAS_CASE" value="4" />
<option name="KEYWORD_CASE" value="0" />
<option name="TYPE_CASE" value="3" />
<option name="QUERY_IN_ONE_STRING" value="1" />
<option name="WITH_ALIGN_AS" value="true" />
<option name="SELECT_NEW_LINE_AFTER_ALL_DISTINCT" value="true" />
<option name="SELECT_KEEP_N_ITEMS_IN_LINE" value="0" />
<option name="FROM_INDENT_JOIN" value="false" />
<option name="WHERE_EL_BOUND" value="2" />
<option name="ORDER_EL_WRAP" value="1" />
<option name="TABLE_OPENING" value="1" />
<option name="TABLE_CONTENT" value="2" />
<option name="TABLE_CLOSING" value="3" />
<option name="TABLE_ALTER_INSTRUCTION_ALIGN" value="false" />
<option name="POST_OPT_WRAP_1" value="true" />
<option name="IMP_DECLARE_EL_WRAP" value="1" />
<option name="IMP_IF_THEN_WRAP_THEN" value="true" />
<option name="CORTEGE_SPACE_BEFORE_L_PAREN" value="false" />
<option name="EXPR_CASE_THEN_WRAP" value="true" />
<option name="EXPR_CASE_THEN_ALIGN" value="true" />
<option name="EXPR_CASE_END" value="1" />
<option name="PRIMARY_KEY_NAME_TEMPLATE" value="{table}_{columns}_pk" />
</OracleCodeStyleSettings>
<PostgresCodeStyleSettings version="2">
<option name="ALIAS_CASE" value="4" />
<option name="KEYWORD_CASE" value="0" />
<option name="TYPE_CASE" value="3" />
<option name="QUERY_IN_ONE_STRING" value="1" />
<option name="WITH_ALIGN_AS" value="true" />
<option name="SELECT_NEW_LINE_AFTER_ALL_DISTINCT" value="true" />
<option name="SELECT_KEEP_N_ITEMS_IN_LINE" value="0" />
<option name="FROM_INDENT_JOIN" value="false" />
<option name="WHERE_EL_BOUND" value="2" />
<option name="ORDER_EL_WRAP" value="1" />
<option name="TABLE_OPENING" value="1" />
<option name="TABLE_CONTENT" value="2" />
<option name="TABLE_CLOSING" value="3" />
<option name="TABLE_ALTER_INSTRUCTION_ALIGN" value="false" />
<option name="POST_OPT_WRAP_1" value="true" />
<option name="IMP_DECLARE_EL_WRAP" value="1" />
<option name="IMP_IF_THEN_WRAP_THEN" value="true" />
<option name="CORTEGE_SPACE_BEFORE_L_PAREN" value="false" />
<option name="EXPR_CASE_THEN_WRAP" value="true" />
<option name="EXPR_CASE_THEN_ALIGN" value="true" />
<option name="EXPR_CASE_END" value="1" />
<option name="PRIMARY_KEY_NAME_TEMPLATE" value="{table}_{columns}_pk" />
</PostgresCodeStyleSettings>
<SQLiteCodeStyleSettings version="2">
<option name="ALIAS_CASE" value="4" />
<option name="KEYWORD_CASE" value="0" />
<option name="TYPE_CASE" value="3" />
<option name="QUERY_IN_ONE_STRING" value="1" />
<option name="WITH_ALIGN_AS" value="true" />
<option name="SELECT_NEW_LINE_AFTER_ALL_DISTINCT" value="true" />
<option name="SELECT_KEEP_N_ITEMS_IN_LINE" value="0" />
<option name="FROM_INDENT_JOIN" value="false" />
<option name="WHERE_EL_BOUND" value="2" />
<option name="ORDER_EL_WRAP" value="1" />
<option name="TABLE_OPENING" value="1" />
<option name="TABLE_CONTENT" value="2" />
<option name="TABLE_CLOSING" value="3" />
<option name="TABLE_ALTER_INSTRUCTION_ALIGN" value="false" />
<option name="POST_OPT_WRAP_1" value="true" />
<option name="CORTEGE_SPACE_BEFORE_L_PAREN" value="false" />
<option name="EXPR_CASE_THEN_WRAP" value="true" />
<option name="EXPR_CASE_THEN_ALIGN" value="true" />
<option name="EXPR_CASE_END" value="1" />
<option name="PRIMARY_KEY_NAME_TEMPLATE" value="{table}_{columns}_pk" />
</SQLiteCodeStyleSettings>
<SqlCodeStyleSettings version="2">
<option name="ALIAS_CASE" value="4" />
<option name="KEYWORD_CASE" value="0" />
<option name="TYPE_CASE" value="3" />
<option name="QUERY_IN_ONE_STRING" value="1" />
<option name="WITH_ALIGN_AS" value="true" />
<option name="SELECT_NEW_LINE_AFTER_ALL_DISTINCT" value="true" />
Expand Down Expand Up @@ -302,35 +93,10 @@
<option name="WRAP_VALUES_EXPRESSION" value="0" />
<option name="WRAP_PARENTHESIZED_EXPRESSION_INSIDE_VALUES" value="0" />
</SqlCodeStyleSettings>
<SybaseCodeStyleSettings version="2">
<option name="ALIAS_CASE" value="4" />
<option name="KEYWORD_CASE" value="0" />
<option name="TYPE_CASE" value="3" />
<option name="QUERY_IN_ONE_STRING" value="1" />
<option name="WITH_ALIGN_AS" value="true" />
<option name="SELECT_NEW_LINE_AFTER_ALL_DISTINCT" value="true" />
<option name="SELECT_KEEP_N_ITEMS_IN_LINE" value="0" />
<option name="FROM_INDENT_JOIN" value="false" />
<option name="WHERE_EL_BOUND" value="2" />
<option name="ORDER_EL_WRAP" value="1" />
<option name="TABLE_OPENING" value="1" />
<option name="TABLE_CONTENT" value="2" />
<option name="TABLE_CLOSING" value="3" />
<option name="TABLE_ALTER_INSTRUCTION_ALIGN" value="false" />
<option name="POST_OPT_WRAP_1" value="true" />
<option name="IMP_DECLARE_EL_WRAP" value="1" />
<option name="IMP_IF_THEN_WRAP_THEN" value="true" />
<option name="CORTEGE_SPACE_BEFORE_L_PAREN" value="false" />
<option name="EXPR_CASE_THEN_WRAP" value="true" />
<option name="EXPR_CASE_THEN_ALIGN" value="true" />
<option name="EXPR_CASE_END" value="1" />
<option name="PRIMARY_KEY_NAME_TEMPLATE" value="{table}_{columns}_pk" />
</SybaseCodeStyleSettings>
<XML>
<option name="XML_KEEP_WHITESPACES" value="true" />
<option name="XML_TEXT_WRAP" value="0" />
<option name="XML_SPACE_INSIDE_EMPTY_TAG" value="true" />
<option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
</XML>
<codeStyleSettings language="Groovy">
<option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
Expand All @@ -341,6 +107,7 @@
<option name="ALIGN_MULTILINE_THROWS_LIST" value="true" />
<option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
<option name="ALIGN_MULTILINE_METHOD_BRACKETS" value="true" />
<option name="SPACE_WITHIN_BRACES" value="false" />
<option name="CALL_PARAMETERS_WRAP" value="1" />
<option name="METHOD_PARAMETERS_WRAP" value="1" />
<option name="EXTENDS_LIST_WRAP" value="1" />
Expand Down Expand Up @@ -391,10 +158,10 @@
<option name="ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE" value="true" />
<option name="ASSIGNMENT_WRAP" value="1" />
<option name="ASSERT_STATEMENT_WRAP" value="1" />
<option name="WRAP_LONG_LINES" value="true" />
<option name="PARAMETER_ANNOTATION_WRAP" value="1" />
<option name="VARIABLE_ANNOTATION_WRAP" value="1" />
<option name="ENUM_CONSTANTS_WRAP" value="1" />
<option name="WRAP_ON_TYPING" value="0" />
<indentOptions>
<option name="CONTINUATION_INDENT_SIZE" value="4" />
</indentOptions>
Expand Down

0 comments on commit 9448222

Please sign in to comment.