diff --git a/parchment b/parchment index ab3e50c..6b0d5c4 100755 --- a/parchment +++ b/parchment @@ -130,7 +130,7 @@ case "$1" in ;; "setup") if [[ -f ~/.bashrc ]] ; then - NAME="ec" + NAME="parchment" if [[ ! -z "${2+x}" ]] ; then NAME="$2" fi diff --git a/patches/api/0004-Build-sources-and-javadocs.patch b/patches/api/0004-Build-sources-and-javadocs.patch deleted file mode 100644 index 27e5042..0000000 --- a/patches/api/0004-Build-sources-and-javadocs.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: lexikiq -Date: Tue, 4 May 2021 11:50:43 -0400 -Subject: [PATCH] Build sources and javadocs - - -diff --git a/pom.xml b/pom.xml -index 8a45c77963d3cd35d2cfa4a3af15c0e27bbbf165..1edfbf2c99a1815f9f7aabbbcf11e45eceaea2e5 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -333,6 +333,37 @@ - - - -+ -+ -+ org.apache.maven.plugins -+ maven-source-plugin -+ 3.2.0 -+ -+ -+ attach-sources -+ -+ jar -+ -+ -+ -+ -+ -+ org.apache.maven.plugins -+ maven-javadoc-plugin -+ 3.2.0 -+ -+ -+ attach-javadocs -+ -+ jar -+ -+ -+ -+ -+ ${java.home}/bin/javadoc -+ -+ -+ - - - diff --git a/patches/api/0004-Update-to-Java-15-and-build-sources.patch b/patches/api/0004-Update-to-Java-15-and-build-sources.patch new file mode 100644 index 0000000..f7f44d5 --- /dev/null +++ b/patches/api/0004-Update-to-Java-15-and-build-sources.patch @@ -0,0 +1,73 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: lexikiq +Date: Sun, 9 May 2021 16:42:00 -0400 +Subject: [PATCH] Update to Java 15 and build sources + + +diff --git a/pom.xml b/pom.xml +index 8a45c77963d3cd35d2cfa4a3af15c0e27bbbf165..ab9e63c6db20378151fe6599fa4b5066417c16ae 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -19,8 +19,10 @@ + + + +- 1.8 +- 1.8 ++ ++ 15 ++ 15 ++ + UTF-8 + 4.7.0 + +@@ -259,25 +261,37 @@ + + + ++ ++ ++ org.apache.maven.plugins ++ maven-source-plugin ++ 3.2.0 ++ ++ ++ attach-sources ++ ++ jar ++ ++ ++ ++ + + org.apache.maven.plugins + maven-javadoc-plugin + 3.2.0 ++ ++ ++ attach-javadocs ++ ++ jar ++ ++ ++ + +- +- https://guava.dev/releases/21.0/api/docs/ +- https://javadoc.io/doc/org.yaml/snakeyaml/1.27/ +- https://javadoc.io/doc/org.jetbrains/annotations-java5/20.1.0/ +- https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/ +- +- https://jd.adventure.kyori.net/api/${adventure.version}/ +- https://jd.adventure.kyori.net/text-serializer-gson/${adventure.version}/ +- https://jd.adventure.kyori.net/text-serializer-legacy/${adventure.version}/ +- https://jd.adventure.kyori.net/text-serializer-plain/${adventure.version}/ +- +- ++ ${java.home}/bin/javadoc + + ++ + + + diff --git a/patches/api/0005-Bump-to-Java-15.patch b/patches/api/0005-Bump-to-Java-15.patch deleted file mode 100644 index 1ceef33..0000000 --- a/patches/api/0005-Bump-to-Java-15.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: lexikiq -Date: Tue, 4 May 2021 13:02:02 -0400 -Subject: [PATCH] Bump to Java 15 - - -diff --git a/pom.xml b/pom.xml -index 1edfbf2c99a1815f9f7aabbbcf11e45eceaea2e5..631a85808710691b96a61be064aaecc60e5974d8 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -19,8 +19,8 @@ - - - -- 1.8 -- 1.8 -+ 15 -+ 15 - UTF-8 - 4.7.0 -