From ada105d58263d6b0e33e653f67c9ef0f7127f3ea Mon Sep 17 00:00:00 2001
From: Matej Lukes <456316@mail.muni.cz>
Date: Sun, 22 Mar 2020 19:24:37 +0100
Subject: [PATCH] dependencies
---
GUI/GUI.iml | 23 -----------------------
GUI/pom.xml | 16 ++++++++++++++++
2 files changed, 16 insertions(+), 23 deletions(-)
delete mode 100644 GUI/GUI.iml
diff --git a/GUI/GUI.iml b/GUI/GUI.iml
deleted file mode 100644
index ae2b2f3a..00000000
--- a/GUI/GUI.iml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
- <output url="file://$MODULE_DIR$/target/classes" />
- <output-test url="file://$MODULE_DIR$/target/test-classes" />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
- <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
- <excludeFolder url="file://$MODULE_DIR$/target" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Maven: org.netbeans.api:org-netbeans-api-annotations-common:RELEASE82" level="project" />
- <orderEntry type="library" name="Maven: org.jogamp.jogl:jogl-all:2.0-rc11" level="project" />
- <orderEntry type="library" name="Maven: javax.vecmath:vecmath:1.5.2" level="project" />
- <orderEntry type="module" module-name="MeshModel" />
- <orderEntry type="library" name="Maven: java3d:j3d-core-utils:1.3.1" level="project" />
- <orderEntry type="library" name="Maven: java3d:vecmath:1.3.1" level="project" />
- <orderEntry type="library" name="Maven: java3d:j3d-core:1.3.1" level="project" />
- <orderEntry type="library" name="Maven: com.github.mokiat:java-data-front:v2.0.0" level="project" />
- </component>
-</module>
\ No newline at end of file
diff --git a/GUI/pom.xml b/GUI/pom.xml
index 704b5e6f..dc7ff66d 100644
--- a/GUI/pom.xml
+++ b/GUI/pom.xml
@@ -56,6 +56,22 @@
<artifactId>org-netbeans-api-annotations-common</artifactId>
<version>${netbeans.version}</version>
</dependency>
+ <dependency>
+ <groupId>cz.findetis</groupId>
+ <artifactId>MeshModel</artifactId>
+ <version>2.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jogamp.jogl</groupId>
+ <artifactId>jogl-all-mobile</artifactId>
+ <version>2.0.2-rc12</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jogamp.jogl</groupId>
+ <artifactId>jogl-all</artifactId>
+ <version>2.0-rc11</version>
+ </dependency>
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
--
GitLab