From 6c54c41a87fa1cc6b72c0751ecc146c23ee2d8f7 Mon Sep 17 00:00:00 2001
From: Kyle Moore <github@kylemoore.com>
Date: Mon, 22 Mar 2021 22:23:54 -0700
Subject: [PATCH 1/4] Bump Gradle wrapper to 5.4

---
 build_script/integTest.gradle            |   1 +
 gradle-plugins/build.gradle              |   1 +
 gradle/wrapper/gradle-wrapper.jar        | Bin 55190 -> 55616 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 gradlew                                  |  18 +++++++++++++++++-
 gradlew.bat                              |  18 +++++++++++++++++-
 6 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/build_script/integTest.gradle b/build_script/integTest.gradle
index 6d603cbeec..3b9fe2509f 100644
--- a/build_script/integTest.gradle
+++ b/build_script/integTest.gradle
@@ -22,6 +22,7 @@ sourceSets {
 }
 
 dependencies {
+  integTestImplementation gradleTestKit()
   integTestImplementation externalDependency.spock
 }
 
diff --git a/gradle-plugins/build.gradle b/gradle-plugins/build.gradle
index 135f7e84b7..a74a4788c0 100644
--- a/gradle-plugins/build.gradle
+++ b/gradle-plugins/build.gradle
@@ -43,6 +43,7 @@ tasks.pluginUnderTestMetadata {
 }
 
 integTest {
+  classpath += files(pluginUnderTestMetadata.outputDirectory)
   dependsOn configurations.dataTemplateForTesting, configurations.pegasusPluginForTesting
   systemProperty 'integTest.dataTemplateCompileDependencies', "'${configurations.dataTemplateForTesting.join("', '")}'"
   systemProperty 'integTest.pegasusPluginDependencies', "'${configurations.pegasusPluginForTesting.join("', '")}'"
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 87b738cbd051603d91cc39de6cb000dd98fe6b02..5c2d1cf016b3885f6930543d57b744ea8c220a1a 100644
GIT binary patch
delta 3320
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
R^3$e5zsN`FCc2S<;XjD90!#n^

delta 2991
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
Pbkbqm3=F=5f2aQeBaWHL

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 44e7c4d1d7..5f1b1201a7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index af6708ff22..b0d6d0ab5d 100755
--- a/gradlew
+++ b/gradlew
@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# 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.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m"'
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
diff --git a/gradlew.bat b/gradlew.bat
index 0f8d5937c4..15e1ee37a7 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      http://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m"
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

From ca2f6e108adaadaf7d642367b96c72b2f3b57fa6 Mon Sep 17 00:00:00 2001
From: Kyle Moore <github@kylemoore.com>
Date: Mon, 22 Mar 2021 22:31:42 -0700
Subject: [PATCH 2/4] Fix #561 - cleanup task input/output issues

 - Consumers of the pegasus plugin must use Gradle 5.4+
   - `@ReplacedBy` annotation requires Gradle 5.4+
   - `o.g.w.InputChanges` API requires Gradle 5.4+
---
 .../pegasus/gradle/PegasusPlugin.java         | 11 +++
 .../gradle/tasks/ChangedFileReportTask.java   | 73 ++++++++++++-------
 .../pegasus/gradle/tasks/CheckIdlTask.java    |  7 ++
 .../gradle/tasks/CheckRestModelTask.java      |  9 +++
 .../gradle/tasks/CheckSnapshotTask.java       | 10 +++
 .../tasks/GenerateDataTemplateTask.java       | 15 +++-
 .../gradle/tasks/GenerateRestClientTask.java  | 20 ++++-
 .../gradle/tasks/GenerateRestModelTask.java   |  1 -
 8 files changed, 115 insertions(+), 31 deletions(-)

diff --git a/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/PegasusPlugin.java b/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/PegasusPlugin.java
index 9e9f2be94b..5a15147c2b 100644
--- a/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/PegasusPlugin.java
+++ b/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/PegasusPlugin.java
@@ -76,6 +76,7 @@
 import org.gradle.plugins.ide.eclipse.model.EclipseModel;
 import org.gradle.plugins.ide.idea.IdeaPlugin;
 import org.gradle.plugins.ide.idea.model.IdeaModule;
+import org.gradle.util.GradleVersion;
 
 
 /**
@@ -633,6 +634,11 @@ public void setJavadocJarTask(Task javadocJarTask)
   @Override
   public void apply(Project project)
   {
+    if (!isAtLeastGradle54())
+    {
+      throw new GradleException("The pegasus plugin requires Gradle 5.4 or higher; please upgrade.");
+    }
+
     project.getPlugins().apply(JavaPlugin.class);
     project.getPlugins().apply(IdeaPlugin.class);
     project.getPlugins().apply(EclipsePlugin.class);
@@ -1407,6 +1413,7 @@ protected void configureRestModelGeneration(Project project, SourceSet sourceSet
       changedFileReportTask.setIdlFiles(SharedFileUtils.getSuffixedFiles(project, apiIdlDir, IDL_FILE_SUFFIX));
       changedFileReportTask.setSnapshotFiles(SharedFileUtils.getSuffixedFiles(project, apiSnapshotDir,
           SNAPSHOT_FILE_SUFFIX));
+      changedFileReportTask.getOutputFile().set(project.getLayout().getBuildDirectory().file("changedFilesReport.txt"));
       changedFileReportTask.mustRunAfter(publishRestliSnapshotTask, publishRestliIdlTask);
       changedFileReportTask.doLast(new CacheableAction<>(t ->
       {
@@ -2224,4 +2231,8 @@ private Task publishPegasusSchemaSnapshot(Project project, SourceSet sourceSet,
           task.onlyIf(t -> !SharedFileUtils.getSuffixedFiles(project, inputDir, PDL_FILE_SUFFIX).isEmpty());
         });
   }
+  protected static boolean isAtLeastGradle54() {
+    return GradleVersion.current().getBaseVersion().compareTo(GradleVersion.version("5.4")) >= 0;
+  }
+
 }
diff --git a/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/ChangedFileReportTask.java b/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/ChangedFileReportTask.java
index a7dd65f606..d3c0a55109 100644
--- a/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/ChangedFileReportTask.java
+++ b/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/ChangedFileReportTask.java
@@ -5,14 +5,18 @@
 import java.util.HashSet;
 import java.util.Set;
 import java.util.stream.Collectors;
+
+import com.linkedin.pegasus.gradle.IOUtil;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.file.FileCollection;
-import org.gradle.api.specs.Specs;
+import org.gradle.api.file.FileType;
+import org.gradle.api.file.RegularFileProperty;
 import org.gradle.api.tasks.InputFiles;
 import org.gradle.api.tasks.Internal;
+import org.gradle.api.tasks.OutputFile;
 import org.gradle.api.tasks.SkipWhenEmpty;
 import org.gradle.api.tasks.TaskAction;
-import org.gradle.api.tasks.incremental.IncrementalTaskInputs;
+import org.gradle.work.InputChanges;
 
 
 public class ChangedFileReportTask extends DefaultTask
@@ -21,15 +25,10 @@ public class ChangedFileReportTask extends DefaultTask
 
   private FileCollection _idlFiles = getProject().files();
   private FileCollection _snapshotFiles = getProject().files();
-
-  public ChangedFileReportTask()
-  {
-    //with Gradle 6.0, Declaring an incremental task without outputs is not allowed.
-    getOutputs().upToDateWhen(Specs.satisfyNone());
-  }
+  private RegularFileProperty _outputFile = getProject().getObjects().fileProperty();
 
   @TaskAction
-  public void checkFilesForChanges(IncrementalTaskInputs inputs)
+  public void checkFilesForChanges(InputChanges inputs)
   {
     getLogger().lifecycle("Checking idl and snapshot files for changes...");
     getLogger().info("idlFiles: " + _idlFiles.getAsPath());
@@ -41,46 +40,59 @@ public void checkFilesForChanges(IncrementalTaskInputs inputs)
 
     if (inputs.isIncremental())
     {
-      inputs.outOfDate(inputFileDetails -> {
-        if (inputFileDetails.isAdded())
+      inputs.getFileChanges(getSnapshotFiles()).forEach(change -> {
+        if (change.getFileType() != FileType.DIRECTORY)
         {
-          filesAdded.add(inputFileDetails.getFile().getAbsolutePath());
-        }
-
-        if (inputFileDetails.isRemoved())
-        {
-          filesRemoved.add(inputFileDetails.getFile().getAbsolutePath());
-        }
-
-        if (inputFileDetails.isModified())
-        {
-          filesChanged.add(inputFileDetails.getFile().getAbsolutePath());
+          String path = change.getFile().getAbsolutePath();
+          switch (change.getChangeType())
+          {
+            case ADDED:
+              filesAdded.add(path);
+              break;
+            case REMOVED:
+              filesRemoved.add(path);
+              break;
+            case MODIFIED:
+              filesChanged.add(path);
+              break;
+          }
         }
       });
 
-      inputs.removed(inputFileDetails -> filesRemoved.add(inputFileDetails.getFile().getAbsolutePath()));
+      StringBuilder sb = new StringBuilder();
 
       if (!filesRemoved.isEmpty())
       {
         String files = joinByComma(filesRemoved);
         _needCheckinFiles.add(files);
-        getLogger().lifecycle(
-            "The following files have been removed, be sure to remove them from source control: {}", files);
+        String removedFilesMsg = String.format("The following files have been removed, " +
+                "be sure to remove them from source control: %s\n", files);
+        sb.append(removedFilesMsg);
       }
 
       if (!filesAdded.isEmpty())
       {
         String files = joinByComma(filesAdded);
         _needCheckinFiles.add(files);
-        getLogger().lifecycle("The following files have been added, be sure to add them to source control: {}", files);
+        String addedFilesMsg = String.format("The following files have been added, " +
+                "be sure to add them to source control: %s\n", files);
+        sb.append(addedFilesMsg);
       }
 
       if (!filesChanged.isEmpty())
       {
         String files = joinByComma(filesChanged);
         _needCheckinFiles.add(files);
-        getLogger().lifecycle(
-            "The following files have been changed, be sure to commit the changes to source control: {}", files);
+        String modifiedFilesMsg = String.format("The following files have been changed, " +
+                "be sure to commit the changes to source control: %s\n", files);
+        sb.append(modifiedFilesMsg);
+      }
+
+      String output = sb.toString();
+      if (!output.isEmpty())
+      {
+        getLogger().lifecycle(output);
+        IOUtil.writeText(getOutputFile().get().getAsFile(), output);
       }
     }
   }
@@ -119,4 +131,9 @@ public Collection<String> getNeedCheckinFiles()
   {
     return _needCheckinFiles;
   }
+
+  @OutputFile
+  public RegularFileProperty getOutputFile() {
+    return _outputFile;
+  }
 }
diff --git a/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/CheckIdlTask.java b/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/CheckIdlTask.java
index 185c1dcf59..8baa28065e 100644
--- a/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/CheckIdlTask.java
+++ b/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/CheckIdlTask.java
@@ -17,6 +17,7 @@
 import org.gradle.api.DefaultTask;
 import org.gradle.api.GradleException;
 import org.gradle.api.file.FileCollection;
+import org.gradle.api.model.ReplacedBy;
 import org.gradle.api.tasks.CacheableTask;
 import org.gradle.api.tasks.Classpath;
 import org.gradle.api.tasks.Input;
@@ -175,6 +176,7 @@ public void setSummaryTarget(File summaryTarget)
    * @deprecated use {@link #isModelCompatible()} instead
    */
   @Deprecated
+  @ReplacedBy("modelCompatible")
   public boolean getIsModelCompatible()
   {
     return isModelCompatible();
@@ -189,6 +191,7 @@ public boolean getIsModelCompatible()
    * @deprecated use {@link #isModelCompatible()} instead
    */
   @Deprecated
+  @ReplacedBy("modelCompatible")
   public boolean isIsModelCompatible()
   {
     return isModelCompatible();
@@ -209,6 +212,7 @@ public boolean isModelCompatible()
    * @deprecated use {@link #isRestSpecCompatible()} instead
    */
   @Deprecated
+  @ReplacedBy("restSpecCompatible")
   public boolean getIsRestSpecCompatible()
   {
     return isRestSpecCompatible();
@@ -223,6 +227,7 @@ public boolean getIsRestSpecCompatible()
    * @deprecated use {@link #isRestSpecCompatible()} instead
    */
   @Deprecated
+  @ReplacedBy("restSpecCompatible")
   public boolean isIsRestSpecCompatible()
   {
     return isRestSpecCompatible();
@@ -243,6 +248,7 @@ public boolean isRestSpecCompatible()
    * @deprecated use {@link #isEquivalent()} instead
    */
   @Deprecated
+  @ReplacedBy("equivalent")
   public boolean getIsEquivalent()
   {
     return _equivalent;
@@ -257,6 +263,7 @@ public boolean getIsEquivalent()
    * @deprecated use {@link #isEquivalent()} instead
    */
   @Deprecated
+  @ReplacedBy("equivalent")
   public boolean isIsEquivalent()
   {
     return _equivalent;
diff --git a/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/CheckRestModelTask.java b/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/CheckRestModelTask.java
index fff58ababe..8e800f9e22 100644
--- a/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/CheckRestModelTask.java
+++ b/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/CheckRestModelTask.java
@@ -29,6 +29,7 @@
 import org.gradle.api.DefaultTask;
 import org.gradle.api.GradleException;
 import org.gradle.api.file.FileCollection;
+import org.gradle.api.model.ReplacedBy;
 import org.gradle.api.tasks.CacheableTask;
 import org.gradle.api.tasks.Classpath;
 import org.gradle.api.tasks.Input;
@@ -210,6 +211,7 @@ public void setSummaryTarget(File summaryTarget)
    * @deprecated use {@link #isModelCompatible()} instead
    */
   @Deprecated
+  @ReplacedBy("modelCompatible")
   public boolean getIsModelCompatible()
   {
     return isModelCompatible();
@@ -224,6 +226,7 @@ public boolean getIsModelCompatible()
    * @deprecated use {@link #isModelCompatible()} instead
    */
   @Deprecated
+  @ReplacedBy("modelCompatible")
   public boolean isIsModelCompatible()
   {
     return isModelCompatible();
@@ -244,6 +247,7 @@ public boolean isModelCompatible()
    * @deprecated use {@link #isRestSpecCompatible()} instead
    */
   @Deprecated
+  @ReplacedBy("restSpecCompatible")
   public boolean getIsRestSpecCompatible()
   {
     return isRestSpecCompatible();
@@ -258,6 +262,7 @@ public boolean getIsRestSpecCompatible()
    * @deprecated use {@link #isRestSpecCompatible()} instead
    */
   @Deprecated
+  @ReplacedBy("restSpecCompatible")
   public boolean isIsRestSpecCompatible()
   {
     return isRestSpecCompatible();
@@ -278,6 +283,7 @@ public boolean isRestSpecCompatible()
    * @deprecated use {@link #isEquivalent()} instead
    */
   @Deprecated
+  @ReplacedBy("equivalent")
   public boolean getIsEquivalent()
   {
     return isEquivalent();
@@ -292,6 +298,7 @@ public boolean getIsEquivalent()
    * @deprecated use {@link #isEquivalent()} instead
    */
   @Deprecated
+  @ReplacedBy("equivalent")
   public boolean isIsEquivalent()
   {
     return isEquivalent();
@@ -312,6 +319,7 @@ public boolean isEquivalent()
    * @deprecated use {@link #isRestSpecEquivalent()} instead
    */
   @Deprecated
+  @ReplacedBy("restSpecEquivalent")
   public boolean getIsRestSpecEquivalent()
   {
     return isRestSpecEquivalent();
@@ -326,6 +334,7 @@ public boolean getIsRestSpecEquivalent()
    * @deprecated use {@link #isRestSpecEquivalent()} instead
    */
   @Deprecated
+  @ReplacedBy("restSpecEquivalent")
   public boolean isIsRestSpecEquivalent()
   {
     return isRestSpecEquivalent();
diff --git a/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/CheckSnapshotTask.java b/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/CheckSnapshotTask.java
index f601ef67b3..c61ea77172 100644
--- a/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/CheckSnapshotTask.java
+++ b/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/CheckSnapshotTask.java
@@ -13,6 +13,7 @@
 import org.gradle.api.GradleException;
 import org.gradle.api.Project;
 import org.gradle.api.file.FileCollection;
+import org.gradle.api.model.ReplacedBy;
 import org.gradle.api.tasks.CacheableTask;
 import org.gradle.api.tasks.Classpath;
 import org.gradle.api.tasks.Input;
@@ -105,6 +106,7 @@ public void setCurrentSnapshotFiles(FileCollection currentSnapshotFiles)
   }
 
   @InputDirectory
+  @PathSensitive(PathSensitivity.RELATIVE)
   public File getPreviousSnapshotDirectory()
   {
     return _previousSnapshotDirectory;
@@ -157,6 +159,7 @@ public void setSummaryTarget(File summaryTarget)
    * @deprecated use {@link #isModelCompatible()} instead
    */
   @Deprecated
+  @ReplacedBy("modelCompatible")
   public boolean getIsModelCompatible()
   {
     return isModelCompatible();
@@ -171,6 +174,7 @@ public boolean getIsModelCompatible()
    * @deprecated use {@link #isModelCompatible()} instead
    */
   @Deprecated
+  @ReplacedBy("modelCompatible")
   public boolean isIsModelCompatible()
   {
     return isModelCompatible();
@@ -191,6 +195,7 @@ public boolean isModelCompatible()
    * @deprecated use {@link #isRestSpecCompatible()} instead
    */
   @Deprecated
+  @ReplacedBy("restSpecCompatible")
   public boolean getIsRestSpecCompatible()
   {
     return isRestSpecCompatible();
@@ -205,6 +210,7 @@ public boolean getIsRestSpecCompatible()
    * @deprecated use {@link #isRestSpecCompatible()} instead
    */
   @Deprecated
+  @ReplacedBy("restSpecCompatible")
   public boolean isIsRestSpecCompatible()
   {
     return isRestSpecCompatible();
@@ -225,6 +231,7 @@ public boolean isRestSpecCompatible()
    * @deprecated use {@link #isEquivalent()} instead
    */
   @Deprecated
+  @ReplacedBy("equivalent")
   public boolean getIsEquivalent()
   {
     return isEquivalent();
@@ -239,6 +246,7 @@ public boolean getIsEquivalent()
    * @deprecated use {@link #isEquivalent()} instead
    */
   @Deprecated
+  @ReplacedBy("equivalent")
   public boolean isIsEquivalent()
   {
     return isEquivalent();
@@ -259,6 +267,7 @@ public boolean isEquivalent()
    * @deprecated use {@link #isRestSpecEquivalent()} instead
    */
   @Deprecated
+  @ReplacedBy("restSpecEquivalent")
   public boolean getIsRestSpecEquivalent()
   {
     return isRestSpecEquivalent();
@@ -273,6 +282,7 @@ public boolean getIsRestSpecEquivalent()
    * @deprecated use {@link #isRestSpecEquivalent()} instead
    */
   @Deprecated
+  @ReplacedBy("restSpecEquivalent")
   public boolean isIsRestSpecEquivalent()
   {
     return isRestSpecEquivalent();
diff --git a/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/GenerateDataTemplateTask.java b/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/GenerateDataTemplateTask.java
index db4aeab750..7922bc4437 100644
--- a/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/GenerateDataTemplateTask.java
+++ b/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/GenerateDataTemplateTask.java
@@ -126,9 +126,22 @@ public void setEnableArgFile(boolean enable)
     _enableArgFile = enable;
   }
 
+  /**
+   * This method is kept for backwards compatibility.
+   * <p>
+   * This non-property method was exposed.  Property methods should begin with is or get.
+   *
+   * @deprecated use {@link #isGenerateLowercasePath()} instead
+   */
+  @Deprecated
+  public Boolean generateLowercasePath()
+  {
+    return isGenerateLowercasePath();
+  }
+
   @Optional
   @Input
-  public Boolean generateLowercasePath()
+  public Boolean isGenerateLowercasePath()
   {
     return _generateLowercasePath;
   }
diff --git a/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/GenerateRestClientTask.java b/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/GenerateRestClientTask.java
index 557c631f91..94046eab59 100644
--- a/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/GenerateRestClientTask.java
+++ b/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/GenerateRestClientTask.java
@@ -15,6 +15,7 @@
 import org.gradle.api.DefaultTask;
 import org.gradle.api.GradleException;
 import org.gradle.api.file.FileCollection;
+import org.gradle.api.model.ReplacedBy;
 import org.gradle.api.tasks.CacheableTask;
 import org.gradle.api.tasks.Classpath;
 import org.gradle.api.tasks.Input;
@@ -290,9 +291,22 @@ public void setEnableArgFile(boolean enable)
     _enableArgFile = enable;
   }
 
+  /**
+   * This method is kept for backwards compatibility.
+   * <p>
+   * This non-property method was exposed.  Property methods should begin with is or get.
+   *
+   * @deprecated use {@link #isGenerateLowercasePath()} instead
+   */
+  @Deprecated
+  public Boolean generateLowercasePath()
+  {
+    return isGenerateLowercasePath();
+  }
+
   @Optional
   @Input
-  public Boolean generateLowercasePath()
+  public Boolean isGenerateLowercasePath()
   {
     return _generateLowercasePath;
   }
@@ -322,6 +336,7 @@ public void setDestinationDir(File destinationDir)
    * @deprecated use {@link #isRestli2FormatSuppressed()} instead
    */
   @Deprecated
+  @ReplacedBy("restli2FormatSuppressed")
   public boolean getIsRestli2FormatSuppressed()
   {
     return isRestli2FormatSuppressed();
@@ -336,6 +351,7 @@ public boolean getIsRestli2FormatSuppressed()
    * @deprecated use {@link #isRestli2FormatSuppressed()} instead
    */
   @Deprecated
+  @ReplacedBy("restli2FormatSuppressed")
   public boolean isIsRestli2FormatSuppressed()
   {
     return isRestli2FormatSuppressed();
@@ -397,6 +413,7 @@ public void setGenerateFluentApi(boolean generateFluentApi)
    * @deprecated use {@link #isRestli1BuildersDeprecated()} instead
    */
   @Deprecated
+  @ReplacedBy("restli1BuildersDeprecated")
   public boolean get_isRestli1BuildersDeprecated()
   {
     return isRestli1BuildersDeprecated();
@@ -411,6 +428,7 @@ public boolean get_isRestli1BuildersDeprecated()
    * @deprecated use {@link #isRestli1BuildersDeprecated()} instead
    */
   @Deprecated
+  @ReplacedBy("restli1BuildersDeprecated")
   public boolean is_isRestli1BuildersDeprecated()
   {
     return isRestli1BuildersDeprecated();
diff --git a/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/GenerateRestModelTask.java b/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/GenerateRestModelTask.java
index 154f355863..6e1c0f1117 100644
--- a/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/GenerateRestModelTask.java
+++ b/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/GenerateRestModelTask.java
@@ -163,7 +163,6 @@ public void setResolverPath(FileCollection resolverPath)
   }
 
   @OutputDirectory
-  @PathSensitive(PathSensitivity.NAME_ONLY)
   public File getIdlDestinationDir()
   {
     return _idlDestinationDir;

From b99cd12de3f0ee8d6a6cc5b2ab111402abbf97f6 Mon Sep 17 00:00:00 2001
From: Kyle Moore <github@kylemoore.com>
Date: Thu, 1 Apr 2021 19:16:29 -0700
Subject: [PATCH 3/4] Revert "Bump Gradle wrapper to 5.4"

This reverts commit 6c54c41a87fa1cc6b72c0751ecc146c23ee2d8f7.
---
 build_script/integTest.gradle            |   1 -
 gradle-plugins/build.gradle              |   1 -
 gradle/wrapper/gradle-wrapper.jar        | Bin 55616 -> 55190 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 gradlew                                  |  18 +-----------------
 gradlew.bat                              |  18 +-----------------
 6 files changed, 3 insertions(+), 37 deletions(-)

diff --git a/build_script/integTest.gradle b/build_script/integTest.gradle
index 3b9fe2509f..6d603cbeec 100644
--- a/build_script/integTest.gradle
+++ b/build_script/integTest.gradle
@@ -22,7 +22,6 @@ sourceSets {
 }
 
 dependencies {
-  integTestImplementation gradleTestKit()
   integTestImplementation externalDependency.spock
 }
 
diff --git a/gradle-plugins/build.gradle b/gradle-plugins/build.gradle
index a74a4788c0..135f7e84b7 100644
--- a/gradle-plugins/build.gradle
+++ b/gradle-plugins/build.gradle
@@ -43,7 +43,6 @@ tasks.pluginUnderTestMetadata {
 }
 
 integTest {
-  classpath += files(pluginUnderTestMetadata.outputDirectory)
   dependsOn configurations.dataTemplateForTesting, configurations.pegasusPluginForTesting
   systemProperty 'integTest.dataTemplateCompileDependencies', "'${configurations.dataTemplateForTesting.join("', '")}'"
   systemProperty 'integTest.pegasusPluginDependencies', "'${configurations.pegasusPluginForTesting.join("', '")}'"
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 5c2d1cf016b3885f6930543d57b744ea8c220a1a..87b738cbd051603d91cc39de6cb000dd98fe6b02 100644
GIT binary patch
delta 2991
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
Pbkbqm3=F=5f2aQeBaWHL

delta 3320
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
R^3$e5zsN`FCc2S<;XjD90!#n^

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5f1b1201a7..44e7c4d1d7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index b0d6d0ab5d..af6708ff22 100755
--- a/gradlew
+++ b/gradlew
@@ -1,21 +1,5 @@
 #!/usr/bin/env sh
 
-#
-# Copyright 2015 the original author or authors.
-#
-# 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.
-#
-
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -44,7 +28,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+DEFAULT_JVM_OPTS='"-Xmx64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
diff --git a/gradlew.bat b/gradlew.bat
index 15e1ee37a7..0f8d5937c4 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,19 +1,3 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      http://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -30,7 +14,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+set DEFAULT_JVM_OPTS="-Xmx64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

From c41fd4469a71f5f4380201727fba4863dfdf8448 Mon Sep 17 00:00:00 2001
From: Kyle Moore <github@kylemoore.com>
Date: Thu, 1 Apr 2021 19:39:24 -0700
Subject: [PATCH 4/4] Remove deprecated methods; avoids Gradle version bump
 [skip ci]

---
 .../pegasus/gradle/PegasusPlugin.java         |  10 --
 .../gradle/tasks/ChangedFileReportTask.java   |  35 +++--
 .../pegasus/gradle/tasks/CheckIdlTask.java    |  91 -------------
 .../gradle/tasks/CheckRestModelTask.java      | 121 ------------------
 .../gradle/tasks/CheckSnapshotTask.java       | 121 ------------------
 .../gradle/tasks/GenerateRestClientTask.java  |  61 ---------
 6 files changed, 17 insertions(+), 422 deletions(-)

diff --git a/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/PegasusPlugin.java b/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/PegasusPlugin.java
index 5a15147c2b..826e64ba23 100644
--- a/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/PegasusPlugin.java
+++ b/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/PegasusPlugin.java
@@ -76,7 +76,6 @@
 import org.gradle.plugins.ide.eclipse.model.EclipseModel;
 import org.gradle.plugins.ide.idea.IdeaPlugin;
 import org.gradle.plugins.ide.idea.model.IdeaModule;
-import org.gradle.util.GradleVersion;
 
 
 /**
@@ -634,11 +633,6 @@ public void setJavadocJarTask(Task javadocJarTask)
   @Override
   public void apply(Project project)
   {
-    if (!isAtLeastGradle54())
-    {
-      throw new GradleException("The pegasus plugin requires Gradle 5.4 or higher; please upgrade.");
-    }
-
     project.getPlugins().apply(JavaPlugin.class);
     project.getPlugins().apply(IdeaPlugin.class);
     project.getPlugins().apply(EclipsePlugin.class);
@@ -2231,8 +2225,4 @@ private Task publishPegasusSchemaSnapshot(Project project, SourceSet sourceSet,
           task.onlyIf(t -> !SharedFileUtils.getSuffixedFiles(project, inputDir, PDL_FILE_SUFFIX).isEmpty());
         });
   }
-  protected static boolean isAtLeastGradle54() {
-    return GradleVersion.current().getBaseVersion().compareTo(GradleVersion.version("5.4")) >= 0;
-  }
-
 }
diff --git a/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/ChangedFileReportTask.java b/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/ChangedFileReportTask.java
index d3c0a55109..9683ff51d4 100644
--- a/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/ChangedFileReportTask.java
+++ b/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/ChangedFileReportTask.java
@@ -9,14 +9,13 @@
 import com.linkedin.pegasus.gradle.IOUtil;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.file.FileCollection;
-import org.gradle.api.file.FileType;
 import org.gradle.api.file.RegularFileProperty;
 import org.gradle.api.tasks.InputFiles;
 import org.gradle.api.tasks.Internal;
 import org.gradle.api.tasks.OutputFile;
 import org.gradle.api.tasks.SkipWhenEmpty;
 import org.gradle.api.tasks.TaskAction;
-import org.gradle.work.InputChanges;
+import org.gradle.api.tasks.incremental.IncrementalTaskInputs;
 
 
 public class ChangedFileReportTask extends DefaultTask
@@ -28,7 +27,7 @@ public class ChangedFileReportTask extends DefaultTask
   private RegularFileProperty _outputFile = getProject().getObjects().fileProperty();
 
   @TaskAction
-  public void checkFilesForChanges(InputChanges inputs)
+  public void checkFilesForChanges(IncrementalTaskInputs inputs)
   {
     getLogger().lifecycle("Checking idl and snapshot files for changes...");
     getLogger().info("idlFiles: " + _idlFiles.getAsPath());
@@ -40,25 +39,25 @@ public void checkFilesForChanges(InputChanges inputs)
 
     if (inputs.isIncremental())
     {
-      inputs.getFileChanges(getSnapshotFiles()).forEach(change -> {
-        if (change.getFileType() != FileType.DIRECTORY)
+      inputs.outOfDate(inputFileDetails -> {
+        if (inputFileDetails.isAdded())
         {
-          String path = change.getFile().getAbsolutePath();
-          switch (change.getChangeType())
-          {
-            case ADDED:
-              filesAdded.add(path);
-              break;
-            case REMOVED:
-              filesRemoved.add(path);
-              break;
-            case MODIFIED:
-              filesChanged.add(path);
-              break;
-          }
+          filesAdded.add(inputFileDetails.getFile().getAbsolutePath());
+        }
+
+        if (inputFileDetails.isRemoved())
+        {
+          filesRemoved.add(inputFileDetails.getFile().getAbsolutePath());
+        }
+
+        if (inputFileDetails.isModified())
+        {
+          filesChanged.add(inputFileDetails.getFile().getAbsolutePath());
         }
       });
 
+      inputs.removed(inputFileDetails -> filesRemoved.add(inputFileDetails.getFile().getAbsolutePath()));
+
       StringBuilder sb = new StringBuilder();
 
       if (!filesRemoved.isEmpty())
diff --git a/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/CheckIdlTask.java b/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/CheckIdlTask.java
index 8baa28065e..4f7ca496d2 100644
--- a/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/CheckIdlTask.java
+++ b/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/CheckIdlTask.java
@@ -17,7 +17,6 @@
 import org.gradle.api.DefaultTask;
 import org.gradle.api.GradleException;
 import org.gradle.api.file.FileCollection;
-import org.gradle.api.model.ReplacedBy;
 import org.gradle.api.tasks.CacheableTask;
 import org.gradle.api.tasks.Classpath;
 import org.gradle.api.tasks.Input;
@@ -167,108 +166,18 @@ public void setSummaryTarget(File summaryTarget)
     _summaryTarget = summaryTarget;
   }
 
-  /**
-   * This method is kept for backwards compatibility.
-   * <p>
-   * A Groovy property with this name was exposed, which leads to this lengthy
-   * getter name. In Java, boolean fields are named without the "is" prefix.
-   *
-   * @deprecated use {@link #isModelCompatible()} instead
-   */
-  @Deprecated
-  @ReplacedBy("modelCompatible")
-  public boolean getIsModelCompatible()
-  {
-    return isModelCompatible();
-  }
-
-  /**
-   * This method is kept for backwards compatibility.
-   * <p>
-   * A Groovy property with this name was exposed, which leads to this lengthy
-   * getter name. In Java, boolean fields are named without the "is" prefix.
-   *
-   * @deprecated use {@link #isModelCompatible()} instead
-   */
-  @Deprecated
-  @ReplacedBy("modelCompatible")
-  public boolean isIsModelCompatible()
-  {
-    return isModelCompatible();
-  }
-
   @Internal
   public boolean isModelCompatible()
   {
     return _modelCompatible;
   }
 
-  /**
-   * This method is kept for backwards compatibility.
-   * <p>
-   * A Groovy property with this name was exposed, which leads to this lengthy
-   * getter name. In Java, boolean fields are named without the "is" prefix.
-   *
-   * @deprecated use {@link #isRestSpecCompatible()} instead
-   */
-  @Deprecated
-  @ReplacedBy("restSpecCompatible")
-  public boolean getIsRestSpecCompatible()
-  {
-    return isRestSpecCompatible();
-  }
-
-  /**
-   * This method is kept for backwards compatibility.
-   * <p>
-   * A Groovy property with this name was exposed, which leads to this lengthy
-   * getter name. In Java, boolean fields are named without the "is" prefix.
-   *
-   * @deprecated use {@link #isRestSpecCompatible()} instead
-   */
-  @Deprecated
-  @ReplacedBy("restSpecCompatible")
-  public boolean isIsRestSpecCompatible()
-  {
-    return isRestSpecCompatible();
-  }
-
   @Internal
   public boolean isRestSpecCompatible()
   {
     return _restSpecCompatible;
   }
 
-  /**
-   * This method is kept for backwards compatibility.
-   * <p>
-   * A Groovy property with this name was exposed, which leads to this lengthy
-   * getter name. In Java, boolean fields are named without the "is" prefix.
-   *
-   * @deprecated use {@link #isEquivalent()} instead
-   */
-  @Deprecated
-  @ReplacedBy("equivalent")
-  public boolean getIsEquivalent()
-  {
-    return _equivalent;
-  }
-
-  /**
-   * This method is kept for backwards compatibility.
-   * <p>
-   * A Groovy property with this name was exposed, which leads to this lengthy
-   * getter name. In Java, boolean fields are named without the "is" prefix.
-   *
-   * @deprecated use {@link #isEquivalent()} instead
-   */
-  @Deprecated
-  @ReplacedBy("equivalent")
-  public boolean isIsEquivalent()
-  {
-    return _equivalent;
-  }
-
   @Internal
   public boolean isEquivalent()
   {
diff --git a/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/CheckRestModelTask.java b/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/CheckRestModelTask.java
index 8e800f9e22..db2ed57b70 100644
--- a/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/CheckRestModelTask.java
+++ b/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/CheckRestModelTask.java
@@ -29,7 +29,6 @@
 import org.gradle.api.DefaultTask;
 import org.gradle.api.GradleException;
 import org.gradle.api.file.FileCollection;
-import org.gradle.api.model.ReplacedBy;
 import org.gradle.api.tasks.CacheableTask;
 import org.gradle.api.tasks.Classpath;
 import org.gradle.api.tasks.Input;
@@ -202,144 +201,24 @@ public void setSummaryTarget(File summaryTarget)
     _summaryTarget = summaryTarget;
   }
 
-  /**
-   * This method is kept for backwards compatibility.
-   * <p>
-   * A Groovy property with this name was exposed, which leads to this lengthy
-   * getter name. In Java, boolean fields are named without the "is" prefix.
-   *
-   * @deprecated use {@link #isModelCompatible()} instead
-   */
-  @Deprecated
-  @ReplacedBy("modelCompatible")
-  public boolean getIsModelCompatible()
-  {
-    return isModelCompatible();
-  }
-
-  /**
-   * This method is kept for backwards compatibility.
-   * <p>
-   * A Groovy property with this name was exposed, which leads to this lengthy
-   * getter name. In Java, boolean fields are named without the "is" prefix.
-   *
-   * @deprecated use {@link #isModelCompatible()} instead
-   */
-  @Deprecated
-  @ReplacedBy("modelCompatible")
-  public boolean isIsModelCompatible()
-  {
-    return isModelCompatible();
-  }
-
   @Internal
   public boolean isModelCompatible()
   {
     return _modelCompatible;
   }
 
-  /**
-   * This method is kept for backwards compatibility.
-   * <p>
-   * A Groovy property with this name was exposed, which leads to this lengthy
-   * getter name. In Java, boolean fields are named without the "is" prefix.
-   *
-   * @deprecated use {@link #isRestSpecCompatible()} instead
-   */
-  @Deprecated
-  @ReplacedBy("restSpecCompatible")
-  public boolean getIsRestSpecCompatible()
-  {
-    return isRestSpecCompatible();
-  }
-
-  /**
-   * This method is kept for backwards compatibility.
-   * <p>
-   * A Groovy property with this name was exposed, which leads to this lengthy
-   * getter name. In Java, boolean fields are named without the "is" prefix.
-   *
-   * @deprecated use {@link #isRestSpecCompatible()} instead
-   */
-  @Deprecated
-  @ReplacedBy("restSpecCompatible")
-  public boolean isIsRestSpecCompatible()
-  {
-    return isRestSpecCompatible();
-  }
-
   @Internal
   public boolean isRestSpecCompatible()
   {
     return _restSpecCompatible;
   }
 
-  /**
-   * This method is kept for backwards compatibility.
-   * <p>
-   * A Groovy property with this name was exposed, which leads to this lengthy
-   * getter name. In Java, boolean fields are named without the "is" prefix.
-   *
-   * @deprecated use {@link #isEquivalent()} instead
-   */
-  @Deprecated
-  @ReplacedBy("equivalent")
-  public boolean getIsEquivalent()
-  {
-    return isEquivalent();
-  }
-
-  /**
-   * This method is kept for backwards compatibility.
-   * <p>
-   * A Groovy property with this name was exposed, which leads to this lengthy
-   * getter name. In Java, boolean fields are named without the "is" prefix.
-   *
-   * @deprecated use {@link #isEquivalent()} instead
-   */
-  @Deprecated
-  @ReplacedBy("equivalent")
-  public boolean isIsEquivalent()
-  {
-    return isEquivalent();
-  }
-
   @Internal
   public boolean isEquivalent()
   {
     return _equivalent;
   }
 
-  /**
-   * This method is kept for backwards compatibility.
-   * <p>
-   * A Groovy property with this name was exposed, which leads to this lengthy
-   * getter name. In Java, boolean fields are named without the "is" prefix.
-   *
-   * @deprecated use {@link #isRestSpecEquivalent()} instead
-   */
-  @Deprecated
-  @ReplacedBy("restSpecEquivalent")
-  public boolean getIsRestSpecEquivalent()
-  {
-    return isRestSpecEquivalent();
-  }
-
-  /**
-   * This method is kept for backwards compatibility.
-   * <p>
-   * A Groovy property with this name was exposed, which leads to this lengthy
-   * getter name. In Java, boolean fields are named without the "is" prefix.
-   *
-   * @deprecated use {@link #isRestSpecEquivalent()} instead
-   */
-  @Deprecated
-  @ReplacedBy("restSpecEquivalent")
-  public boolean isIsRestSpecEquivalent()
-  {
-    return isRestSpecEquivalent();
-  }
-
   @Internal
   public boolean isRestSpecEquivalent()
   {
diff --git a/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/CheckSnapshotTask.java b/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/CheckSnapshotTask.java
index c61ea77172..52c333f678 100644
--- a/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/CheckSnapshotTask.java
+++ b/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/CheckSnapshotTask.java
@@ -13,7 +13,6 @@
 import org.gradle.api.GradleException;
 import org.gradle.api.Project;
 import org.gradle.api.file.FileCollection;
-import org.gradle.api.model.ReplacedBy;
 import org.gradle.api.tasks.CacheableTask;
 import org.gradle.api.tasks.Classpath;
 import org.gradle.api.tasks.Input;
@@ -150,144 +149,24 @@ public void setSummaryTarget(File summaryTarget)
     _summaryTarget = summaryTarget;
   }
 
-  /**
-   * This method is kept for backwards compatibility.
-   * <p>
-   * A Groovy property with this name was exposed, which leads to this lengthy
-   * getter name. In Java, boolean fields are named without the "is" prefix.
-   *
-   * @deprecated use {@link #isModelCompatible()} instead
-   */
-  @Deprecated
-  @ReplacedBy("modelCompatible")
-  public boolean getIsModelCompatible()
-  {
-    return isModelCompatible();
-  }
-
-  /**
-   * This method is kept for backwards compatibility.
-   * <p>
-   * A Groovy property with this name was exposed, which leads to this lengthy
-   * getter name. In Java, boolean fields are named without the "is" prefix.
-   *
-   * @deprecated use {@link #isModelCompatible()} instead
-   */
-  @Deprecated
-  @ReplacedBy("modelCompatible")
-  public boolean isIsModelCompatible()
-  {
-    return isModelCompatible();
-  }
-
   @Internal
   public boolean isModelCompatible()
   {
     return _modelCompatible;
   }
 
-  /**
-   * This method is kept for backwards compatibility.
-   * <p>
-   * A Groovy property with this name was exposed, which leads to this lengthy
-   * getter name. In Java, boolean fields are named without the "is" prefix.
-   *
-   * @deprecated use {@link #isRestSpecCompatible()} instead
-   */
-  @Deprecated
-  @ReplacedBy("restSpecCompatible")
-  public boolean getIsRestSpecCompatible()
-  {
-    return isRestSpecCompatible();
-  }
-
-  /**
-   * This method is kept for backwards compatibility.
-   * <p>
-   * A Groovy property with this name was exposed, which leads to this lengthy
-   * getter name. In Java, boolean fields are named without the "is" prefix.
-   *
-   * @deprecated use {@link #isRestSpecCompatible()} instead
-   */
-  @Deprecated
-  @ReplacedBy("restSpecCompatible")
-  public boolean isIsRestSpecCompatible()
-  {
-    return isRestSpecCompatible();
-  }
-
   @Internal
   public boolean isRestSpecCompatible()
   {
     return _restSpecCompatible;
   }
 
-  /**
-   * This method is kept for backwards compatibility.
-   * <p>
-   * A Groovy property with this name was exposed, which leads to this lengthy
-   * getter name. In Java, boolean fields are named without the "is" prefix.
-   *
-   * @deprecated use {@link #isEquivalent()} instead
-   */
-  @Deprecated
-  @ReplacedBy("equivalent")
-  public boolean getIsEquivalent()
-  {
-    return isEquivalent();
-  }
-
-  /**
-   * This method is kept for backwards compatibility.
-   * <p>
-   * A Groovy property with this name was exposed, which leads to this lengthy
-   * getter name. In Java, boolean fields are named without the "is" prefix.
-   *
-   * @deprecated use {@link #isEquivalent()} instead
-   */
-  @Deprecated
-  @ReplacedBy("equivalent")
-  public boolean isIsEquivalent()
-  {
-    return isEquivalent();
-  }
-
   @Internal
   public boolean isEquivalent()
   {
     return _equivalent;
   }
 
-  /**
-   * This method is kept for backwards compatibility.
-   * <p>
-   * A Groovy property with this name was exposed, which leads to this lengthy
-   * getter name. In Java, boolean fields are named without the "is" prefix.
-   *
-   * @deprecated use {@link #isRestSpecEquivalent()} instead
-   */
-  @Deprecated
-  @ReplacedBy("restSpecEquivalent")
-  public boolean getIsRestSpecEquivalent()
-  {
-    return isRestSpecEquivalent();
-  }
-
-  /**
-   * This method is kept for backwards compatibility.
-   * <p>
-   * A Groovy property with this name was exposed, which leads to this lengthy
-   * getter name. In Java, boolean fields are named without the "is" prefix.
-   *
-   * @deprecated use {@link #isRestSpecEquivalent()} instead
-   */
-  @Deprecated
-  @ReplacedBy("restSpecEquivalent")
-  public boolean isIsRestSpecEquivalent()
-  {
-    return isRestSpecEquivalent();
-  }
-
   @Internal
   public boolean isRestSpecEquivalent()
   {
diff --git a/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/GenerateRestClientTask.java b/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/GenerateRestClientTask.java
index 94046eab59..bf79dd60f5 100644
--- a/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/GenerateRestClientTask.java
+++ b/gradle-plugins/src/main/java/com/linkedin/pegasus/gradle/tasks/GenerateRestClientTask.java
@@ -15,7 +15,6 @@
 import org.gradle.api.DefaultTask;
 import org.gradle.api.GradleException;
 import org.gradle.api.file.FileCollection;
-import org.gradle.api.model.ReplacedBy;
 import org.gradle.api.tasks.CacheableTask;
 import org.gradle.api.tasks.Classpath;
 import org.gradle.api.tasks.Input;
@@ -327,36 +326,6 @@ public void setDestinationDir(File destinationDir)
     _destinationDir = destinationDir;
   }
 
-  /**
-   * This method is kept for backwards compatibility.
-   * <p>
-   * A Groovy property with this name was exposed, which leads to this lengthy
-   * getter name. In Java, boolean fields are named without the "is" prefix.
-   *
-   * @deprecated use {@link #isRestli2FormatSuppressed()} instead
-   */
-  @Deprecated
-  @ReplacedBy("restli2FormatSuppressed")
-  public boolean getIsRestli2FormatSuppressed()
-  {
-    return isRestli2FormatSuppressed();
-  }
-
-  /**
-   * This method is kept for backwards compatibility.
-   * <p>
-   * A Groovy property with this name was exposed, which leads to this lengthy
-   * getter name. In Java, boolean fields are named without the "is" prefix.
-   *
-   * @deprecated use {@link #isRestli2FormatSuppressed()} instead
-   */
-  @Deprecated
-  @ReplacedBy("restli2FormatSuppressed")
-  public boolean isIsRestli2FormatSuppressed()
-  {
-    return isRestli2FormatSuppressed();
-  }
-
   @Internal
   public boolean isRestli2FormatSuppressed()
   {
@@ -404,36 +373,6 @@ public void setGenerateFluentApi(boolean generateFluentApi)
     _generateFluentApi = generateFluentApi;
   }
 
-  /**
-   * This method is kept for backwards compatibility.
-   * <p>
-   * A Groovy property with this name was exposed, which leads to this lengthy
-   * getter name. In Java, boolean fields are named without the "is" prefix.
-   *
-   * @deprecated use {@link #isRestli1BuildersDeprecated()} instead
-   */
-  @Deprecated
-  @ReplacedBy("restli1BuildersDeprecated")
-  public boolean get_isRestli1BuildersDeprecated()
-  {
-    return isRestli1BuildersDeprecated();
-  }
-
-  /**
-   * This method is kept for backwards compatibility.
-   * <p>
-   * A Groovy property with this name was exposed, which leads to this lengthy
-   * getter name. In Java, boolean fields are named without the "is" prefix.
-   *
-   * @deprecated use {@link #isRestli1BuildersDeprecated()} instead
-   */
-  @Deprecated
-  @ReplacedBy("restli1BuildersDeprecated")
-  public boolean is_isRestli1BuildersDeprecated()
-  {
-    return isRestli1BuildersDeprecated();
-  }
-
   @Internal
   public boolean isRestli1BuildersDeprecated()
   {