Skip to content
Snippets Groups Projects
Commit 3baedad1 authored by Jan Kožusznik's avatar Jan Kožusznik
Browse files

Merge remote-tracking branch 'origin/iss1103' into iss1103

parents 7f394a20 d7bac1ee
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
haas-java-client/.settings/org.eclipse.core.resources.prefs
+ 1
− 0
View file @ 3baedad1
...@@ -3,5 +3,6 @@ encoding//src/main/java=UTF-8 ...@@ -3,5 +3,6 @@ encoding//src/main/java=UTF-8
encoding//src/main/resources=UTF-8 encoding//src/main/resources=UTF-8
encoding//src/test/java=UTF-8 encoding//src/test/java=UTF-8
encoding//src/test/resources=UTF-8 encoding//src/test/resources=UTF-8
encoding//target/generated-sources/wsimport=UTF-8
encoding//target/jaxws/wsimport/java=UTF-8 encoding//target/jaxws/wsimport/java=UTF-8
encoding/<project>=UTF-8 encoding/<project>=UTF-8
haas-java-client/pom.xml
+ 2
− 2
View file @ 3baedad1
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>jaxws-maven-plugin</artifactId> <artifactId>jaxws-maven-plugin</artifactId>
<version>1.12</version> <version>2.5</version>
<executions> <executions>
<execution> <execution>
<id>wsimport-from-jdk</id> <id>wsimport-from-jdk</id>
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>
<version>1.9</version> <version>3.0.0</version>
<executions> <executions>
<execution> <execution>
<id>add-source</id> <id>add-source</id>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment