From 300eacef8b8e6b233815981082d3bd8f21c2c9ef Mon Sep 17 00:00:00 2001
From: Alexander Fenster <fenster@google.com>
Date: Fri, 24 Jul 2020 18:14:26 -0700
Subject: [PATCH] fix: updating plugins to support optional, releasing v2.4.4
 (#836)

---
 Dockerfile       | 8 +++++---
 requirements.txt | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7e4222ae..7ecb5b91 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,10 +2,10 @@ FROM ubuntu:16.04
 
 # Release parameters
 ENV GOOGLEAPIS_HASH e26e1839a45445d13cd45b1be3b1523defb72fee
-ENV GAPIC_GENERATOR_HASH v2.4.3
+ENV GAPIC_GENERATOR_HASH v2.4.4
 # Define version number below. The ARTMAN_VERSION line is parsed by
 # .circleci/config.yml and setup.py, please keep the format.
-ENV ARTMAN_VERSION 2.4.3
+ENV ARTMAN_VERSION 2.4.4
 
 ENV DEBIAN_FRONTEND noninteractive
 
@@ -129,7 +129,7 @@ RUN curl -L https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar -o /usr/loca
   && cd /
 
 # Used to add docstrings to the Python protoc output.
-RUN pip3 install protoc-docs-plugin==0.6.1
+RUN pip3 install git+https://github.com/googleapis/protoc-docs-plugin.git@proto3-optional#egg=protoc-docs-plugin
 
 # Install .NET Core SDK
 ENV DOTNET_SDK_VERSION 1.0.4
@@ -178,4 +178,6 @@ RUN pip install --upgrade setuptools
 # Install artman.
 ADD . /artman
 ARG install_artman_from_source=false
+# installing master version of plugin
+RUN pip3 install git+https://github.com/googleapis/protoc-java-resource-names-plugin.git#egg=protoc-java-resource-names-plugin
 RUN if [ "$install_artman_from_source" = true ]; then pip3 install -e /artman; else pip3 install googleapis-artman==$ARTMAN_VERSION; rm -r /artman; fi
diff --git a/requirements.txt b/requirements.txt
index f8469881..3ae40fdd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,6 @@ oslo.utils>=3.41.0, <4.2.0
 pbr >= 5.4.2, < 6.0.0
 protobuf >= 3.9.0, < 4.0.0
 protobuf3-to-dict==0.1.5
-protoc-java-resource-names-plugin >= 0.0.25, < 0.1.0
 requests >= 2.22.0, < 3.0.0
 ruamel.yaml >= 0.16.0, < 0.17.0
 six >= 1.12.0, < 2.0.0
@@ -20,3 +19,4 @@ taskflow==3.7.1
 networkx==1.11
 pypandoc >= 1.4, < 2.0
 ply >= 3.8
+pyyaml == 5.2