From 86c1ea126a8ddd3fcae7a8d22ced90c984c5d30c Mon Sep 17 00:00:00 2001
From: Marcel Otte <otte.mm@googlemail.com>
Date: Mon, 18 Apr 2016 20:30:41 +0200
Subject: [PATCH] latest changes for java

---
 .gitignore        | 1 +
 .gitlab-ci.yml    | 7 ++++++-
 java/.classpath   | 2 +-
 java/.project     | 1 +
 java/build.gradle | 0
 5 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 java/build.gradle

diff --git a/.gitignore b/.gitignore
index 4d6556c..908c0d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 *.war
 *.ear
 /bin
+*/.settings/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8585983..565b880 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,8 @@
-image: gcc:latest
 stages:
   - build
 
 build-c:
+  image: archlinux_gcc53_qt5_cmake
   stage: build
   script:
     - cd c; make
@@ -11,6 +11,11 @@ build-c:
       - c/libcmdlineoptions.*
       - c/tests-*
 
+build-java:
+  image: archlinux_jdk8
+  stage: build
+
+
 #test-c:
   #stage: test
   #script:
diff --git a/java/.classpath b/java/.classpath
index 3e0fb27..59a8c57 100644
--- a/java/.classpath
+++ b/java/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry exported="true" kind="con" path="org.springsource.ide.eclipse.gradle.classpathcontainer"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/java/.project b/java/.project
index 64c5430..484339a 100644
--- a/java/.project
+++ b/java/.project
@@ -12,6 +12,7 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.springsource.ide.eclipse.gradle.core.nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>
diff --git a/java/build.gradle b/java/build.gradle
new file mode 100644
index 0000000..e69de29