Formatted project
Change-Id: I6993ddfab02e06541b4138040280a4777c719562
diff --git a/full/pom.xml b/full/pom.xml
index 6a2d352..faafe81 100644
--- a/full/pom.xml
+++ b/full/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>de.ids_mannheim.korap</groupId>
@@ -57,13 +58,13 @@
</transformer>
</transformers>
<filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>db/lite/**</exclude>
- </excludes>
- </filter>
- </filters>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>db/lite/**</exclude>
+ </excludes>
+ </filter>
+ </filters>
</configuration>
</execution>
</executions>
@@ -71,65 +72,65 @@
</plugins>
</build>
</profile>
-
-
+
+
<profile>
<id>lite</id>
<build>
<plugins>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.5.1</version>
- <executions>
- <!--option 2-->
- <execution>
- <id>lite</id>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <finalName>
- Kustvakt-lite-${project.version}
- </finalName>
- <transformers>
- <transformer
- implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
- <mainClass>
- de.ids_mannheim.korap.server.KustvaktLiteServer
- </mainClass>
- </transformer>
- <transformer
- implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
- <resource>META-INF/spring.handlers
- </resource>
- </transformer>
- <transformer
- implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
- <resource>META-INF/spring.schemas
- </resource>
- </transformer>
- </transformers>
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
+ <version>3.5.1</version>
+ <executions>
+ <!--option 2 -->
+ <execution>
+ <id>lite</id>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <finalName>
+ Kustvakt-lite-${project.version}
+ </finalName>
+ <transformers>
+ <transformer
+ implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+ <mainClass>
+ de.ids_mannheim.korap.server.KustvaktLiteServer
+ </mainClass>
+ </transformer>
+ <transformer
+ implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+ <resource>META-INF/spring.handlers
+ </resource>
+ </transformer>
+ <transformer
+ implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+ <resource>META-INF/spring.schemas
+ </resource>
+ </transformer>
+ </transformers>
+ <filters>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
<exclude>db/mysql/**</exclude>
<exclude>db/predefined/**</exclude>
<exclude>db/sqlite/**</exclude>
<exclude>db/test/**</exclude>
- <exclude>com.novell.ldap</exclude>
- <exclude>com.unboundid</exclude>
- <exclude>org.glassfish.jersey.test-framework*</exclude>
- <exclude>org.apache.velocity*</exclude>
- <exclude>com.sun.mail</exclude>
- <exclude>javax.activation</exclude>
- </excludes>
- </filter>
- </filters>
- </configuration>
- </execution>
- </executions>
+ <exclude>com.novell.ldap</exclude>
+ <exclude>com.unboundid</exclude>
+ <exclude>org.glassfish.jersey.test-framework*</exclude>
+ <exclude>org.apache.velocity*</exclude>
+ <exclude>com.sun.mail</exclude>
+ <exclude>javax.activation</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
@@ -137,16 +138,14 @@
</profiles>
<build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- <!--
- <includes> <include>**/*.info</include> <include>**/*.xml</include> <include>**/*.conf</include>
- <include>**/*.kustvakt</include> <include>**/*.properties</include> <include>**/*.sql</include>
- <include>**/*.vm</include> </includes>
- -->
- </resource>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ <!-- <includes> <include>**/*.info</include> <include>**/*.xml</include>
+ <include>**/*.conf</include> <include>**/*.kustvakt</include> <include>**/*.properties</include>
+ <include>**/*.sql</include> <include>**/*.vm</include> </includes> -->
+ </resource>
</resources>
<testResources>
<testResource>
@@ -240,11 +239,11 @@
<dependencies>
<!-- backport -->
<dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- <version>3.1</version>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ <version>3.1</version>
</dependency>
-
+
<!-- Jersey -->
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
@@ -285,23 +284,16 @@
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
<version>${jersey.version}</version>
- <!--<exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </exclusion>
- </exclusions>-->
+ <!--<exclusions> <exclusion> <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId> </exclusion> <exclusion> <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId> </exclusion> </exclusions> -->
</dependency>
<dependency>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
<version>2.5.0</version>
</dependency>
-
+
<!-- Flyway -->
<dependency>
<groupId>org.flywaydb</groupId>
@@ -347,7 +339,7 @@
<artifactId>slf4j-api</artifactId>
<version>2.0.9</version>
</dependency>
-
+
<!-- Java Assist -->
<dependency>
<groupId>org.javassist</groupId>
@@ -407,7 +399,7 @@
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -419,7 +411,7 @@
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -430,11 +422,8 @@
<version>0.4</version>
</dependency>
- <!--<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <version>1.3.2</version>
- </dependency>-->
+ <!--<dependency> <groupId>javax.annotation</groupId> <artifactId>javax.annotation-api</artifactId>
+ <version>1.3.2</version> </dependency> -->
<dependency>
<groupId>de.ids_mannheim.korap</groupId>
@@ -442,8 +431,8 @@
<version>${krill.version}</version>
<exclusions>
<exclusion>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
</exclusion>
<exclusion>
<groupId>org.glassfish.jersey.containers</groupId>
@@ -504,16 +493,10 @@
<artifactId>spring-tx</artifactId>
<version>${spring.version}</version>
</dependency>
- <!-- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-web</artifactId>
- <version>${spring.version}</version>
- </dependency> -->
+ <!-- <dependency> <groupId>org.springframework.security</groupId> <artifactId>spring-security-core</artifactId>
+ <version>${spring.version}</version> </dependency> <dependency> <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-web</artifactId> <version>${spring.version}</version>
+ </dependency> -->
<!-- EM: done -->
<dependency>
<groupId>org.springframework</groupId>
@@ -592,7 +575,7 @@
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -629,47 +612,39 @@
<artifactId>hibernate-c3p0</artifactId>
<version>${hibernate.version}</version>
</dependency>
-
+
<dependency>
- <groupId>org.hibernate.orm</groupId>
- <artifactId>hibernate-community-dialects</artifactId>
- <version>${hibernate.version}</version>
- </dependency>
-
- <!-- servlet -->
- <dependency>
- <groupId>jakarta.persistence</groupId>
- <artifactId>jakarta.persistence-api</artifactId>
- <version>3.1.0</version>
+ <groupId>org.hibernate.orm</groupId>
+ <artifactId>hibernate-community-dialects</artifactId>
+ <version>${hibernate.version}</version>
</dependency>
<!-- servlet -->
<dependency>
- <groupId>jakarta.servlet</groupId>
- <artifactId>jakarta.servlet-api</artifactId>
- <version>6.0.0</version>
- <scope>provided</scope>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
+ <version>3.1.0</version>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-text</artifactId>
- <version>1.11.0</version>
- </dependency>
- <!--<dependency>
- <groupId>de.ids_mannheim.korap</groupId>
- <artifactId>Kustvakt-core</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <!-- servlet -->
<dependency>
- <groupId>de.ids_mannheim.korap</groupId>
- <artifactId>Kustvakt-core</artifactId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>-->
-
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>6.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ <version>1.11.0</version>
+ </dependency>
+ <!--<dependency> <groupId>de.ids_mannheim.korap</groupId> <artifactId>Kustvakt-core</artifactId>
+ <version>${project.version}</version> </dependency> <dependency> <groupId>de.ids_mannheim.korap</groupId>
+ <artifactId>Kustvakt-core</artifactId> <version>${project.version}</version>
+ <classifier>tests</classifier> <type>test-jar</type> <scope>test</scope>
+ </dependency> -->
+
<!-- LDAP -->
<dependency>
<groupId>com.novell.ldap</groupId>
@@ -717,16 +692,16 @@
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
-
+
<!-- Mail -->
<dependency>
- <groupId>com.sun.mail</groupId>
- <artifactId>jakarta.mail</artifactId>
- <version>2.0.1</version>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>jakarta.mail</artifactId>
+ <version>2.0.1</version>
</dependency>
<dependency>
@@ -734,7 +709,7 @@
<artifactId>jakarta.activation-api</artifactId>
<version>2.1.2</version>
</dependency>
-
+
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
@@ -754,13 +729,13 @@
<artifactId>lombok</artifactId>
<version>1.18.30</version>
</dependency>
-
+
<!-- Mockserver -->
<dependency>
- <groupId>org.mock-server</groupId>
- <artifactId>mockserver-netty</artifactId>
- <version>5.15.0</version>
- <scope>test</scope>
+ <groupId>org.mock-server</groupId>
+ <artifactId>mockserver-netty</artifactId>
+ <version>5.15.0</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>