diff --git a/artifacts/configs/mph-table/mph-table.patch b/artifacts/configs/mph-table/mph-table.patch index b004344a..a4a7dc76 100644 --- a/artifacts/configs/mph-table/mph-table.patch +++ b/artifacts/configs/mph-table/mph-table.patch @@ -28,27 +28,6 @@ index 65f0f80..508b290 100644 + + + org.apache.maven.plugins -+ maven-assembly-plugin -+ 3.3.0 -+ -+ -+ -+ jar-with-dependencies -+ -+ -+ -+ -+ -+ make-assembly -+ package -+ -+ single -+ -+ -+ -+ -+ -+ org.apache.maven.plugins + maven-jar-plugin + 3.2.0 + diff --git a/src/main/java/gr/gousiosg/javacg/stat/support/RepoTool.java b/src/main/java/gr/gousiosg/javacg/stat/support/RepoTool.java index 652e1785..0ada4a12 100644 --- a/src/main/java/gr/gousiosg/javacg/stat/support/RepoTool.java +++ b/src/main/java/gr/gousiosg/javacg/stat/support/RepoTool.java @@ -152,13 +152,7 @@ public static Optional obtainTool(String folderName){ private void moveJars() throws IOException { Path sourceDir = Paths.get(System.getProperty("user.dir"), getProjectDir(), "target"); Path targetDir = Paths.get(System.getProperty("user.dir"), "artifacts", "output"); - - // @todo may want to be able to override this in the yaml file on a project basis... - String depGlob = this.name + "*-with-dependencies.jar"; - String testGlob = this.name + "*-tests.jar"; - - moveFiles(sourceDir, targetDir, depGlob); - moveFiles(sourceDir, targetDir, testGlob); + moveFiles(sourceDir, targetDir, "*.jar"); } private void moveFiles(Path sourceDir, Path targetDir, String glob) throws IOException {