-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1 from navikt/feature/fra-uttaksregler
NOJIRA Flytter konto og minsterett fra fp-uttak
- Loading branch information
Showing
50 changed files
with
3,688 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,265 @@ | ||
root = true | ||
|
||
[*] | ||
charset = utf-8 | ||
end_of_line = lf | ||
indent_size = 4 | ||
indent_style = space | ||
insert_final_newline = true | ||
max_line_length = 160 | ||
tab_width = 4 | ||
trim_trailing_whitespace = true | ||
ij_continuation_indent_size = 4 | ||
ij_formatter_off_tag = @formatter:off | ||
ij_formatter_on_tag = @formatter:on | ||
ij_formatter_tags_enabled = false | ||
ij_smart_tabs = false | ||
ij_wrap_on_typing = false | ||
|
||
[*.java] | ||
ij_java_align_consecutive_assignments = false | ||
ij_java_align_consecutive_variable_declarations = false | ||
ij_java_align_group_field_declarations = false | ||
ij_java_align_multiline_annotation_parameters = false | ||
ij_java_align_multiline_array_initializer_expression = false | ||
ij_java_align_multiline_assignment = false | ||
ij_java_align_multiline_binary_operation = false | ||
ij_java_align_multiline_chained_methods = false | ||
ij_java_align_multiline_extends_list = true | ||
ij_java_align_multiline_for = true | ||
ij_java_align_multiline_method_parentheses = false | ||
ij_java_align_multiline_parameters = true | ||
ij_java_align_multiline_parameters_in_calls = false | ||
ij_java_align_multiline_parenthesized_expression = false | ||
ij_java_align_multiline_records = true | ||
ij_java_align_multiline_resources = true | ||
ij_java_align_multiline_ternary_operation = false | ||
ij_java_align_multiline_text_blocks = false | ||
ij_java_align_multiline_throws_list = false | ||
ij_java_align_subsequent_simple_methods = false | ||
ij_java_align_throws_keyword = false | ||
ij_java_annotation_parameter_wrap = off | ||
ij_java_array_initializer_new_line_after_left_brace = false | ||
ij_java_array_initializer_right_brace_on_new_line = false | ||
ij_java_array_initializer_wrap = off | ||
ij_java_assert_statement_colon_on_next_line = false | ||
ij_java_assert_statement_wrap = off | ||
ij_java_assignment_wrap = off | ||
ij_java_binary_operation_sign_on_next_line = true | ||
ij_java_binary_operation_wrap = normal | ||
ij_java_blank_lines_after_anonymous_class_header = 0 | ||
ij_java_blank_lines_after_class_header = 0 | ||
ij_java_blank_lines_after_imports = 1 | ||
ij_java_blank_lines_after_package = 1 | ||
ij_java_blank_lines_around_class = 1 | ||
ij_java_blank_lines_around_field = 0 | ||
ij_java_blank_lines_around_field_in_interface = 0 | ||
ij_java_blank_lines_around_initializer = 1 | ||
ij_java_blank_lines_around_method = 1 | ||
ij_java_blank_lines_around_method_in_interface = 1 | ||
ij_java_blank_lines_before_class_end = 0 | ||
ij_java_blank_lines_before_imports = 1 | ||
ij_java_blank_lines_before_method_body = 0 | ||
ij_java_blank_lines_before_package = 0 | ||
ij_java_block_brace_style = end_of_line | ||
ij_java_block_comment_at_first_column = true | ||
ij_java_call_parameters_new_line_after_left_paren = false | ||
ij_java_call_parameters_right_paren_on_new_line = false | ||
ij_java_call_parameters_wrap = normal | ||
ij_java_case_statement_on_separate_line = true | ||
ij_java_catch_on_new_line = false | ||
ij_java_class_annotation_wrap = split_into_lines | ||
ij_java_class_brace_style = end_of_line | ||
ij_java_class_count_to_use_import_on_demand = 999999 | ||
ij_java_class_names_in_javadoc = 1 | ||
ij_java_do_not_indent_top_level_class_members = false | ||
ij_java_do_not_wrap_after_single_annotation = false | ||
ij_java_do_while_brace_force = always | ||
ij_java_doc_add_blank_line_after_description = true | ||
ij_java_doc_add_blank_line_after_param_comments = false | ||
ij_java_doc_add_blank_line_after_return = false | ||
ij_java_doc_add_p_tag_on_empty_lines = true | ||
ij_java_doc_align_exception_comments = true | ||
ij_java_doc_align_param_comments = true | ||
ij_java_doc_do_not_wrap_if_one_line = false | ||
ij_java_doc_enable_formatting = true | ||
ij_java_doc_enable_leading_asterisks = true | ||
ij_java_doc_indent_on_continuation = false | ||
ij_java_doc_keep_empty_lines = true | ||
ij_java_doc_keep_empty_parameter_tag = true | ||
ij_java_doc_keep_empty_return_tag = true | ||
ij_java_doc_keep_empty_throws_tag = true | ||
ij_java_doc_keep_invalid_tags = true | ||
ij_java_doc_param_description_on_new_line = false | ||
ij_java_doc_preserve_line_breaks = false | ||
ij_java_doc_use_throws_not_exception_tag = true | ||
ij_java_else_on_new_line = false | ||
ij_java_entity_dd_suffix = EJB | ||
ij_java_entity_eb_suffix = Bean | ||
ij_java_entity_hi_suffix = Home | ||
ij_java_entity_lhi_prefix = Local | ||
ij_java_entity_lhi_suffix = Home | ||
ij_java_entity_li_prefix = Local | ||
ij_java_entity_pk_class = java.lang.String | ||
ij_java_entity_vo_suffix = VO | ||
ij_java_enum_constants_wrap = split_into_lines | ||
ij_java_extends_keyword_wrap = off | ||
ij_java_extends_list_wrap = off | ||
ij_java_field_annotation_wrap = split_into_lines | ||
ij_java_finally_on_new_line = false | ||
ij_java_for_brace_force = always | ||
ij_java_for_statement_new_line_after_left_paren = false | ||
ij_java_for_statement_right_paren_on_new_line = false | ||
ij_java_for_statement_wrap = off | ||
ij_java_generate_final_locals = false | ||
ij_java_generate_final_parameters = false | ||
ij_java_if_brace_force = always | ||
ij_java_imports_layout = $*, |, java.**, |, javax.**, |, org.**, |, com.**, |, *, | | ||
ij_java_indent_case_from_switch = true | ||
ij_java_insert_inner_class_imports = false | ||
ij_java_insert_override_annotation = true | ||
ij_java_keep_blank_lines_before_right_brace = 2 | ||
ij_java_keep_blank_lines_between_package_declaration_and_header = 2 | ||
ij_java_keep_blank_lines_in_code = 2 | ||
ij_java_keep_blank_lines_in_declarations = 2 | ||
ij_java_keep_control_statement_in_one_line = false | ||
ij_java_keep_first_column_comment = false | ||
ij_java_keep_indents_on_empty_lines = false | ||
ij_java_keep_line_breaks = false | ||
ij_java_keep_multiple_expressions_in_one_line = false | ||
ij_java_keep_simple_blocks_in_one_line = false | ||
ij_java_keep_simple_classes_in_one_line = false | ||
ij_java_keep_simple_lambdas_in_one_line = false | ||
ij_java_keep_simple_methods_in_one_line = false | ||
ij_java_label_indent_absolute = false | ||
ij_java_label_indent_size = 0 | ||
ij_java_lambda_brace_style = end_of_line | ||
ij_java_layout_static_imports_separately = true | ||
ij_java_line_comment_add_space = false | ||
ij_java_line_comment_at_first_column = true | ||
ij_java_message_dd_suffix = EJB | ||
ij_java_message_eb_suffix = Bean | ||
ij_java_method_annotation_wrap = split_into_lines | ||
ij_java_method_brace_style = end_of_line | ||
ij_java_method_call_chain_wrap = on_every_item | ||
ij_java_method_parameters_new_line_after_left_paren = false | ||
ij_java_method_parameters_right_paren_on_new_line = false | ||
ij_java_method_parameters_wrap = on_every_item | ||
ij_java_modifier_list_wrap = false | ||
ij_java_names_count_to_use_import_on_demand = 9999999 | ||
ij_java_new_line_after_lparen_in_record_header = false | ||
ij_java_packages_to_use_import_on_demand = java.awt.*, javax.swing.* | ||
ij_java_parameter_annotation_wrap = off | ||
ij_java_parentheses_expression_new_line_after_left_paren = false | ||
ij_java_parentheses_expression_right_paren_on_new_line = false | ||
ij_java_place_assignment_sign_on_next_line = false | ||
ij_java_prefer_longer_names = true | ||
ij_java_prefer_parameters_wrap = false | ||
ij_java_record_components_wrap = normal | ||
ij_java_repeat_synchronized = true | ||
ij_java_replace_instanceof_and_cast = false | ||
ij_java_replace_null_check = true | ||
ij_java_replace_sum_lambda_with_method_ref = true | ||
ij_java_resource_list_new_line_after_left_paren = false | ||
ij_java_resource_list_right_paren_on_new_line = false | ||
ij_java_resource_list_wrap = off | ||
ij_java_rparen_on_new_line_in_record_header = false | ||
ij_java_session_dd_suffix = EJB | ||
ij_java_session_eb_suffix = Bean | ||
ij_java_session_hi_suffix = Home | ||
ij_java_session_lhi_prefix = Local | ||
ij_java_session_lhi_suffix = Home | ||
ij_java_session_li_prefix = Local | ||
ij_java_session_si_suffix = Service | ||
ij_java_space_after_closing_angle_bracket_in_type_argument = false | ||
ij_java_space_after_colon = true | ||
ij_java_space_after_comma = true | ||
ij_java_space_after_comma_in_type_arguments = true | ||
ij_java_space_after_for_semicolon = true | ||
ij_java_space_after_quest = true | ||
ij_java_space_after_type_cast = true | ||
ij_java_space_before_annotation_array_initializer_left_brace = false | ||
ij_java_space_before_annotation_parameter_list = false | ||
ij_java_space_before_array_initializer_left_brace = false | ||
ij_java_space_before_catch_keyword = true | ||
ij_java_space_before_catch_left_brace = true | ||
ij_java_space_before_catch_parentheses = true | ||
ij_java_space_before_class_left_brace = true | ||
ij_java_space_before_colon = true | ||
ij_java_space_before_colon_in_foreach = true | ||
ij_java_space_before_comma = false | ||
ij_java_space_before_do_left_brace = true | ||
ij_java_space_before_else_keyword = true | ||
ij_java_space_before_else_left_brace = true | ||
ij_java_space_before_finally_keyword = true | ||
ij_java_space_before_finally_left_brace = true | ||
ij_java_space_before_for_left_brace = true | ||
ij_java_space_before_for_parentheses = true | ||
ij_java_space_before_for_semicolon = false | ||
ij_java_space_before_if_left_brace = true | ||
ij_java_space_before_if_parentheses = true | ||
ij_java_space_before_method_call_parentheses = false | ||
ij_java_space_before_method_left_brace = true | ||
ij_java_space_before_method_parentheses = false | ||
ij_java_space_before_opening_angle_bracket_in_type_parameter = false | ||
ij_java_space_before_quest = true | ||
ij_java_space_before_switch_left_brace = true | ||
ij_java_space_before_switch_parentheses = true | ||
ij_java_space_before_synchronized_left_brace = true | ||
ij_java_space_before_synchronized_parentheses = true | ||
ij_java_space_before_try_left_brace = true | ||
ij_java_space_before_try_parentheses = true | ||
ij_java_space_before_type_parameter_list = false | ||
ij_java_space_before_while_keyword = true | ||
ij_java_space_before_while_left_brace = true | ||
ij_java_space_before_while_parentheses = true | ||
ij_java_space_inside_one_line_enum_braces = false | ||
ij_java_space_within_empty_array_initializer_braces = false | ||
ij_java_space_within_empty_method_call_parentheses = false | ||
ij_java_space_within_empty_method_parentheses = false | ||
ij_java_spaces_around_additive_operators = true | ||
ij_java_spaces_around_assignment_operators = true | ||
ij_java_spaces_around_bitwise_operators = true | ||
ij_java_spaces_around_equality_operators = true | ||
ij_java_spaces_around_lambda_arrow = true | ||
ij_java_spaces_around_logical_operators = true | ||
ij_java_spaces_around_method_ref_dbl_colon = false | ||
ij_java_spaces_around_multiplicative_operators = true | ||
ij_java_spaces_around_relational_operators = true | ||
ij_java_spaces_around_shift_operators = true | ||
ij_java_spaces_around_type_bounds_in_type_parameters = true | ||
ij_java_spaces_around_unary_operator = false | ||
ij_java_spaces_within_angle_brackets = false | ||
ij_java_spaces_within_annotation_parentheses = false | ||
ij_java_spaces_within_array_initializer_braces = false | ||
ij_java_spaces_within_braces = false | ||
ij_java_spaces_within_brackets = false | ||
ij_java_spaces_within_cast_parentheses = false | ||
ij_java_spaces_within_catch_parentheses = false | ||
ij_java_spaces_within_for_parentheses = false | ||
ij_java_spaces_within_if_parentheses = false | ||
ij_java_spaces_within_method_call_parentheses = false | ||
ij_java_spaces_within_method_parentheses = false | ||
ij_java_spaces_within_parentheses = false | ||
ij_java_spaces_within_switch_parentheses = false | ||
ij_java_spaces_within_synchronized_parentheses = false | ||
ij_java_spaces_within_try_parentheses = false | ||
ij_java_spaces_within_while_parentheses = false | ||
ij_java_special_else_if_treatment = true | ||
ij_java_subclass_name_suffix = Impl | ||
ij_java_ternary_operation_signs_on_next_line = false | ||
ij_java_ternary_operation_wrap = off | ||
ij_java_test_name_suffix = Test | ||
ij_java_throws_keyword_wrap = off | ||
ij_java_throws_list_wrap = off | ||
ij_java_use_external_annotations = false | ||
ij_java_use_fq_class_names = false | ||
ij_java_use_relative_indents = false | ||
ij_java_use_single_class_imports = true | ||
ij_java_variable_annotation_wrap = off | ||
ij_java_visibility = public | ||
ij_java_while_brace_force = always | ||
ij_java_while_on_new_line = false | ||
ij_java_wrap_comments = false | ||
ij_java_wrap_first_method_in_call_chain = false | ||
ij_java_wrap_long_lines = false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
#!/bin/sh | ||
# | ||
# An example hook script to check the commit log message. | ||
# Called by "git commit" with one argument, the name of the file | ||
# that has the commit message. The hook should exit with non-zero | ||
# status after issuing an appropriate message if it wants to stop the | ||
# commit. The hook is allowed to edit the commit message file. | ||
# | ||
# | ||
# Tillater kun commit meldinger som starter med "TFP-1234: ", "NOJIRA: " eller "Merge " | ||
|
||
regex="^(Merge|TFP-[0-9]{1,}|NOJIRA|RELEASE|updating poms)(:|,)? .*" | ||
commit_msg=$(cat $1) | ||
|
||
error_msg="Avbryter commit. Det er kun tillat med commit meldinger som begynne med \"TFP-nn \", \"NOJIRA\" eller \"Merge \"." | ||
|
||
if [[ ! $commit_msg =~ $regex ]]; then | ||
echo "$error_msg" >&2 | ||
exit 1 | ||
fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
#!/bin/sh | ||
|
||
isMaster=$(git branch | grep \* | sed 's/* master$/1/g') | ||
|
||
error_msg="Avbryter commit. Det er ikke tillat å committe til master." | ||
|
||
if [[ "$isMaster" = "1" ]]; then | ||
echo "$error_msg" >&2 | ||
exit 1 | ||
fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
<?xml version='1.0' encoding='UTF-8' ?> | ||
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" | ||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 | ||
http://maven.apache.org/xsd/settings-1.0.0.xsd"> | ||
<activeProfiles> | ||
<activeProfile>github</activeProfile> | ||
</activeProfiles> | ||
<profiles> | ||
<profile> | ||
<id>github</id> | ||
<repositories> | ||
<repository> | ||
<id>central</id> | ||
<url>https://repo1.maven.org/maven2</url> | ||
<releases> | ||
<enabled>true</enabled> | ||
</releases> | ||
<snapshots> | ||
<enabled>true</enabled> | ||
</snapshots> | ||
</repository> | ||
<repository> | ||
<id>github</id> | ||
<name>GitHub Apache Maven Packages</name> | ||
<url>https://maven.pkg.github.com/navikt/fp-stonadskonto/</url> | ||
</repository> | ||
</repositories> | ||
</profile> | ||
</profiles> | ||
<servers> | ||
<server> | ||
<id>github</id> | ||
<username>x-access-token</username> | ||
<password>${env.GITHUB_TOKEN}</password> | ||
</server> | ||
</servers> | ||
</settings> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
version: 2 | ||
registries: | ||
fp-felles: # Gir tilgang til registre innad i nav med fp-felles som inngang (PATen bestemmer) | ||
type: maven-repository | ||
url: https://maven.pkg.github.com/navikt/fp-felles | ||
username: x-access-token | ||
password: ${{ secrets.PAT }} | ||
|
||
updates: | ||
- package-ecosystem: github-actions | ||
directory: "/" | ||
schedule: | ||
interval: daily | ||
open-pull-requests-limit: 10 | ||
- package-ecosystem: maven | ||
directory: "/" | ||
registries: | ||
- fp-felles | ||
schedule: | ||
interval: daily | ||
open-pull-requests-limit: 20 | ||
ignore: | ||
- dependency-name: "no.nav.vedtak.prosesstask:*" | ||
versions: ["x", "x.x"] | ||
- dependency-name: "no.nav.foreldrepenger.felles:*" | ||
versions: ["x", "x.x"] | ||
- dependency-name: "no.nav.foreldrepenger.kontrakter:*" | ||
versions: ["x", "x.x"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
name-template: $NEXT_PATCH_VERSION | ||
tag-template: $NEXT_PATCH_VERSION | ||
change-template: '- $TITLE (#$NUMBER) @$AUTHOR' | ||
categories: | ||
- title: '🚀 Features' | ||
labels: | ||
- 'feature' | ||
- 'enhancement' | ||
- title: '⚠️ Breaking Changes' | ||
labels: | ||
- 'breaking' | ||
- title: '🐛 Bug Fixes' | ||
labels: | ||
- 'fix' | ||
- 'bugfix' | ||
- 'bug' | ||
- title: '🧰 Maintenance' | ||
labels: | ||
- 'chore' | ||
- title: '⬆️ Dependency upgrades' | ||
labels: | ||
- 'bump' | ||
- 'dependencies' | ||
exclude-labels: | ||
- 'skip-changelog' | ||
template: | | ||
## What's Changed | ||
$CHANGES |
Oops, something went wrong.