Update dependencies and improve destroy method

gephi · Jun 12, 2024 · dafa574 · dafa574
1 parent c5afb8b
commit dafa574
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 30 deletions.
diff --git a/modules/demo-jogl/pom.xml b/modules/demo-jogl/pom.xml
@@ -12,11 +12,6 @@
 
     <name>Viz Engine Demo (JOGL)</name>
 
-    <properties>
-        <viz-demo.maven-jar-plugin.version>3.3.0</viz-demo.maven-jar-plugin.version>
-        <viz-demo.maven-dependency-plugin.version>3.6.0</viz-demo.maven-dependency-plugin.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.gephi</groupId>
@@ -30,37 +25,30 @@
         <dependency>
             <groupId>org.gephi</groupId>
             <artifactId>graph-api</artifactId>
-            <version>${gephi.version}</version>
         </dependency>
         <dependency>
             <groupId>org.gephi</groupId>
             <artifactId>io-importer-api</artifactId>
-            <version>${gephi.version}</version>
         </dependency>
         <dependency>
             <groupId>org.gephi</groupId>
             <artifactId>io-importer-plugin</artifactId>
-            <version>${gephi.version}</version>
         </dependency>
         <dependency>
             <groupId>org.gephi</groupId>
             <artifactId>layout-api</artifactId>
-            <version>${gephi.version}</version>
         </dependency>
         <dependency>
             <groupId>org.gephi</groupId>
             <artifactId>layout-plugin</artifactId>
-            <version>${gephi.version}</version>
         </dependency>
         <dependency>
             <groupId>org.netbeans.api</groupId>
             <artifactId>org-openide-filesystems</artifactId>
-            <version>${netbeans.version}</version>
         </dependency>
         <dependency>
             <groupId>org.netbeans.modules</groupId>
             <artifactId>org-netbeans-modules-masterfs</artifactId>
-            <version>${netbeans.version}</version>
         </dependency>
 
         <!-- Gluegen -->
@@ -77,21 +65,6 @@
     </dependencies>
 
     <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-jar-plugin</artifactId>
-                    <version>${viz-demo.maven-jar-plugin.version}</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <version>${viz-demo.maven-dependency-plugin.version}</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

diff --git a/modules/engine-core/src/main/java/org/gephi/viz/engine/VizEngine.java b/modules/engine-core/src/main/java/org/gephi/viz/engine/VizEngine.java
@@ -364,6 +364,9 @@ public synchronized void pause() {
     }
 
     public synchronized void destroy() {
+        allInputListeners.clear();
+        inputListenersPipeline.clear();
+
         this.renderingTarget.stop();
         if (updatersThreadPool != null) {
             try {

diff --git a/pom.xml b/pom.xml
@@ -14,14 +14,17 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <jcp-maven-plugin.version>7.1.2</jcp-maven-plugin.version>
 
-        <gephi.graphstore.version>0.6.15-viz-engine-SNAPSHOT</gephi.graphstore.version>
-        <gephi.version>0.10.0</gephi.version>
+        <gephi.graphstore.version>0.7.1</gephi.graphstore.version>
+        <gephi.version>0.11.0-SNAPSHOT</gephi.version>
         <jogl.version>2.5.0</jogl.version>
 
         <joml.version>1.10.5</joml.version>
-        <netbeans.version>RELEASE180</netbeans.version>
+        <netbeans.version>RELEASE220</netbeans.version>
 
         <junit.version>4.13.2</junit.version>
+
+        <maven-jar-plugin.version>3.4.1</maven-jar-plugin.version>
+        <maven-dependency-plugin.version>3.7.0</maven-dependency-plugin.version>
     </properties>
 
     <modules>
@@ -127,6 +130,43 @@
                 <artifactId>viz-engine-jogl</artifactId>
                 <version>${project.version}</version>
             </dependency>
+
+            <!-- Gephi for demo -->
+            <dependency>
+                <groupId>org.gephi</groupId>
+                <artifactId>graph-api</artifactId>
+                <version>${gephi.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.gephi</groupId>
+                <artifactId>io-importer-api</artifactId>
+                <version>${gephi.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.gephi</groupId>
+                <artifactId>io-importer-plugin</artifactId>
+                <version>${gephi.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.gephi</groupId>
+                <artifactId>layout-api</artifactId>
+                <version>${gephi.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.gephi</groupId>
+                <artifactId>layout-plugin</artifactId>
+                <version>${gephi.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.netbeans.api</groupId>
+                <artifactId>org-openide-filesystems</artifactId>
+                <version>${netbeans.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.netbeans.modules</groupId>
+                <artifactId>org-netbeans-modules-masterfs</artifactId>
+                <version>${netbeans.version}</version>
+            </dependency>
 
             <!-- Test -->
             <dependency>
@@ -141,6 +181,16 @@
     <build>
         <pluginManagement>
             <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>${maven-jar-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <version>${maven-dependency-plugin.version}</version>
+                </plugin>
                 <plugin>
                     <groupId>com.igormaznitsa</groupId>
                     <artifactId>jcp</artifactId>