Merge remote-tracking branch 'origin/master'
diff --git a/pom.xml b/pom.xml
index 75a196f..3dd51fd 100755
--- a/pom.xml
+++ b/pom.xml
@@ -101,7 +101,7 @@
<!-- ====================================================== -->
<properties>
<title>${project.name} ${project.version}</title>
-
+ <java.version>1.8</java.version>
<!-- Dependencies version -->
<fortress.realm.version>2.0.4-SNAPSHOT</fortress.realm.version>
<cxf.version>3.2.6</cxf.version>
@@ -195,7 +195,19 @@
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
-
+
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-core</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+
</dependencies>
<build>
@@ -345,19 +357,23 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.0</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>${java.version}</source>
+ <target>${java.version}</target>
+ <optimize>true</optimize>
+ <encoding>ISO-8859-1</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
+ <version>3.0.0</version>
<executions>
<execution>
<id>attach-sources</id>
- <phase>package</phase>
+ <phase>verify</phase>
<goals>
<goal>jar</goal>
</goals>
