Integrated lite controllers, services and tests in full version.
Change-Id: I14f9437d9cae6418b3b89bbfee810f95a0e74832
diff --git a/full/pom.xml b/full/pom.xml
index f92fe29..24f2108 100644
--- a/full/pom.xml
+++ b/full/pom.xml
@@ -12,22 +12,127 @@
<jersey.version>1.19.4</jersey.version>
<hibernate.version>5.3.7.Final</hibernate.version>
</properties>
+ <profiles>
+ <profile>
+ <id>full</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>3.1.0</version>
+ <executions>
+ <!-- option 1 -->
+ <execution>
+ <id>full</id>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <finalName>Kustvakt-full-${project.version}</finalName>
+ <transformers>
+ <transformer
+ implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+ <mainClass>
+ de.ids_mannheim.korap.server.KustvaktServer
+ </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>
+ <!-- Additional configuration. apparently there is a securityException -->
+ <filters>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>META-INF/*.SF</exclude>
+ <exclude>META-INF/*.DSA
+ </exclude>
+ <exclude>META-INF/*.RSA
+ </exclude>
+ </excludes>
+ </filter>
+ </filters>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>lite</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>3.1.0</version>
+ <executions>
+ <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>
+ <!-- Additional configuration. apparently there is a security exception -->
+ <filters>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>META-INF/*.SF</exclude>
+ <exclude>META-INF/*.DSA
+ </exclude>
+ <exclude>META-INF/*.RSA
+ </exclude>
+ </excludes>
+ </filter>
+ </filters>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </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> -->
+ <!-- <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>
<directory>src/test/resources</directory>
@@ -83,7 +188,7 @@
<reuseForks>true</reuseForks>
<forkCount>1</forkCount>
<threadCount>10</threadCount>
- <argLine>-Xmx512m -XX:MaxPermSize=256m
+ <argLine>-Xmx512m -XX:MaxPermSize=256m
-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager</argLine>
<excludes>
<exclude>de/ids_mannheim/korap/authentication/*.java</exclude>
@@ -95,55 +200,6 @@
</includes>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-shade-plugin</artifactId>
- <version>3.1.0</version>
- <executions>
- <!-- option 1 -->
- <execution>
- <id>full</id>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <finalName>Kustvakt-full-${project.version}</finalName>
- <transformers>
- <transformer
- implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
- <mainClass>
- de.ids_mannheim.korap.server.KustvaktServer
- </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>
- <!-- Additional configuration. apparently there is a securityException -->
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA
- </exclude>
- <exclude>META-INF/*.RSA
- </exclude>
- </excludes>
- </filter>
- </filters>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
</plugins>
</build>
@@ -189,11 +245,11 @@
<version>${hibernate.version}</version>
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-c3p0</artifactId>
- <version>${hibernate.version}</version>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-c3p0</artifactId>
+ <version>${hibernate.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
@@ -220,7 +276,7 @@
<version>${jersey.version}</version>
<scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-json</artifactId>
@@ -275,7 +331,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>4.0.0</version>
+ <version>4.0.1</version>
</dependency>
<!-- Flyway -->
@@ -296,11 +352,6 @@
<artifactId>org.apache.oltu.oauth2.client</artifactId>
<version>1.0.2</version>
</dependency>
- <!-- <dependency>
- <groupId>org.apache.oltu.oauth2</groupId>
- <artifactId>org.apache.oltu.oauth2.dynamicreg.client</artifactId>
- <version>1.0.2</version>
- </dependency> -->
<!-- JWT -->
<dependency>
<groupId>com.nimbusds</groupId>