Use default profile and switch country-specific profiles into a feature flag

BUILD.md

@@ -41,48 +41,21 @@ as well), especially if you set up a local X-Road ecosystem.
     ```
 * The build scripts assumes the above directory structure.
 
-## Build X-Road Catalog Collector
+## Build
 
-See [xroad-catalog-collector/README.md](xroad-catalog-collector/README.md#build) for details.
+To build all modules, run the following command in the root directory:
 
-## Build X-Road Catalog Lister
+```bash
+./gradlew clean build
+```
 
-See [xroad-catalog-lister/README.md](xroad-catalog-lister/README.md#build) for details.
-
-## Build X-Road Catalog Persistence
-
-See [xroad-catalog-persistence/README.md](xroad-catalog-persistence/README.md#build) for details.
-
-## Profiles
-
-Profiles can be used to configure different features in X-Road Catalog. By default, X-Road Catalog includes four different
-profiles:
+To build a specific module:
 
-* `default` - a profile used for default operation of X-Road Catalog, without any country-specific features.
-  * The default profile can be set with `spring.profiles.active=`.
-* `fi` - an extra profile used in addition to the default profile, which has country-specific (Finland) features, e.g.,
-  fetching additional data from a national business registry. Other country-specific profiles can be added if needed.
-  * The profile can be set with `spring.profiles.active=fi`.
-* `production` - a profile used in the production deployment.
-  * The profile can be set with `spring.profiles.active=production`.
-* `sshtest` - a profile used to test SSH tunneling with X-Road Catalog.
-  * The profile can be set with `spring.profiles.active=sshtest`.
+* **Build X-Road Catalog Collector**  
+ See [xroad-catalog-collector/README.md](xroad-catalog-collector/README.md#build) for details.
 
-Multiple profiles can be activated at the same time by separating them with a comma, e.g., `spring.profiles.active=production,fi`.
-
-X-Road Catalog supports adding new profiles. For example, new country-specific features should be added by creating a
-new country-specific profile.
-
-### How Profiles Are Used During the Build?
+* **Build X-Road Catalog Lister**  
+See [xroad-catalog-lister/README.md](xroad-catalog-lister/README.md#build) for details.
 
-* First, a Docker image for building the X-Road Catalog rpm packages is built.
-  * For X-Road Catalog Collector:
-    ```bash
-    docker build -t collector-rpm packages/xroad-catalog-collector/docker --build-arg CATALOG_PROFILE=fi
-    ```
-  * For X-Road Catalog Lister:
-    ```bash
-    docker build -t lister-rpm packages/xroad-catalog-lister/docker --build-arg CATALOG_PROFILE=fi
-    ```
-* Profile value is provided to the respective `Dockerfile` with an argument `--build-arg CATALOG_PROFILE=fi`. Then within
-  the `Dockerfile` an environment variable `CATALOG_PROFILE` is initalized with that profile value.
+* **Build X-Road Catalog Persistence**  
+See [xroad-catalog-persistence/README.md](xroad-catalog-persistence/README.md#build) for details.

build.gradle

@@ -33,7 +33,7 @@ ext {
 
 
 allprojects {
-    group = 'fi.vrk.xroad'
+    group = 'org.niis.xroad'
     version = project_version
 
     tasks.withType(JavaCompile).configureEach {

buildSrc/src/main/groovy/catalogservice.java-checks.gradle

@@ -14,7 +14,7 @@ licenseFormatMain.source = fileTree('src/main')
 licenseFormatTest.source = fileTree('src/test')
 
 checkstyle {
-    toolVersion = "10.12.6"
+    toolVersion = "10.17.0"
     configDirectory = file("${project.rootDir}/config/checkstyle")
     ignoreFailures = false
     showViolations = false
@@ -28,7 +28,7 @@ checkstyleMain {
 
 checkstyleTest {
     source = fileTree('src/test/java')
-    configFile = file("${project.rootDir}/config/checkstyle/checkstyle-test.xml")
+    configFile = file("${project.rootDir}/config/checkstyle/checkstyle.xml")
 }
 
 configurations.checkstyle {

config/checkstyle/checkstyle.xml

@@ -4,6 +4,10 @@
           "https://checkstyle.org/dtds/configuration_1_3.dtd">
 <module name="Checker">
     <module name="SuppressWarningsFilter" />
+    <!-- Checks whether files end with a new line.                        -->
+    <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
+    <module name="NewlineAtEndOfFile"/>
+
     <!-- Checks that property files contain the same keys.         -->
     <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
     <module name="Translation"/>
@@ -135,9 +139,7 @@
         <module name="InterfaceIsType"/>
         <!-- Miscellaneous other checks.                   -->
         <!-- See http://checkstyle.sf.net/config_misc.html -->
-        <module name="TodoComment">
-            <property name="severity" value="warning"/>
-        </module>
+        <module name="TodoComment"/>
         <module name="UpperEll"/>
         <module name="AvoidStarImport">
             <property name="severity" value="error"/>
@@ -147,6 +149,7 @@
             <property name="basicOffset" value="4"/>
             <property name="lineWrappingIndentation" value="8"/>
         </module>
+        <module name="ConstructorsDeclarationGrouping"/>
     </module>
     <!-- Some checks are disabled for specific source sets (i.e. tests)-->
     <module name="SuppressionFilter">