From 177b7457d177e227b330c87bba52b292472aad96 Mon Sep 17 00:00:00 2001
From: JIAO Jie <jiaojie@didichuxing.com>
Date: Thu, 9 Nov 2017 10:20:36 +0800
Subject: [PATCH] Update plantuml.jar to Maven source

---
 .gitignore           |  1 +
 nb-configuration.xml |  2 +-
 nbactions.xml        |  2 +-
 pom.xml              | 15 +++++++--------
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index d6c8f9a..b30e2a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /target/
 /Sample/StateMachine/
+/application1/nbproject/private/
\ No newline at end of file
diff --git a/nb-configuration.xml b/nb-configuration.xml
index d0b99ef..c733e1b 100644
--- a/nb-configuration.xml
+++ b/nb-configuration.xml
@@ -14,7 +14,7 @@ That way multiple projects can share the same settings (useful for formatting ru
 Any value defined here will override the pom.xml file value but is only applicable to the current project.
 -->
         <netbeans.compile.on.save>all</netbeans.compile.on.save>
-        <netbeans.hint.jdkPlatform>JDK_1.8.0_112b15</netbeans.hint.jdkPlatform>
         <netbeans.hint.license>mit</netbeans.hint.license>
+        <org-netbeans-modules-javascript2-requirejs.enabled>true</org-netbeans-modules-javascript2-requirejs.enabled>
     </properties>
 </project-shared-configuration>
diff --git a/nbactions.xml b/nbactions.xml
index 98acf82..c1b2592 100644
--- a/nbactions.xml
+++ b/nbactions.xml
@@ -14,7 +14,7 @@
                 <goal>nbm:run-ide</goal>
             </goals>
             <properties>
-                <Env.JAVA_HOME>/home/venkat/Programs/Java/jdk1.8.0_65</Env.JAVA_HOME>
+                <Env.JAVA_HOME>/opt/jdk</Env.JAVA_HOME>
             </properties>
         </action>
     </actions>
diff --git a/pom.xml b/pom.xml
index 533bfb7..95f8699 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.netbeans.modules</groupId>
     <artifactId>PlantUML-NB</artifactId>
-    <version>1.6</version>
+    <version>1.7</version>
     <packaging>nbm</packaging>
 
     <name>PlantUML-NB</name>
@@ -38,12 +38,6 @@
             <artifactId>org-netbeans-api-annotations-common</artifactId>
             <version>${netbeans.platform.version}</version>
         </dependency>
-        <dependency>
-            <groupId>net.sourceforge.plantuml</groupId>
-            <artifactId>plantuml</artifactId>
-            <version>2017.11</version>
-            <type>jar</type>
-        </dependency>
         <dependency>
             <groupId>net.sourceforge.plantuml-depend</groupId>
             <artifactId>plantuml-dependency-cli</artifactId>
@@ -249,6 +243,11 @@
             <version>1.16.16</version>
             <type>jar</type>
         </dependency>
+        <dependency>
+            <groupId>net.sourceforge.plantuml</groupId>
+            <artifactId>plantuml</artifactId>
+            <version>1.2017.18</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -260,7 +259,7 @@
                 <extensions>true</extensions>
                 <configuration>
                     <useDefaultManifestFile>true</useDefaultManifestFile>
-                    <netbeansInstallation>/home/venkat/Programs/netbeans-8.2/</netbeansInstallation>
+                    <netbeansInstallation>/home/jiaojie/netbeans-8.2/</netbeansInstallation>
                     <additionalArguments>-J-XXaltjvm=dcevm</additionalArguments>
                     <!--<debugAdditionalArguments>true</debugAdditionalArguments>-->
 <!--                        <nbmBuildDir>${project.build.directory}/netbeans_clusters/</nbmBuildDir>-->