diff --git a/README.md b/README.md
index 5d1d7c7dd..793a66c8b 100644
--- a/README.md
+++ b/README.md
@@ -87,7 +87,7 @@ Implementation`.
* [sherter/google-java-format-gradle-plugin](https://github.com/sherter/google-java-format-gradle-plugin)
* Apache Maven plugins
* [spotless](https://github.com/diffplug/spotless/tree/main/plugin-maven#google-java-format)
- * [coveo/fmt-maven-plugin](https://github.com/coveo/fmt-maven-plugin)
+ * [spotify/fmt-maven-plugin](https://github.com/spotify/fmt-maven-plugin)
* [talios/googleformatter-maven-plugin](https://github.com/talios/googleformatter-maven-plugin)
* [Cosium/maven-git-code-format](https://github.com/Cosium/maven-git-code-format):
A maven plugin that automatically deploys google-java-format as a
diff --git a/core/pom.xml b/core/pom.xml
index 1d4715957..61fbd02aa 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -22,7 +22,7 @@
com.google.googlejavaformat
google-java-format-parent
- HEAD-SNAPSHOT
+ 1.15.0
google-java-format
diff --git a/idea_plugin/build.gradle b/idea_plugin/build.gradle
index d9f769d47..1a8bca26c 100644
--- a/idea_plugin/build.gradle
+++ b/idea_plugin/build.gradle
@@ -15,7 +15,7 @@
*/
plugins {
- id "org.jetbrains.intellij" version "1.3.1"
+ id "org.jetbrains.intellij" version "1.4.0"
}
repositories {
@@ -23,7 +23,7 @@ repositories {
}
ext {
- googleJavaFormatVersion = "1.13.0"
+ googleJavaFormatVersion = "1.14.0"
}
apply plugin: "org.jetbrains.intellij"
diff --git a/idea_plugin/resources/META-INF/plugin.xml b/idea_plugin/resources/META-INF/plugin.xml
index f10cde5a3..09360c15d 100644
--- a/idea_plugin/resources/META-INF/plugin.xml
+++ b/idea_plugin/resources/META-INF/plugin.xml
@@ -29,6 +29,8 @@
+ 1.14.0.0
+ Updated to use google-java-format 1.14.
1.13.0.0
Updated to use google-java-format 1.13.
1.12.0.0
diff --git a/pom.xml b/pom.xml
index c7f685698..7ea998fcd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
com.google.googlejavaformat
google-java-format-parent
pom
- HEAD-SNAPSHOT
+ 1.15.0
core
@@ -198,13 +198,13 @@
-XDcompilePolicy=simple
-Xplugin:ErrorProne
+ --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
+ --add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
--add-exports=jdk.compiler/com.sun.tools.javac.main=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
- --add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
- --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
@@ -233,6 +233,19 @@
com.google.googlejavaformat.java.Main
+
+ jdk.compiler/com.sun.tools.javac.api jdk.compiler/com.sun.tools.javac.file jdk.compiler/com.sun.tools.javac.main jdk.compiler/com.sun.tools.javac.model jdk.compiler/com.sun.tools.javac.parser jdk.compiler/com.sun.tools.javac.processing jdk.compiler/com.sun.tools.javac.tree jdk.compiler/com.sun.tools.javac.util
+ jdk.compiler/com.sun.tools.javac.code jdk.compiler/com.sun.tools.javac.comp
+
diff --git a/scripts/mvn-deploy.sh b/scripts/mvn-deploy.sh
deleted file mode 100755
index 0133e3612..000000000
--- a/scripts/mvn-deploy.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-# Copyright 2020 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-if [ $# -lt 1 ]; then
- echo "usage $0 [ ...]"
- exit 1;
-fi
-key=${1}
-shift
-params=${@}
-
-#validate key
-keystatus=$(gpg --list-keys | grep ${key} | awk '{print $1}')
-if [ "${keystatus}" != "pub" ]; then
- echo "Could not find public key with label ${key}"
- echo -n "Available keys from: "
- gpg --list-keys | grep --invert-match '^sub'
-
- exit 1
-fi
-
-mvn ${params} -P sonatype-oss-release -Dgpg.keyname=${key} deploy