diff --git a/intelliform-adapter/pom.xml b/intelliform-adapter/pom.xml
index 84e2957695238cf0dee05497ef333d86628c3633..1cfab47e21c4670295848effa7aa06a38528cc2d 100644
--- a/intelliform-adapter/pom.xml
+++ b/intelliform-adapter/pom.xml
@@ -15,7 +15,7 @@
<artifactId>intelliform-adapter</artifactId>
<name>intelliform-adapter</name>
<description>IntelliForm-Adapter </description>
-
+
<dependencies>
<dependency>
@@ -44,7 +44,7 @@
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
</dependency>
-
+
<!-- own projects -->
<dependency>
@@ -59,7 +59,7 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId>
@@ -159,50 +159,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>${java.version}</source>
- <target>${java.version}</target>
- <annotationProcessorPaths>
- <path>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>${lombok.version}</version>
- </path>
- <path>
- <groupId>org.mapstruct</groupId>
- <artifactId>mapstruct-processor</artifactId>
- <version>${mapstruct.version}</version>
- </path>
- <!-- other annotation processors -->
- </annotationProcessorPaths>
-
- <showWarnings>true</showWarnings>
- <compilerArgs>
- <compilerArg>
- -Amapstruct.defaultComponentModel=spring
- </compilerArg>
- <compilerArg>
- -Amapstruct.unmappedTargetPolicy=IGNORE
- </compilerArg>
- </compilerArgs>
- </configuration>
</plugin>
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
- <configuration>
- <offline>true</offline>
- </configuration>
- <executions>
- <execution>
- <id>get-the-git-infos</id>
- <goals>
- <goal>revision</goal>
- </goals>
- <phase>initialize</phase>
- </execution>
- </executions>
</plugin>
<plugin>
@@ -214,15 +175,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxb2-maven-plugin</artifactId>
- <version>2.5.0</version>
- <executions>
- <execution>
- <id>xjc</id>
- <goals>
- <goal>xjc</goal>
- </goals>
- </execution>
- </executions>
<configuration>
<sources>
<source>${project.basedir}/src/main/resources/formsolutions/formdata.xsd</source>
@@ -235,14 +187,6 @@
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
- <version>0.14.0</version>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
<configuration>
<schemaLanguage>WSDL</schemaLanguage>
<generatePackage>de.itvsh.ozg.adapter.intelliform</generatePackage>
@@ -262,22 +206,6 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <version>${jacoco.plugin.version}</version>
- <executions>
- <execution>
- <id>start-agent</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- </execution>
- <execution>
- <id>generate-report</id>
- <phase>package</phase>
- <goals>
- <goal>report</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
@@ -286,72 +214,5 @@
</plugin>
</plugins>
</build>
-
- <repositories>
- <repository>
- <id>ozg-nexus</id>
- <name>ozg nexus</name>
- <url>https://nexus.ozg-sh.de/repository/ozg-group/</url>
- </repository>
- <repository>
- <id>projectlombok.org</id>
- <url>https://projectlombok.org/edge-releases</url>
- </repository>
- </repositories>
-
- <distributionManagement>
- <repository>
- <id>ozg-nexus</id>
- <name>ozg-releases</name>
- <url>https://nexus.ozg-sh.de/repository/ozg-releases/</url>
- </repository>
- <snapshotRepository>
- <id>ozg-nexus</id>
- <name>ozg-snapshots</name>
- <url>https://nexus.ozg-sh.de/repository/ozg-snapshots/</url>
- </snapshotRepository>
- </distributionManagement>
-
- <profiles>
- <profile>
- <id>docker-build</id>
- <build>
- <plugins>
- <plugin>
- <groupId>com.spotify</groupId>
- <artifactId>dockerfile-maven-plugin</artifactId>
- <version>1.4.13</version>
- <configuration>
- <username>admin</username>
- <password>admin</password>
- <repository>registry.ozg-sh.de/sh-land/if-adapter</repository>
- <tag>${git.branch}-${project.version}</tag>
- <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
- <buildArgs>
- <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
- </buildArgs>
- </configuration>
- <executions>
- <execution>
- <id>default</id>
- <phase>deploy</phase>
- <goals>
- <goal>build</goal>
- <goal>tag</goal>
- <goal>push</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>1.1.1</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+
</project>
diff --git a/pom.xml b/pom.xml
index 9885ccc50fe55754770723c5fafa6432bb415dde..99566a0ba25707392d6e79efbe96995f6b425ac8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,9 @@
<!-- plugins -->
<spring-boot.build-image.imageName>docker.ozg-sh.de/intelliform-adapter:build-latest</spring-boot.build-image.imageName>
- <jacoco.plugin.version>0.8.7</jacoco.plugin.version>
+ <jaxb2-plugin.version>0.14.0</jaxb2-plugin.version>
+ <mojo-jaxb2-plugin.version>2.5.0</mojo-jaxb2-plugin.version>
+ <jacoco-plugin.version>0.8.7</jacoco-plugin.version>
</properties>
<dependencyManagement>
@@ -94,4 +96,126 @@
</dependencies>
</dependencyManagement>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>${java.version}</source>
+ <target>${java.version}</target>
+ <annotationProcessorPaths>
+ <path>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>${lombok.version}</version>
+ </path>
+ <path>
+ <groupId>org.mapstruct</groupId>
+ <artifactId>mapstruct-processor</artifactId>
+ <version>${mapstruct.version}</version>
+ </path>
+ <!-- other annotation processors -->
+ </annotationProcessorPaths>
+
+ <showWarnings>true</showWarnings>
+ <compilerArgs>
+ <compilerArg>
+ -Amapstruct.defaultComponentModel=spring
+ </compilerArg>
+ <compilerArg>
+ -Amapstruct.unmappedTargetPolicy=IGNORE
+ </compilerArg>
+ </compilerArgs>
+ </configuration>
+ </plugin>
+
+ <!-- tag::webservice[] -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jaxb2-maven-plugin</artifactId>
+ <version>${mojo-jaxb2-plugin.version} </version>
+ <executions>
+ <execution>
+ <id>xjc</id>
+ <goals>
+ <goal>xjc</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.jvnet.jaxb2.maven2</groupId>
+ <artifactId>maven-jaxb2-plugin</artifactId>
+ <version>${jaxb2-plugin.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- end::webservice -->
+
+ <plugin>
+ <groupId>pl.project13.maven</groupId>
+ <artifactId>git-commit-id-plugin</artifactId>
+ <configuration>
+ <offline>true</offline>
+ </configuration>
+ </plugin>
+
+ <!-- tag::test[] -->
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>${jacoco-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>start-agent</id>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>generate-report</id>
+ <phase>package</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- end::test[] -->
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <repositories>
+ <repository>
+ <id>ozg-nexus</id>
+ <name>ozg nexus</name>
+ <url>https://nexus.ozg-sh.de/repository/ozg-group/</url>
+ </repository>
+ <repository>
+ <id>projectlombok.org</id>
+ <url>https://projectlombok.org/edge-releases</url>
+ </repository>
+ </repositories>
+
+ <distributionManagement>
+ <repository>
+ <id>ozg-nexus</id>
+ <name>ozg-releases</name>
+ <url>https://nexus.ozg-sh.de/repository/ozg-releases/</url>
+ </repository>
+ <snapshotRepository>
+ <id>ozg-nexus</id>
+ <name>ozg-snapshots</name>
+ <url>https://nexus.ozg-sh.de/repository/ozg-snapshots/</url>
+ </snapshotRepository>
+ </distributionManagement>
+
</project>