Skip to content

Commit

Permalink
Fix the bin script pointing to a wrong name of the dist jar.
Browse files Browse the repository at this point in the history
  • Loading branch information
Ondrej Zizka committed Dec 2, 2024
1 parent 82d6b25 commit d458d20
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ Download & run
```

Requires [Java 11](https://adoptopenjdk.net/releases.html) or later.
If you run `java -jar csv-cruncher-single.jar` directly, do not add `crunch`.
If you run `java -jar csv-cruncher-fatjar.jar` directly, do not add `crunch`.
You might need to make the `crunch` script executable depending on your OS (until issue #): `chmod +x crunch`


Expand Down
2 changes: 1 addition & 1 deletion docs/RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ How to release
5) Go to GitHub and [create a new release](https://github.com/OndraZizka/csv-cruncher/releases/new):
* Name is like `<version> <main new feature>`
* Description describes what's new, and contains the usage example
* Attach the files `csv-cruncher-<version>-dist.jar` and `...-single.jar`
* Attach the files `csv-cruncher-<version>-dist.jar` and `...-fatjar.jar`
3 changes: 2 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,11 @@
<groupId>org.apache.maven.plugins</groupId><artifactId>maven-assembly-plugin</artifactId><version>3.7.1</version>
<executions>

<!-- Disabled, because it does not include resources. Possibly a bug? -->
<execution>
<id>single-DISABLED</id> <!-- Was before MJAR-233: assembleDistJar -->
<goals><goal>single</goal></goals>
<phase>none</phase> <!-- Disabled, trying a custom descriptor -->
<phase>none</phase>
<configuration>
<finalName>${project.artifactId}-${project.version}-single</finalName>
<archive>
Expand Down
2 changes: 1 addition & 1 deletion src/main/assembly-dist.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<directory>${project.build.directory}</directory>
<outputDirectory>.</outputDirectory>
<includes>
<include>*-single.jar</include>
<include>*-fatjar.jar</include>
</includes>
</fileSet>
<fileSet>
Expand Down
2 changes: 1 addition & 1 deletion src/scripts/crunch
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ SCRIPT_DIR=$(dirname $(realpath $0))

#echo "In script PWD:"`pwd`;
#echo "TOOL_HOME: $TOOL_HOME";
java -Djava.util.logging.config.file="$SCRIPT_DIR/jul.properties" -jar "$SCRIPT_DIR"/csv-cruncher-*-single.jar "$@"
java -Djava.util.logging.config.file="$SCRIPT_DIR/jul.properties" -jar "$SCRIPT_DIR"/csv-cruncher-*-fatjar.jar "$@"


## Cleanup
Expand Down

0 comments on commit d458d20

Please sign in to comment.