From bab35c9ac64690fb1136b42b86af414e1b677f6d Mon Sep 17 00:00:00 2001 From: Thomas <thomas.musset@pasteur.fr> Date: Tue, 21 Jan 2025 17:34:53 +0100 Subject: [PATCH] updated to v1.16.0, updated dependency to v1.17.2 --- .gitignore | 36 +++++++++++++++++++++++++++++++++--- pom.xml | 41 +++++------------------------------------ 2 files changed, 38 insertions(+), 39 deletions(-) diff --git a/.gitignore b/.gitignore index 3d47f98..9d5e2ad 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,36 @@ -.idea/ target/ -.settings/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### IntelliJ IDEA ### +.idea/ +*.iws *.iml +*.ipr + +### Eclipse ### +.apt_generated +.classpath +.factorypath .project -.classpath \ No newline at end of file +.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 594b1d5..f57325d 100644 --- a/pom.xml +++ b/pom.xml @@ -7,13 +7,13 @@ <!-- Inherited Icy Parent POM --> <parent> <groupId>org.bioimageanalysis.icy</groupId> - <artifactId>parent-pom-plugin</artifactId> - <version>1.0.6</version> + <artifactId>pom-icy</artifactId> + <version>2.1.7</version> </parent> <!-- Project Information --> <artifactId>apache-commons-codec</artifactId> - <version>1.15.0</version> + <version>1.16.0</version> <packaging>jar</packaging> @@ -21,7 +21,7 @@ <description> The Apache Commons Codec Library. Apache Commons Codec (TM) software provides implementations of common encoders and decoders such as Base64, Hex, Phonetic and URLs. </description> - <url>http://icy.bioimageanalysis.org/plugin/apache-commons-codec/</url> + <url>https://icy.bioimageanalysis.org/plugin/apache-commons-codec/</url> <inceptionYear>2020</inceptionYear> <organization> @@ -57,42 +57,11 @@ <!-- Project properties --> <properties> - + <arttifact-to-extract>commons-codec</arttifact-to-extract> </properties> - <!-- Project build configuration --> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>${project.artifactId}-fetch</id> - <phase>generate-sources</phase> - <goals> - <goal>unpack-dependencies</goal> - </goals> - <configuration> - <includeArtifactIds>commons-codec</includeArtifactIds> - <outputDirectory>${project.build.outputDirectory}</outputDirectory> - <stripVersion>true</stripVersion> - <excludeTransitive>true</excludeTransitive> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - <!-- List of project's dependencies --> <dependencies> - <!-- The core of Icy --> - <dependency> - <groupId>org.bioimageanalysis.icy</groupId> - <artifactId>icy-kernel</artifactId> - </dependency> - <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> -- GitLab