Plugin v3.5.3: Java 11, updates the versions of a couple of dependenc…

…ies.
GeneMANIA · Apr 20, 2021 · 339d37b · 339d37b
1 parent 19a00b8
commit 339d37b
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 22 deletions.
diff --git a/plugin/distribution/pom.xml b/plugin/distribution/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.genemania</groupId>
         <artifactId>plugin-parent</artifactId>
-        <version>3.5.2</version>
+        <version>3.5.3</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -18,11 +18,6 @@
             <artifactId>plugin-core</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <!-- <dependency>
-            <groupId>org.genemania</groupId>
-            <artifactId>plugin-cy2</artifactId>
-            <version>${project.version}</version>
-        </dependency> -->
     </dependencies>
 
     <build>

diff --git a/plugin/plugin-core/pom.xml b/plugin/plugin-core/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.genemania</groupId>
         <artifactId>plugin-parent</artifactId>
-        <version>3.5.2</version>
+        <version>3.5.3</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -53,7 +53,7 @@
         <dependency>
             <groupId>cglib</groupId>
             <artifactId>cglib-nodep</artifactId>
-            <version>2.2</version>
+            <version>3.3.0</version>
         </dependency>
         <dependency>
 			<groupId>net.sourceforge.zip64file</groupId>

diff --git a/plugin/plugin-core/src/main/java/org/genemania/plugin/FileUtils.java b/plugin/plugin-core/src/main/java/org/genemania/plugin/FileUtils.java
@@ -153,7 +153,6 @@ String join(String conjunct, String[] parts) {
 		return buffer.toString();
 	}
 
-	@SuppressWarnings("unchecked")
 	public void unzip(File zipPath, File destination, ProgressReporter progress) throws IOException {
 		Zip64File file = new Zip64File(zipPath);
 		try {

diff --git a/plugin/plugin-cy3/pom.xml b/plugin/plugin-cy3/pom.xml
@@ -3,15 +3,14 @@
 	<parent>
         <groupId>org.genemania</groupId>
         <artifactId>plugin-parent</artifactId>
-        <version>3.5.2</version>
+        <version>3.5.3</version>
         <relativePath>..</relativePath>
 	</parent>
     <properties>
 		<bundle.symbolicName>org.genemania.plugin-impl</bundle.symbolicName>
 		<bundle.namespace>org.genemania.plugin.cytoscape3</bundle.namespace>
 		<osgi.api.version>4.2.0</osgi.api.version>
 		<maven-pax-plugin.version>1.5</maven-pax-plugin.version>
-		<maven-bundle-plugin.version>3.0.0</maven-bundle-plugin.version>
 	</properties>
 
     <modelVersion>4.0.0</modelVersion>
@@ -141,7 +140,6 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>${maven-bundle-plugin.version}</version>
 				<configuration>
 					<instructions>
 					    <Bundle-Name>GeneMANIA</Bundle-Name>
@@ -159,6 +157,7 @@
 						<_include>../src/etc/MANIFEST</_include>
 						<_failok>true</_failok>
 					</instructions>
+					<finalName>genemania-cy3-${project.version}</finalName>
 				</configuration>
 			</plugin>
             <plugin>

diff --git a/plugin/pom.xml b/plugin/pom.xml
@@ -11,24 +11,21 @@
     </parent>
 
     <artifactId>plugin-parent</artifactId>
-    <version>3.5.2</version>
+    <version>3.5.3</version>
     <packaging>pom</packaging>
     <name>GeneMANIA Cytoscape App Parent</name>
 
     <modules>
         <module>plugin-core</module>
-        <!-- <module>plugin-cy2-support</module>
-        <module>plugin-cy26-support</module>
-        <module>plugin-cy2</module> -->
         <module>plugin-cy3</module>
         <module>distribution</module>
     </modules>
 
     <properties>
         <!-- Oldest data set that works with this binary -->
         <minDataVersion>2010-08-25</minDataVersion>
-         <!-- App version -->
-        <cytoscapeVersion>3.5.2</cytoscapeVersion>
+        <!-- App version -->
+        <cytoscapeVersion>3.5.3</cytoscapeVersion>
         <!-- Cytoscape metadata -->
 		<cy3.version>3.7.0</cy3.version>
     </properties>
@@ -94,11 +91,11 @@
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
+				<groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>11</source>
+                    <target>11</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -202,7 +199,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.0</version>
+            <version>4.13</version>
             <scope>test</scope>
         </dependency>
     </dependencies>