Skip to content

Commit 4bc2cba

Browse files
authored
Merge pull request gousiosg#10 from bitslab/fix-movejar-to-enable-moving-all-jar
Fix movejar to enable moving all jar
2 parents 008c322 + 92c79fc commit 4bc2cba

File tree

2 files changed

+1
-28
lines changed

2 files changed

+1
-28
lines changed

artifacts/configs/mph-table/mph-table.patch

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -28,27 +28,6 @@ index 65f0f80..508b290 100644
2828
+ </plugin>
2929
+ <plugin>
3030
+ <groupId>org.apache.maven.plugins</groupId>
31-
+ <artifactId>maven-assembly-plugin</artifactId>
32-
+ <version>3.3.0</version>
33-
+
34-
+ <configuration>
35-
+ <descriptorRefs>
36-
+ <descriptorRef>jar-with-dependencies</descriptorRef>
37-
+ </descriptorRefs>
38-
+ </configuration>
39-
+
40-
+ <executions>
41-
+ <execution>
42-
+ <id>make-assembly</id>
43-
+ <phase>package</phase>
44-
+ <goals>
45-
+ <goal>single</goal>
46-
+ </goals>
47-
+ </execution>
48-
+ </executions>
49-
+ </plugin>
50-
+ <plugin>
51-
+ <groupId>org.apache.maven.plugins</groupId>
5231
+ <artifactId>maven-jar-plugin</artifactId>
5332
+ <version>3.2.0</version>
5433
+ <executions>

src/main/java/gr/gousiosg/javacg/stat/support/RepoTool.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -152,13 +152,7 @@ public static Optional<RepoTool> obtainTool(String folderName){
152152
private void moveJars() throws IOException {
153153
Path sourceDir = Paths.get(System.getProperty("user.dir"), getProjectDir(), "target");
154154
Path targetDir = Paths.get(System.getProperty("user.dir"), "artifacts", "output");
155-
156-
// @todo may want to be able to override this in the yaml file on a project basis...
157-
String depGlob = this.name + "*-with-dependencies.jar";
158-
String testGlob = this.name + "*-tests.jar";
159-
160-
moveFiles(sourceDir, targetDir, depGlob);
161-
moveFiles(sourceDir, targetDir, testGlob);
155+
moveFiles(sourceDir, targetDir, "*.jar");
162156
}
163157

164158
private void moveFiles(Path sourceDir, Path targetDir, String glob) throws IOException {

0 commit comments

Comments
 (0)