Skip to content

Commit 6117460

Browse files
basmussenbasmussen
committed
Merge branch 'release/1.0.0'
2 parents 9d3b174 + 41ebc97 commit 6117460

12 files changed

Lines changed: 387 additions & 0 deletions

‎.github/workflows/gitflow-hotfix.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Gitflow Hotfix
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
action:
7+
description: 'Gitflow action to perform'
8+
required: true
9+
type: choice
10+
options:
11+
- hotfix-start
12+
- hotfix-finish
13+
version:
14+
description: 'Hotfix version (e.g., 1.0.1)'
15+
required: true
16+
17+
jobs:
18+
call-gitflow-hotfix:
19+
uses: dataliquid/github-actions/.github/workflows/gitflow-hotfix.yml@master
20+
with:
21+
action: ${{ inputs.action }}
22+
version: ${{ inputs.version }}
23+
java-version: '11'
24+
java-distribution: 'temurin'
25+
secrets: inherit

‎.github/workflows/gitflow-release.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Gitflow Release
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
action:
7+
description: 'Gitflow action to perform'
8+
required: true
9+
type: choice
10+
options:
11+
- release-start
12+
- release-finish
13+
version:
14+
description: 'Release version (for release-start and release-finish, e.g., 1.0.0)'
15+
required: false
16+
17+
jobs:
18+
call-gitflow-release:
19+
uses: dataliquid/github-actions/.github/workflows/gitflow-release.yml@master
20+
with:
21+
action: ${{ inputs.action }}
22+
version: ${{ inputs.version }}
23+
java-version: '11'
24+
java-distribution: 'temurin'
25+
secrets: inherit

‎.gitignore‎

Lines changed: 136 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
1+
# Maven
2+
target/
3+
pom.xml.tag
4+
pom.xml.releaseBackup
5+
pom.xml.versionsBackup
6+
pom.xml.next
7+
release.properties
8+
dependency-reduced-pom.xml
9+
buildNumber.properties
10+
.mvn/timing.properties
11+
.mvn/wrapper/maven-wrapper.jar
12+
13+
# Compiled class files
14+
*.class
15+
16+
# Log files
17+
*.log
18+
logs/
19+
*.log.*
20+
21+
# Package Files
22+
*.jar
23+
*.war
24+
*.nar
25+
*.ear
26+
*.zip
27+
*.tar.gz
28+
*.rar
29+
30+
# IntelliJ IDEA
31+
.idea/
32+
*.iws
33+
*.iml
34+
*.ipr
35+
out/
36+
.idea_modules/
37+
38+
# Eclipse
39+
.metadata/
40+
bin/
41+
tmp/
42+
*.tmp
43+
*.bak
44+
*.swp
45+
*~.nib
46+
local.properties
47+
.settings/
48+
.loadpath
49+
.recommenders
50+
.project
51+
.externalToolBuilders/
52+
*.launch
53+
.classpath
54+
.factorypath
55+
.buildpath
56+
.target
57+
58+
# NetBeans
59+
nbproject/private/
60+
build/
61+
nbbuild/
62+
dist/
63+
nbdist/
64+
.nb-gradle/
65+
nb-configuration.xml
66+
67+
# Visual Studio Code
68+
.vscode/
69+
*.code-workspace
70+
.history/
71+
72+
# Mac OS
73+
.DS_Store
74+
.AppleDouble
75+
.LSOverride
76+
._*
77+
78+
# Windows
79+
Thumbs.db
80+
ehthumbs.db
81+
Desktop.ini
82+
$RECYCLE.BIN/
83+
*.cab
84+
*.msi
85+
*.msix
86+
*.msm
87+
*.msp
88+
*.lnk
89+
90+
# Linux
91+
*~
92+
.fuse_hidden*
93+
.directory
94+
.Trash-*
95+
.nfs*
96+
97+
# JetBrains
98+
.idea/
99+
*.iml
100+
*.iws
101+
*.ipr
102+
cmake-build-*/
103+
.idea/**/workspace.xml
104+
.idea/**/tasks.xml
105+
.idea/**/usage.statistics.xml
106+
.idea/**/dictionaries
107+
.idea/**/shelf
108+
.idea/**/contentModel.xml
109+
.idea/**/dataSources/
110+
.idea/**/dataSources.ids
111+
.idea/**/dataSources.local.xml
112+
.idea/**/sqlDataSources.xml
113+
.idea/**/dynamic.xml
114+
.idea/**/uiDesigner.xml
115+
.idea/**/dbnavigator.xml
116+
.idea/**/gradle.xml
117+
.idea/**/libraries
118+
.idea/artifacts
119+
.idea/compiler.xml
120+
.idea/jarRepositories.xml
121+
.idea/modules.xml
122+
.idea/*.iml
123+
.idea/modules
124+
*.ipr
125+
126+
# Java
127+
hs_err_pid*
128+
replay_pid*
129+
130+
# Maven Wrapper
131+
!.mvn/wrapper/maven-wrapper.jar
132+
!**/src/main/**/target/
133+
!**/src/test/**/target/
134+
135+
# Spring Boot
136+
*.pid

‎README.adoc‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
= Coding Conventions
2+
:toc:
3+
4+
== Overview
5+
6+
Repository for code style configurations and formatting rules used across projects.
7+
8+
== Directory Structure
9+
10+
----
11+
coding-conventions/
12+
├── codestyles/
13+
│ ├── default/ # Modern code style
14+
│ └── tradional/ # Traditional code style
15+
└── pom.xml
16+
----
17+
18+
== Code Styles
19+
20+
* `default/` - Modern formatting style
21+
* `tradional/` - Traditional Eclipse formatting style

