diff --git a/.gitignore b/.gitignore index bd95645..868dd2c 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,5 @@ target/ .mvn/ temp/ *.tgz +eodocs.html +mvnw/dependency-reduced-pom.xml \ No newline at end of file diff --git a/mvnw/pom.xml b/mvnw/pom.xml index f1d4924..bd0c2c0 100644 --- a/mvnw/pom.xml +++ b/mvnw/pom.xml @@ -25,6 +25,7 @@ SOFTWARE. org.eolang eoc 0.0.0 + jar 0.6.26 UTF-8 @@ -43,11 +44,13 @@ SOFTWARE. org.junit.jupiter junit-jupiter-api 5.11.4 + test org.junit.jupiter junit-jupiter-engine 5.11.4 + test @@ -80,6 +83,7 @@ SOFTWARE. eo-maven-plugin ${eo.version} + false **/.eoc/** ${eo.sodgIncludes} ${eo.sodgExcludes} @@ -110,11 +114,16 @@ SOFTWARE. + true org.eolang.Main + + maven-shade-plugin + 3.6.0 + maven-surefire-plugin 3.5.2 diff --git a/src/commands/java/link.js b/src/commands/java/link.js index 20c31c6..be620cc 100644 --- a/src/commands/java/link.js +++ b/src/commands/java/link.js @@ -33,7 +33,7 @@ const path = require('path'); */ module.exports = function(opts) { const jar = path.resolve(opts.target, 'eoc.jar'); - return mvnw(['jar:jar'].concat(flags(opts)), opts.target, opts.batch).then((r) => { + return mvnw(['jar:jar', 'shade:shade'].concat(flags(opts)), opts.target, opts.batch).then((r) => { console.info('Executable JAR created at %s', rel(jar)); return r; }); diff --git a/test/commands/test_link.js b/test/commands/test_link.js index 57907bb..d03c44e 100644 --- a/test/commands/test_link.js +++ b/test/commands/test_link.js @@ -71,7 +71,6 @@ describe('link', function() { 'target/generated-sources/EOfoo/EObar/EOlink.java', 'target/generated-sources/EOorg/EOeolang/EObytes.java', 'target/classes/EOfoo/EObar/EOlink.class', - 'target/classes/org/eolang/Phi.class', 'target/classes/EOorg/EOeolang/EOnumber.class', 'target/eoc.jar', ]