From c4b7380c56be6c138e687d52ea22078c6cd293bd Mon Sep 17 00:00:00 2001 From: Thomas <thomas.musset@pasteur.fr> Date: Tue, 5 Sep 2023 17:04:50 +0200 Subject: [PATCH] updated pom, optimized code for java 11 --- .gitignore | 3 ++- pom.xml | 26 +++---------------- .../JythonExecnetForIcy.java | 21 +++++++++++++-- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index 3d47f98..8d47cac 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ target/ .settings/ *.iml .project -.classpath \ No newline at end of file +.classpath +**/.DS_Store \ No newline at end of file diff --git a/pom.xml b/pom.xml index 2a9b0e4..aecc40f 100644 --- a/pom.xml +++ b/pom.xml @@ -7,22 +7,20 @@ <!-- Inherited Icy Parent POM --> <parent> <groupId>org.bioimageanalysis.icy</groupId> - <artifactId>parent-pom-plugin</artifactId> - <version>1.0.3</version> + <artifactId>pom-icy</artifactId> + <version>2.2.0</version> </parent> <!-- Project Information --> <artifactId>jython-execnet</artifactId> - <version>5.5.2</version> - - <packaging>jar</packaging> + <version>6.0.0</version> <name>Jython execnet for Icy</name> <description> Enables Python scripts that are run inside Icy to communicate with other Python instances outside Icy. This allows the access to CPython-only libraries such as Numpy. </description> - <url>http://icy.bioimageanalysis.org/plugin/jython-execnet-for-icy/</url> + <url>https://icy.bioimageanalysis.org/plugin/jython-execnet-for-icy/</url> <inceptionYear>2020</inceptionYear> <organization> @@ -56,27 +54,11 @@ </developer> </developers> - <!-- Project properties --> - <properties> - - </properties> - - <!-- Project build configuration --> - <build> - </build> - <!-- List of project's dependencies --> <dependencies> - <!-- The core of Icy --> - <dependency> - <groupId>org.bioimageanalysis.icy</groupId> - <artifactId>icy-kernel</artifactId> - </dependency> - <dependency> <groupId>org.bioimageanalysis.icy</groupId> <artifactId>jython</artifactId> - <version>2.8.0</version> </dependency> </dependencies> diff --git a/src/main/java/plugins/tlecomte/jythonExecnetForIcy/JythonExecnetForIcy.java b/src/main/java/plugins/tlecomte/jythonExecnetForIcy/JythonExecnetForIcy.java index cc5b155..a734f58 100644 --- a/src/main/java/plugins/tlecomte/jythonExecnetForIcy/JythonExecnetForIcy.java +++ b/src/main/java/plugins/tlecomte/jythonExecnetForIcy/JythonExecnetForIcy.java @@ -1,3 +1,21 @@ +/* + * Copyright (c) 2010-2023. Institut Pasteur. + * + * This file is part of Icy. + * Icy is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Icy is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Icy. If not, see <https://www.gnu.org/licenses/>. + */ + package plugins.tlecomte.jythonExecnetForIcy; import icy.plugin.abstract_.Plugin; @@ -5,7 +23,6 @@ import icy.plugin.interface_.PluginLibrary; import plugins.tlecomte.jythonForIcy.PythonLibraries; @PythonLibraries -public class JythonExecnetForIcy extends Plugin implements PluginLibrary -{ +public class JythonExecnetForIcy extends Plugin implements PluginLibrary { } -- GitLab