| 1 |
commit: 1a0861fce9d1eed817114871b073edf1f527e21d |
| 2 |
Author: zongyu <zzy2529420793 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Aug 1 09:16:04 2020 +0000 |
| 4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 1 15:25:32 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=1a0861fc |
| 7 |
|
| 8 |
update usage.txt, fix Copyright statement of Gentoo |
| 9 |
|
| 10 |
Signed-off-by: zongyu <zzy2529420793 <AT> gmail.com> |
| 11 |
|
| 12 |
src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java | 2 +- |
| 13 |
src/main/resources/usage.txt | 5 ++++- |
| 14 |
2 files changed, 5 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java b/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java |
| 17 |
index 3b5c3d6..8fceec6 100644 |
| 18 |
--- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java |
| 19 |
+++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java |
| 20 |
@@ -598,7 +598,7 @@ public class MavenEbuilder { |
| 21 |
* @param writer ebuild writer |
| 22 |
*/ |
| 23 |
private void writeHeader(final PrintWriter writer) { |
| 24 |
- writer.printf("# Copyright 1999-%d Gentoo Foundation\n", |
| 25 |
+ writer.printf("# Copyright 1999-%d Gentoo Authors\n", |
| 26 |
LocalDate.now().getYear()); |
| 27 |
writer.println("# Distributed under the terms of the GNU General " |
| 28 |
+ "Public License v2"); |
| 29 |
|
| 30 |
diff --git a/src/main/resources/usage.txt b/src/main/resources/usage.txt |
| 31 |
index 725643c..78ab745 100644 |
| 32 |
--- a/src/main/resources/usage.txt |
| 33 |
+++ b/src/main/resources/usage.txt |
| 34 |
@@ -2,13 +2,16 @@ Usage: java-ebuilder <args> |
| 35 |
|
| 36 |
Generating ebuild: |
| 37 |
--download-uri|-u <uri> uri that goes to SRC_URI |
| 38 |
+--binjar-uri <uri> uri that goes to binary jar |
| 39 |
--dump-projects|-d outputs information about parsed projects |
| 40 |
(useful for debugging) |
| 41 |
--ebuild|-e <file> path to ebuild that should be created |
| 42 |
--force-min-java-version <version> force minimum JDK/JRE version in dependencies |
| 43 |
+--from-maven-central make java-ebuilder inherit java-pkg-maven.eclass |
| 44 |
--generate-ebuild|-g generates ebuild from pom.xml |
| 45 |
--keywords|-k <keywords> arch keywords |
| 46 |
---license|-l <license> license name |
| 47 |
+--license|-l <license> license name, if it is not specified, |
| 48 |
+ java-ebuilder will determine LICENSE from pom.xml |
| 49 |
--pom|-p <file> path to pom.xml that should be parsed, |
| 50 |
the path must be relative to workdir (can be |
| 51 |
specified multiple times) |
Archives