From a1e86fa37d1590493df614c3135d00b28aa770c5 Mon Sep 17 00:00:00 2001 From: Tom Sellman Date: Tue, 29 Oct 2024 16:41:17 +0100 Subject: [PATCH 1/2] Fix package name --- src/main/java/{nf-core => nf_core}/nf/test/tiff/Methods.java | 2 +- .../java/{nf-core => nf_core}/nf/test/tiff/PathExtension.java | 2 +- src/main/resources/META-INF/nf-test-plugin | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) rename src/main/java/{nf-core => nf_core}/nf/test/tiff/Methods.java (86%) rename src/main/java/{nf-core => nf_core}/nf/test/tiff/PathExtension.java (86%) diff --git a/src/main/java/nf-core/nf/test/tiff/Methods.java b/src/main/java/nf_core/nf/test/tiff/Methods.java similarity index 86% rename from src/main/java/nf-core/nf/test/tiff/Methods.java rename to src/main/java/nf_core/nf/test/tiff/Methods.java index 9d67648..096655c 100644 --- a/src/main/java/nf-core/nf/test/tiff/Methods.java +++ b/src/main/java/nf_core/nf/test/tiff/Methods.java @@ -1,4 +1,4 @@ -package nf-core.nf.test.tiff; +package nf_core.nf.test.tiff; /* * Add your custom methods to nf-test diff --git a/src/main/java/nf-core/nf/test/tiff/PathExtension.java b/src/main/java/nf_core/nf/test/tiff/PathExtension.java similarity index 86% rename from src/main/java/nf-core/nf/test/tiff/PathExtension.java rename to src/main/java/nf_core/nf/test/tiff/PathExtension.java index 9555060..1b8e9d3 100644 --- a/src/main/java/nf-core/nf/test/tiff/PathExtension.java +++ b/src/main/java/nf_core/nf/test/tiff/PathExtension.java @@ -1,4 +1,4 @@ -package nf-core.nf.test.tiff; +package nf_core.nf.test.tiff; /* * Add your custom extensions to the path() method diff --git a/src/main/resources/META-INF/nf-test-plugin b/src/main/resources/META-INF/nf-test-plugin index 43e81c6..a6eee71 100644 --- a/src/main/resources/META-INF/nf-test-plugin +++ b/src/main/resources/META-INF/nf-test-plugin @@ -1,5 +1,5 @@ moduleName=nft-tiff moduleVersion=0.1.0 moduleAuthors=nf-core -extensionMethods=nf-core.nf.test.tiff.Methods -extensionClasses=nf-core.nf.test.tiff.PathExtension \ No newline at end of file +extensionMethods=nf_core.nf.test.tiff.Methods +extensionClasses=nf_core.nf.test.tiff.PathExtension \ No newline at end of file From 726b50c04415b42fff4f307ed2223817f6d6227b Mon Sep 17 00:00:00 2001 From: Tom Sellman Date: Tue, 29 Oct 2024 16:46:56 +0100 Subject: [PATCH 2/2] Add tiff library https://ngageoint.github.io/tiff-java/ --- .gitignore | 5 +- dependency-reduced-pom.xml | 45 +++++++++++ pom.xml | 76 ++++++++++--------- .../java/nf_core/nf/test/tiff/Methods.java | 4 +- 4 files changed, 94 insertions(+), 36 deletions(-) create mode 100644 dependency-reduced-pom.xml diff --git a/.gitignore b/.gitignore index 0a687d3..198b5f0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,9 @@ # Compiled class file *.class +# intellij files +.idea/ + # Log file *.log @@ -26,4 +29,4 @@ hs_err_pid* /.project /.settings/ /.nextflow/ -/.nf-test/ \ No newline at end of file +/.nf-test/ diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml new file mode 100644 index 0000000..9cc954d --- /dev/null +++ b/dependency-reduced-pom.xml @@ -0,0 +1,45 @@ + + + 4.0.0 + com.nf-core + nft-tiff + nft-tiff + 0.1.0 + An nf-test plugin to test nft-tiff files + https://github.com/nf-core/nft-tiff + + + MIT License + http://www.opensource.org/licenses/mit + + + + scm:git:https://github.com/nf-core/nft-tiff + scm:git:ssh://github.com:nf-core/nft-tiff.git + https://github.com/nf-core/nft-tiff/tree/master + + + + + maven-shade-plugin + 3.5.2 + + + package + + shade + + + + + + + + ${java.version} + 11 + ${java.version} + ${java.version} + UTF-8 + -Xdoclint:none + + diff --git a/pom.xml b/pom.xml index 30a2fd8..f19db79 100644 --- a/pom.xml +++ b/pom.xml @@ -1,38 +1,46 @@ - 4.0.0 - - com.nf-core - nft-tiff - 0.1.0 - jar - - nft-tiff - An nf-test plugin to test nft-tiff files - https://github.com/nf-core/nft-tiff - - - - MIT License - http://www.opensource.org/licenses/mit - - - - - https://github.com/nf-core/nft-tiff/tree/master - scm:git:https://github.com/nf-core/nft-tiff - scm:git:ssh://github.com:nf-core/nft-tiff.git - - - - UTF-8 - 11 - ${java.version} - ${java.version} - ${java.version} - -Xdoclint:none - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + com.nf-core + nft-tiff + 0.1.0 + jar + + nft-tiff + An nf-test plugin to test nft-tiff files + https://github.com/nf-core/nft-tiff + + + + MIT License + http://www.opensource.org/licenses/mit + + + + + https://github.com/nf-core/nft-tiff/tree/master + scm:git:https://github.com/nf-core/nft-tiff + scm:git:ssh://github.com:nf-core/nft-tiff.git + + + + UTF-8 + 11 + ${java.version} + ${java.version} + ${java.version} + -Xdoclint:none + + + + + mil.nga + tiff + 3.0.0 + + diff --git a/src/main/java/nf_core/nf/test/tiff/Methods.java b/src/main/java/nf_core/nf/test/tiff/Methods.java index 096655c..92d77f7 100644 --- a/src/main/java/nf_core/nf/test/tiff/Methods.java +++ b/src/main/java/nf_core/nf/test/tiff/Methods.java @@ -1,15 +1,17 @@ package nf_core.nf.test.tiff; +import mil.nga.tiff.TIFFImage; + /* * Add your custom methods to nf-test * * @author: nf-core */ - public class Methods { public static void hello() { System.out.println("Hello from nft-tiff"); + TIFFImage img = new TIFFImage(); } } \ No newline at end of file