‎pom.xml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
5+
http://maven.apache.org/xsd/maven-4.0.0.xsd">
6+
<modelVersion>4.0.0</modelVersion>
7+
8+
<parent>
9+
<groupId>com.dataliquid</groupId>
10+
<artifactId>parent-oss</artifactId>
11+
<version>2.1.0</version>
12+
</parent>
13+
14+
<groupId>com.dataliquid.guidelines</groupId>
15+
<artifactId>coding-conventions</artifactId>
16+
<version>1.0.0</version>
17+
<packaging>jar</packaging>
18+
19+
<name>Coding Conventions</name>
20+
<description>Coding conventions and style configurations</description>
21+
22+
<properties>
23+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
24+
</properties>
25+
26+
</project>

‎src/main/resources/codestyles/default/css-formatter.properties‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# CSS Formatter Konfiguration
2+
# 2 Spaces Einrückung
3+
indentSize=2
4+
indentChar=space
5+
6+
# Datei mit neuer Zeile beenden
7+
endWithNewline=true
8+
9+
# Maximale Anzahl leerer Zeilen
10+
maxEmptyLines=1
11+
12+
# Selektor auf neue Zeile
13+
selectorSeparatorNewline=true
14+
15+
# Space vor öffnender Klammer
16+
rulesetOpeningBraceSpace=true

‎src/main/resources/codestyles/default/html-formatter.properties‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# HTML Formatter Konfiguration
2+
# 2 Spaces Einrückung
3+
indentAmount=2
4+
indentChar=space
5+
6+
# Maximale Zeilenlänge
7+
maxLineLength=120
8+
9+
# Neue Zeilen beibehalten
10+
preserveNewlines=true
11+
12+
# Whitespace in Text-Knoten beibehalten
13+
preserveWhitespace=false
14+
15+
# Attribute umbrechen
16+
wrapAttributes=auto

‎src/main/resources/codestyles/default/java-formatter.xml‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<profiles version="21">
3+
<profile kind="CodeFormatterProfile" name="DemoJavaStyle" version="21">
4+
<!-- SPACES ONLY - 4 Spaces für Java -->
5+
<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
6+
<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
7+
<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
8+
<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
9+
10+
<!-- Zeilen-Länge -->
11+
<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
12+
<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="120"/>
13+
14+
<!-- Klammern am Zeilenende (K&R Style) -->
15+
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
16+
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
17+
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
18+
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
19+
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
20+
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
21+
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
22+
<setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="end_of_line"/>
23+
24+
<!-- Leerzeilen -->
25+
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
26+
<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
27+
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
28+
<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
29+
<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
30+
<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
31+
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
32+
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
33+
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
34+
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
35+
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
36+
37+
<!-- Continuation Indentation -->
38+
<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
39+
<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
40+
41+
<!-- Wrapping -->
42+
<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
43+
<setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
44+
45+
<!-- Spaces -->
46+
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
47+
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
48+
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
49+
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
50+
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
51+
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
52+
53+
<!-- New Line -->
54+
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="insert"/>
55+
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
56+
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
57+
58+
<!-- Java 8+ Features -->
59+
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
60+
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
61+
62+
<!-- Comments -->
63+
<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
64+
<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
65+
<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
66+
</profile>
67+
</profiles>

‎src/main/resources/codestyles/default/javascript-formatter.xml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<profiles version="2">
3+
<profile kind="JavaScriptFormatterProfile" name="DemoJSStyle" version="2">
4+
<!-- 2 Spaces für JavaScript -->
5+
<setting id="org.eclipse.wst.jsdt.core.formatter.tabulation.char" value="space"/>
6+
<setting id="org.eclipse.wst.jsdt.core.formatter.tabulation.size" value="2"/>
7+
<setting id="org.eclipse.wst.jsdt.core.formatter.indentation.size" value="2"/>
8+
9+
<!-- Zeilen-Länge -->
10+
<setting id="org.eclipse.wst.jsdt.core.formatter.lineSplit" value="100"/>
11+
12+
<!-- Klammern -->
13+
<setting id="org.eclipse.wst.jsdt.core.formatter.brace_position_for_function_declaration" value="end_of_line"/>
14+
<setting id="org.eclipse.wst.jsdt.core.formatter.brace_position_for_block" value="end_of_line"/>
15+
<setting id="org.eclipse.wst.jsdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
16+
<setting id="org.eclipse.wst.jsdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
17+
18+
<!-- Semicolons -->
19+
<setting id="org.eclipse.wst.jsdt.core.formatter.insert_semicolon" value="true"/>
20+
21+
<!-- Spaces -->
22+
<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
23+
<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_function_declaration_parameters" value="insert"/>
24+
<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_function_declaration" value="do not insert"/>
25+
<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_function_declaration" value="do not insert"/>
26+
<setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_function_declaration" value="do not insert"/>
27+
</profile>
28+
</profiles>

‎src/main/resources/codestyles/default/json-formatter.properties‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# JSON Formatter Konfiguration
2+
# 2 Spaces Einrückung
3+
indent=2
4+
5+
# Line Ending (LF für Unix/Linux/Mac)
6+
lineending=\n
7+
8+
# Kein Space vor dem Doppelpunkt
9+
spaceBeforeSeparator=false
10+
11+
# Alphabetische Sortierung der Keys (optional)
12+
alphabeticalOrder=false

0 commit comments

Comments
 (0)