From 5e6f9b1330449d42329c6a967fd4eecfa5549de1 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.musset@pasteur.fr>
Date: Mon, 3 Feb 2025 18:58:22 +0100
Subject: [PATCH] updated to v2.0.0-a.1, updated to new architecture
---
.gitignore | 40 ++++++++++++++--
pom.xml | 47 +++++++++++--------
.../apache/ApacheCommonsCsvPlugin.java | 31 ++++++++++--
3 files changed, 90 insertions(+), 28 deletions(-)
diff --git a/.gitignore b/.gitignore
index 8bd3a05..9d5e2ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,36 @@
-/target/
-/.settings/
-/.classpath
-/.project
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### IntelliJ IDEA ###
+.idea/
+*.iws
+*.iml
+*.ipr
+
+### Eclipse ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
+
+### Mac OS ###
+**/.DS_Store
+Icon?
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 3412e84..6ccfaa5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,17 +7,16 @@
<parent>
<groupId>org.bioimageanalysis.icy</groupId>
<artifactId>pom-icy</artifactId>
- <version>2.1.1</version>
+ <version>3.0.0-a.3</version>
</parent>
<artifactId>apache-commons-csv</artifactId>
- <version>1.9.0</version>
- <packaging>jar</packaging>
+ <version>2.0.0-a.1</version>
<name>Apache Commons CSV</name>
<description>The Apache Commons CSV library for Icy</description>
- <url>http://icy.bioimageanalysis.org/plugin/apache-commons-csv/</url>
+ <url>https://icy.bioimageanalysis.org/plugin/apache-commons-csv/</url>
<inceptionYear>2020</inceptionYear>
<developers>
@@ -37,28 +36,38 @@
</roles>
</developer>
</developers>
-
- <!-- Project properties -->
- <properties>
- <artifact-to-extract>commons-csv</artifact-to-extract>
- </properties>
<!-- List of project's dependencies -->
<dependencies>
+ <dependency>
+ <groupId>org.bioimageanalysis.icy</groupId>
+ <artifactId>apache-commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.bioimageanalysis.icy</groupId>
+ <artifactId>apache-commons-codec</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
- <version>1.9.0</version>
+ <version>1.13.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>
-
+ <!-- marked default dependencies as provided by Icy -->
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
</project>
\ No newline at end of file
diff --git a/src/main/java/plugins/danyfel80/library/apache/ApacheCommonsCsvPlugin.java b/src/main/java/plugins/danyfel80/library/apache/ApacheCommonsCsvPlugin.java
index 7e5df4a..80fdb14 100644
--- a/src/main/java/plugins/danyfel80/library/apache/ApacheCommonsCsvPlugin.java
+++ b/src/main/java/plugins/danyfel80/library/apache/ApacheCommonsCsvPlugin.java
@@ -1,13 +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.danyfel80.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 CSV library.
+ *
* @author Daniel Felipe Gonzalez Obando
*/
-public class ApacheCommonsCsvPlugin extends Plugin implements PluginLibrary
-{
-
+@IcyPluginName("Apache Commons CSV")
+@IcyPluginIcon(path = "/apache_big.png")
+public class ApacheCommonsCsvPlugin extends Plugin {
+ //
}
--
GitLab