diff --git a/.gitignore b/.gitignore index 3d47f986c41db29ec6dc0d5036bf760b3a1cf366..9d5e2adf2559faf63c3ad3f92c26e7d181ddb5f1 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 45f6524c6e84c3c8110684637d21554427da020d..8cc4ee58c8e054c715b7c74078060b4742bb3b3f 100644 --- a/pom.xml +++ b/pom.xml @@ -8,18 +8,18 @@ <parent> <artifactId>pom-icy</artifactId> <groupId>org.bioimageanalysis.icy</groupId> - <version>2.0.0</version> + <version>2.1.7</version> </parent> <!-- Project Information --> <artifactId>apache-commons-lang</artifactId> - <version>3.12.0</version> + <version>3.13.0</version> <packaging>jar</packaging> <name>Apache Commons Lang</name> <description>The Apache Commons Lang Library.</description> - <url>http://icy.bioimageanalysis.org/plugin/apache-commons-lang/</url> + <url>https://icy.bioimageanalysis.org/plugin/apache-commons-lang/</url> <inceptionYear>2020</inceptionYear> <organization> @@ -55,31 +55,15 @@ <!-- Project properties --> <properties> - <artifact-to-include>commons-lang3</artifact-to-include> + <artifact-to-extract>commons-lang3</artifact-to-extract> </properties> - <profiles> - <profile> - <id>icy-plugin</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - </profile> - </profiles> - <!-- List of project's dependencies --> <dependencies> - <!-- The core of Icy --> - <dependency> - <groupId>org.bioimageanalysis.icy</groupId> - <artifactId>icy-kernel</artifactId> - <version>${icy-kernel.version}</version> - </dependency> - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.12.0</version> + <version>3.17.0</version> </dependency> </dependencies>