Merge branch 'nais-migration' of https://github.com/statisticsnorway/klass into nais-migration

Author: JanhSander

README.md

@@ -159,7 +159,6 @@ below is a quick summary of the profiles available (see _application.properties_
 we have created custom profiles for time consuming tests that can be toggled on and off to help speed up compile time during development.
 The profile named `documentation` will generate API documentation with AsciiDoc (default: enabled)
 We also have a custom profile (`testbench`) for running GUI tests using TestBench (Vaadin licensed product).
-There's also a `checkstyle` and a `findbugs` for use with Jenkins to create code quality reports.
 
 ### Run / Debug
 

klass-api/pom.xml

@@ -94,7 +94,6 @@
             <scope>provided</scope>
         </dependency>
 
-
         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-jasper</artifactId>

klass-shared/pom.xml

@@ -3,7 +3,6 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>klass-shared</artifactId>
     <packaging>jar</packaging>
-    <!--    <packaging>pom</packaging>-->
 
     <name>Klass Shared</name>
     <description>Felles klasser og resurser for Klass komponentene</description>
@@ -26,15 +25,10 @@
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <findbugs-version>3.0.5</findbugs-version>
-        <checkstyle-version>3.3.0</checkstyle-version>
-        <spring.version>4.3.7.RELEASE</spring.version>
         <objenesis-version>3.3</objenesis-version>
         <guava-version>19.0</guava-version>
         <woodstox-version>4.4.1</woodstox-version>
         <commons-lang3-version>3.12.0</commons-lang3-version>
-        <apacheds-server-jndi-version>2.0.0.AM27</apacheds-server-jndi-version>
-        <asciidoctor-version>1.6.0</asciidoctor-version>
         <maven-jaxb2-plugin-version>2.5.0</maven-jaxb2-plugin-version>
         <tomcat7-maven-plugin-version>2.2</tomcat7-maven-plugin-version>
         <postgresql.version>42.7.7</postgresql.version>
@@ -107,18 +101,6 @@
             <artifactId>postgresql</artifactId>
             <version>${postgresql.version}</version>
         </dependency>
-        <dependency>
-            <!--java based ldap server for testing-->
-            <groupId>org.apache.directory.server</groupId>
-            <artifactId>apacheds-server-jndi</artifactId>
-            <version>${apacheds-server-jndi-version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>antlr</groupId>
-                    <artifactId>antlr</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-csv</artifactId>
@@ -218,55 +200,6 @@
         </dependency>
     </dependencies>
     <profiles>
-        <profile>
-            <id>findbugs</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>findbugs-maven-plugin</artifactId>
-                        <version>${findbugs-version}</version>
-                        <configuration>
-                            <includeTests>true</includeTests>
-                            <threshold>High</threshold>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>check</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>checkstyle</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-checkstyle-plugin</artifactId>
-                        <version>${checkstyle-version}</version>
-                        <configuration>
-                            <sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
-                            <configLocation>../build_tools/checkstyle.xml</configLocation>
-                            <includeTestSourceDirectory>true</includeTestSourceDirectory>
-                            <violationSeverity>warning</violationSeverity>
-                            <logViolationsToConsole>true</logViolationsToConsole>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>check</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
         <profile>
             <id>testbench</id>
             <build>
@@ -309,7 +242,6 @@
                 </configuration>
             </plugin>
 
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>

pom.xml

@@ -33,23 +33,19 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <github.repository>statisticsnorway/klass</github.repository>
-        <findbugs-version>3.0.2</findbugs-version>
-        <checkstyle-version>2.17</checkstyle-version>
         <solr-version>8.5.2</solr-version>
         <objenesis-version>2.4</objenesis-version>
         <guava-version>19.0</guava-version>
         <woodstox-version>4.4.1</woodstox-version>
         <commons-lang3-version>3.4</commons-lang3-version>
         <rest-assured-version>5.4.0</rest-assured-version>
-        <apacheds-server-jndi-version>1.5.5</apacheds-server-jndi-version>
         <asciidoctor-version>2.2.4</asciidoctor-version>
         <maven-jaxb2-plugin-version>0.15.3</maven-jaxb2-plugin-version>
         <tomcat7-maven-plugin-version>2.2</tomcat7-maven-plugin-version>
         <jaxb-api-version>2.3.1</jaxb-api-version>
         <commons-io-version>2.15.1</commons-io-version>
         <jakarta-rs-api-version>2.1.6</jakarta-rs-api-version>
         <spring-restdocs-version>2.0.8.RELEASE</spring-restdocs-version>
-        <snakeyaml.version>1.31</snakeyaml.version>
         <zonky.version>2.5.1</zonky.version>
         <zonky.pg.version>2.1.0</zonky.pg.version>
     </properties>