re-add lisense

4 files changed, 19 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index aa800d532e33..0c241c5057fc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,16 @@
 pkgbase = google-java-format
 	pkgdesc = Reformats Java source code to comply with Google Java Style
 	pkgver = 1.11.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/google/google-java-format
 	arch = any
 	license = Apache
 	depends = java-runtime
 	source = https://github.com/google/google-java-format/releases/download/v1.11.0/google-java-format-1.11.0-all-deps.jar
 	source = google-java-format
+	source = https://raw.githubusercontent.com/google/google-java-format/master/LICENSE
 	b2sums = 7050e9a2a13fc38f748c28a90b77492f439dcf9543678d59e2f7d71bd35cf15a43db9487b60661b5f3c424f21df175b954b8860a24176e708540b10f6c81cd36
-	b2sums = 485e66103e4cea678b009d98600a97bb896ff6c32b390b69cd643296433c63c871b387aebac4a795c478282cb6ac3ced49d05f8ecc5f08e8cae170930891bf0f
+	b2sums = d319ec34e96625bed496ba998e8408eaf49683a4312e37568abc39236c527b4daca21c3361e109964596c2e9387d5d69f26a7b59eb6ea4cd999c2be3bfcf3642
+	b2sums = e2f774f14d1d661b483d40d6261bb8b56962c182da6846987c6dea37d099bcb381d2bea2b2de6ba6ead4eb2e3520676540a85600b1fbf4ba39157bd1c24c82a2
 
 pkgname = google-java-format
diff --git a/.gitignore b/.gitignore
index d4265890bf48..d1e23b6287ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,7 @@
 !PKGBUILD
 !.SRCINFO
 !.gitignore
+<<<<<<< HEAD
 !google-java-format
+=======
+>>>>>>> e03d6187dcf89eb70262df7c3670b533ad68fd3f
diff --git a/PKGBUILD b/PKGBUILD
index 60e8965954ac..e2ccce49a63d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=google-java-format
 pkgver=1.11.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Reformats Java source code to comply with Google Java Style'
 url='https://github.com/google/google-java-format'
 arch=('any')
@@ -14,13 +14,16 @@ depends=('java-runtime')
 source=(
   "https://github.com/google/google-java-format/releases/download/v$pkgver/$pkgname-$pkgver-all-deps.jar"
   'google-java-format'
+  'https://raw.githubusercontent.com/google/google-java-format/master/LICENSE'
 )
 b2sums=(
   '7050e9a2a13fc38f748c28a90b77492f439dcf9543678d59e2f7d71bd35cf15a43db9487b60661b5f3c424f21df175b954b8860a24176e708540b10f6c81cd36'
-  '485e66103e4cea678b009d98600a97bb896ff6c32b390b69cd643296433c63c871b387aebac4a795c478282cb6ac3ced49d05f8ecc5f08e8cae170930891bf0f'
+  'd319ec34e96625bed496ba998e8408eaf49683a4312e37568abc39236c527b4daca21c3361e109964596c2e9387d5d69f26a7b59eb6ea4cd999c2be3bfcf3642'
+  'e2f774f14d1d661b483d40d6261bb8b56962c182da6846987c6dea37d099bcb381d2bea2b2de6ba6ead4eb2e3520676540a85600b1fbf4ba39157bd1c24c82a2'
 )
 
 package() {
   install -Dm755 "$srcdir/$pkgname-$pkgver-all-deps.jar" "$pkgdir/usr/share/java/$pkgname/$pkgname.jar"
   install -Dm755 "$srcdir/google-java-format" "$pkgdir/usr/bin/google-java-format"
+  install -Dm644 LICENSE* -t "$pkgdir/usr/share/licenses/$pkgname"
 }
diff --git a/google-java-format b/google-java-format
index 37bf78ce434f..5e45d0a8fd0f 100755
--- a/google-java-format
+++ b/google-java-format
@@ -1,2 +1,8 @@
 #!/bin/sh
-exec /usr/bin/java -jar '/usr/share/java/google-java-format/google-java-format.jar' "$@"
+exec java \
+  --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
+  --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
+  --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
+  --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
+  --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \
+  -jar '/usr/share/java/google-java-format/google-java-format.jar' "$@"