From d75dd26f66a86bdc06d59b4d56dee026548d0320 Mon Sep 17 00:00:00 2001 From: Thomas <thomas.musset@pasteur.fr> Date: Tue, 21 Jan 2025 17:25:43 +0100 Subject: [PATCH] updated to v4.0.0-a.1, updated to new architecture --- pom.xml | 20 ++---------- .../apache/ApacheCommonsLangPlugin.java | 30 +++++++++++++++--- .../stef/library/apache/lang.png} | Bin 3 files changed, 27 insertions(+), 23 deletions(-) rename src/main/resources/{apache_big.png => plugins/stef/library/apache/lang.png} (100%) diff --git a/pom.xml b/pom.xml index 8cc4ee5..e80042f 100644 --- a/pom.xml +++ b/pom.xml @@ -8,14 +8,12 @@ <parent> <artifactId>pom-icy</artifactId> <groupId>org.bioimageanalysis.icy</groupId> - <version>2.1.7</version> + <version>3.0.0-a.3</version> </parent> <!-- Project Information --> <artifactId>apache-commons-lang</artifactId> - <version>3.13.0</version> - - <packaging>jar</packaging> + <version>4.0.0-a.1</version> <name>Apache Commons Lang</name> <description>The Apache Commons Lang Library.</description> @@ -53,11 +51,6 @@ </developer> </developers> - <!-- Project properties --> - <properties> - <artifact-to-extract>commons-lang3</artifact-to-extract> - </properties> - <!-- List of project's dependencies --> <dependencies> <dependency> @@ -66,13 +59,4 @@ <version>3.17.0</version> </dependency> </dependencies> - - <!-- Icy Maven repository (to find parent POM) --> - <repositories> - <repository> - <id>icy</id> - <name>Icy's Nexus</name> - <url>https://icy-nexus.pasteur.fr/repository/Icy/</url> - </repository> - </repositories> </project> diff --git a/src/main/java/plugins/stef/library/apache/ApacheCommonsLangPlugin.java b/src/main/java/plugins/stef/library/apache/ApacheCommonsLangPlugin.java index 4a8fe85..590ee4b 100644 --- a/src/main/java/plugins/stef/library/apache/ApacheCommonsLangPlugin.java +++ b/src/main/java/plugins/stef/library/apache/ApacheCommonsLangPlugin.java @@ -1,14 +1,34 @@ +/* + * Copyright (c) 2010-2025. 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.stef.library.apache; -import icy.plugin.abstract_.Plugin; -import icy.plugin.interface_.PluginLibrary; +import org.bioimageanalysis.icy.extension.plugin.abstract_.Plugin; +import org.bioimageanalysis.icy.extension.plugin.annotation_.IcyPluginIcon; +import org.bioimageanalysis.icy.extension.plugin.annotation_.IcyPluginName; /** * Icy wrapper for the Apache Commons Lang library. - * + * * @author Stephane Dallongeville */ -public class ApacheCommonsLangPlugin extends Plugin implements PluginLibrary -{ +@IcyPluginName("Apache Commons Lang") +@IcyPluginIcon(path = "/plugins/stef/library/apache/lang.png") +public class ApacheCommonsLangPlugin extends Plugin { // } diff --git a/src/main/resources/apache_big.png b/src/main/resources/plugins/stef/library/apache/lang.png similarity index 100% rename from src/main/resources/apache_big.png rename to src/main/resources/plugins/stef/library/apache/lang.png -- GitLab