Merge origin/master

This commit is contained in:
Edi
2019-07-05 19:09:43 +02:00
parent d4db36c418
commit 5996c744a2
9 changed files with 296 additions and 62 deletions
+7 -1
View File
@@ -28,6 +28,9 @@ dist.war=${dist.dir}/${war.name}
endorsed.classpath=\
${libs.javaee-endorsed-api-7.0.classpath}
excludes=
file.reference.jackson-annotations-2.9.0.jar=C:\\Users\\Edi\\Desktop\\jackson-annotations-2.9.0.jar
file.reference.jackson-core-2.9.9.jar=C:\\Users\\Edi\\Desktop\\jackson-core-2.9.9.jar
file.reference.jackson-databind-2.9.9.jar=C:\\Users\\Edi\\Desktop\\jackson-databind-2.9.9.jar
includes=**
j2ee.compile.on.save=true
j2ee.copy.static.files.on.save=true
@@ -42,7 +45,10 @@ j2ee.platform.wsit.classpath=
j2ee.server.type=gfv3ee6
jar.compress=false
javac.classpath=\
${libs.javaee-web-api-7.0.classpath}
${libs.javaee-web-api-7.0.classpath}:\
${file.reference.jackson-annotations-2.9.0.jar}:\
${file.reference.jackson-core-2.9.9.jar}:\
${file.reference.jackson-databind-2.9.9.jar}
# Space-separated list of extra javac options
javac.compilerargs=
javac.debug=true