diff --git a/config/checkstyle/googleJava-checkstyle.xml b/config/checkstyle/googleJava-checkstyle.xml
new file mode 100644
index 00000000000..c5539082759
--- /dev/null
+++ b/config/checkstyle/googleJava-checkstyle.xml
@@ -0,0 +1,382 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/config/checkstyle/test-checkstyle.xml b/config/checkstyle/test-checkstyle.xml
new file mode 100644
index 00000000000..a09ceaccbb0
--- /dev/null
+++ b/config/checkstyle/test-checkstyle.xml
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index dc7f455b766..37b59030eb9 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -9,6 +9,14 @@
+
+
+
+
+
+
+
+
@@ -283,6 +291,14 @@
+
+
+
+
+
+
+
+
@@ -299,6 +315,11 @@
+
+
+
+
+
@@ -351,6 +372,14 @@
+
+
+
+
+
+
+
+
@@ -367,6 +396,14 @@
+
+
+
+
+
+
+
+
@@ -377,6 +414,11 @@
+
+
+
+
+
@@ -387,6 +429,11 @@
+
+
+
+
+
@@ -459,6 +506,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -724,6 +787,14 @@
+
+
+
+
+
+
+
+
@@ -740,6 +811,14 @@
+
+
+
+
+
+
+
+
@@ -756,6 +835,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1052,6 +1147,48 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1067,6 +1204,11 @@
+
+
+
+
+
@@ -1103,11 +1245,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1142,6 +1328,14 @@
+
+
+
+
+
+
+
+
@@ -1150,6 +1344,14 @@
+
+
+
+
+
+
+
+
@@ -1493,6 +1695,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1728,6 +1946,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1837,5 +2071,16 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/rskj-core/build.gradle b/rskj-core/build.gradle
index 26433c5db1f..7882d9a5f6f 100644
--- a/rskj-core/build.gradle
+++ b/rskj-core/build.gradle
@@ -1,6 +1,21 @@
plugins {
id 'application'
id "com.diffplug.spotless" version "6.11.0"
+ id 'checkstyle'
+}
+
+apply plugin: 'checkstyle'
+checkstyle {
+ toolVersion '10.3.4'
+}
+checkstyleMain {
+ source ='src/main/java'
+ configFile rootProject.file("config/checkstyle/test-checkstyle.xml")
+
+}
+checkstyleTest {
+ source ='src/test/java'
+ configFile rootProject.file("config/checkstyle/test-checkstyle.xml")
}
apply plugin: 'maven-publish'
@@ -10,7 +25,7 @@ apply plugin: 'com.diffplug.spotless'
spotless {
java {
toggleOffOn() //to enable the usage of spotless:on/off annotations
- ratchetFrom 'origin/master' // only format files which have changed since origin/main
+// ratchetFrom 'origin/master' // only format files which have changed since origin/main
// This path needs to be relative to each project
target fileTree('.') {
include '**/*.java'