diff --git a/pom.xml b/pom.xml index 170d2ed404d87da7b0c8ef7bc8e5186b951c4604..c43c5f0efd7bdb3a68236a4ff55d91510c9d0f78 100644 --- a/pom.xml +++ b/pom.xml @@ -478,7 +478,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>${checkstyle.version}</version> + <version>${checkstyle.version}</version> </plugin> <!-- Generates a cross-reference of the project's sources. --> diff --git a/sido-cli/config/checkstyle-suppressions.xml b/sido-cli/config/checkstyle-suppressions.xml index 9be671d59f8ecb10542e3ca56d64d5d993af7610..139d48d6cf1e26387efdf80a031bf576a09001ca 100644 --- a/sido-cli/config/checkstyle-suppressions.xml +++ b/sido-cli/config/checkstyle-suppressions.xml @@ -22,4 +22,5 @@ "-//Puppy Crawl//DTD Suppressions 1.1//EN" "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd"> <suppressions> + <suppress checks="JavadocPackageCheck" files="[\\/]src[\\/]test[\\/]" /> </suppressions> \ No newline at end of file diff --git a/sido-createSchemaTable/config/checkstyle-suppressions.xml b/sido-createSchemaTable/config/checkstyle-suppressions.xml index d6a812c7cd2a9172b1bfd84dbcf8801e022bf16f..2acc4a05311b4cf0f75e75362a59c24f1848f20d 100644 --- a/sido-createSchemaTable/config/checkstyle-suppressions.xml +++ b/sido-createSchemaTable/config/checkstyle-suppressions.xml @@ -22,4 +22,5 @@ "-//Puppy Crawl//DTD Suppressions 1.1//EN" "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd"> <suppressions> + <suppress checks="JavadocPackageCheck" files="[\\/]src[\\/]test[\\/]" /> </suppressions> \ No newline at end of file diff --git a/sido-eml/config/checkstyle-suppressions.xml b/sido-eml/config/checkstyle-suppressions.xml index 252a6c89094f27c3ee690beb89c0b85ce15027c2..d7e09c5373b13fc39aea6145a1f0234cfe2e5ea5 100644 --- a/sido-eml/config/checkstyle-suppressions.xml +++ b/sido-eml/config/checkstyle-suppressions.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!-- - sido-gwt - Phenological data submission tool for TEMPO + sido-eml - Phenological data submission tool for TEMPO Copyright © 2018 TEMPO (contact-tempo@inrae.fr) This program is free software: you can redistribute it and/or modify @@ -22,5 +22,4 @@ "-//Checkstyle//DTD Suppressions 1.1//EN" "https://checkstyle.org/dtds/suppressions_1_1.dtd"> <suppressions> - <suppress checks=".*" files="org[\\/]ecoinformatics[\\/]eml"/> </suppressions> diff --git a/sido-eml/pom.xml b/sido-eml/pom.xml index 08b4c27e0d486084de0e71d6e361a432a8fb9331..0529085328b0b4670c918ab700b5197fefb3ca8a 100644 --- a/sido-eml/pom.xml +++ b/sido-eml/pom.xml @@ -10,7 +10,8 @@ <artifactId>sido-eml</artifactId> <name>sido-eml</name> <properties> - <!-- No properties --> + <!-- No properties --> + <checkstyle.skip>true</checkstyle.skip> </properties> <dependencies> <!-- https://mvnrepository.com/artifact/javax.xml.bind/jaxb-api --> @@ -20,4 +21,36 @@ <version>2.3.1</version> </dependency> </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-pmd-plugin</artifactId> + <configuration> + <analysisCache>true</analysisCache> + <excludes> + <exclude>**/**</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </reporting> </project> \ No newline at end of file diff --git a/sido-gwt/config/checkstyle-suppressions.xml b/sido-gwt/config/checkstyle-suppressions.xml index db301397e5e0f8ee0962528fff1a8dcef1b60c75..c23aa97a55fbd0b30ba318d3f05f374b932962f8 100644 --- a/sido-gwt/config/checkstyle-suppressions.xml +++ b/sido-gwt/config/checkstyle-suppressions.xml @@ -22,6 +22,7 @@ "-//Checkstyle//DTD Suppressions 1.1//EN" "https://checkstyle.org/dtds/suppressions_1_1.dtd"> <suppressions> + <suppress checks="[a-zA-Z0-9]*" files="[\\/]src[\\/]test[\\/]" /> <suppress checks="VisibilityModifier" files="PreviewViewImpl.java|ProfileViewImpl.java|MailEditModal.java|HomeViewImpl.java|MainPageImpl.java|VerificationViewImpl.java|ManageDatasourceViewImpl.java|ManageDatasetViewImpl.java|ListWorkbooksViewImpl.java|DatasetCreationModal.java|DatasetInfosModal.java|DatasourceAdminModal.java|DatasetAdminModal.java" /> </suppressions> diff --git a/sido-gwt/src/main/java/fr/soeretempo/sido/gwt/server/metadata/License.java b/sido-gwt/src/main/java/fr/soeretempo/sido/gwt/server/metadata/License.java index 2d0c0e85d7069f2fb97f1008f342bdcc2723bc13..fdee81845b05ba226403acc976b56cd00d65f2f0 100644 --- a/sido-gwt/src/main/java/fr/soeretempo/sido/gwt/server/metadata/License.java +++ b/sido-gwt/src/main/java/fr/soeretempo/sido/gwt/server/metadata/License.java @@ -7,7 +7,16 @@ import lombok.Data; */ @Data public class License { + /** + * License name. + */ private String name; + /** + * URI for the license icon. + */ private String iconUri; + /** + * URI for the license text. + */ private String uri; } diff --git a/sido-gwt/src/main/java/fr/soeretempo/sido/gwt/server/metadata/Licenses.java b/sido-gwt/src/main/java/fr/soeretempo/sido/gwt/server/metadata/Licenses.java index 9e4880e70e57c77a4381f226dbc87969f4709ec8..68b67f6e0ee0cf5cd8eefef4a4da0a4214ae2823 100644 --- a/sido-gwt/src/main/java/fr/soeretempo/sido/gwt/server/metadata/Licenses.java +++ b/sido-gwt/src/main/java/fr/soeretempo/sido/gwt/server/metadata/Licenses.java @@ -18,7 +18,7 @@ import lombok.extern.log4j.Log4j2; * Licenses definitions for ERDG. */ @Log4j2 -public class Licenses { +public final class Licenses { /** * Available licenses. @@ -54,4 +54,11 @@ public class Licenses { } return Optional.empty(); } + + /** + * No constructor. + */ + private Licenses() { + + } } diff --git a/sido-rs/config/checkstyle-suppressions.xml b/sido-rs/config/checkstyle-suppressions.xml index b810de91c288320e0fbe3ad79726785a7301d409..e3da79c2da1c93729db7eeab2a0ed842f54af198 100644 --- a/sido-rs/config/checkstyle-suppressions.xml +++ b/sido-rs/config/checkstyle-suppressions.xml @@ -22,4 +22,5 @@ "-//Checkstyle//DTD Suppressions 1.1//EN" "https://checkstyle.org/dtds/suppressions_1_1.dtd"> <suppressions> + <suppress checks="JavadocPackageCheck" files="[\\/]src[\\/]test[\\/]" /> </suppressions> diff --git a/verification/config/checkstyle-suppressions.xml b/verification/config/checkstyle-suppressions.xml index 1392111bd0c3d523d358c5ca6c88356e15a1a99b..7b72b6783b6646967a6dcdc2314fefa8ad183012 100644 --- a/verification/config/checkstyle-suppressions.xml +++ b/verification/config/checkstyle-suppressions.xml @@ -22,4 +22,6 @@ "-//Checkstyle//DTD Suppressions 1.1//EN" "https://checkstyle.org/dtds/suppressions_1_1.dtd"> <suppressions> -</suppressions> \ No newline at end of file + <suppress checks="JavadocPackageCheck" files="[\\/]src[\\/]test[\\/]" /> + <suppress checks="[a-zA-Z0-9]*" files="[\\/]src[\\/]test[\\/]" /> +</suppressions>