From e2f9cef4a5906f91465d14de7546a36b7f3892ea Mon Sep 17 00:00:00 2001
From: Zhentao Li <zhentao.li@openx.com>
Date: Wed, 17 Oct 2018 09:58:45 -0700
Subject: [PATCH 1/3] upgrade httpclient to 4.5.6 to address a potential
 security vulnerability

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 12f8f94..b44d143 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
-      <version>4.1.1</version>
+      <version>4.5.6</version>
     </dependency>
   </dependencies>
 

From eedbad9e3c7b25b72ecc8b3df00a483605c60024 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C5=82awomir=20Kluz?= <slawomir.kluz@openx.com>
Date: Mon, 2 Aug 2021 16:52:06 +0200
Subject: [PATCH 2/3] basic cloud-build script

---
 .ci/cloudbuild.yaml | 20 ++++++++++++
 pom.xml             | 80 ++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 96 insertions(+), 4 deletions(-)
 create mode 100644 .ci/cloudbuild.yaml

diff --git a/.ci/cloudbuild.yaml b/.ci/cloudbuild.yaml
new file mode 100644
index 0000000..0b63254
--- /dev/null
+++ b/.ci/cloudbuild.yaml
@@ -0,0 +1,20 @@
+steps:
+  - id: build
+    name: maven:3.6.1-jdk-11-slim
+    entrypoint: mvn
+    args: ['clean', 'package', '--no-transfer-progress']
+  - id: deploy
+    name: maven:3.6.1-jdk-11-slim
+    entrypoint: bash
+    args:
+    - -c
+    - |
+      ! [[ "$BRANCH_NAME" =~ ^(master)$ ]] && exit 0
+      mvn deploy -Dmaven.test.skip=true --no-transfer-progress
+    waitFor: ['build']
+
+options:
+  volumes:
+    - name: 'mvn-cache'
+      path: '/root/.m2'
+tags: ['qa']
diff --git a/pom.xml b/pom.xml
index b44d143..fb7183e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>com.openx</groupId>
   <artifactId>OAuthDemo</artifactId>
-  <version>1.1.0</version>
+  <version>1.2.0</version>
   <packaging>jar</packaging>
 
   <name>OAuthDemo</name>
@@ -14,6 +14,72 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
+  <profiles>
+    <profile>
+      <id>gar-profile</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <properties>
+        <repo-url>artifactregistry://us-central1-maven.pkg.dev/ox-registry-prod</repo-url>
+        <publish-snapshot-path>ox-snapshots</publish-snapshot-path>
+        <publish-release-path>ox-releases</publish-release-path>
+        <snapshot-path>ox-snapshots</snapshot-path>
+        <release-path>ox-releases</release-path>
+      </properties>
+    </profile>
+    <profile>
+      <id>artifactory-profile</id>
+      <properties>
+        <repo-url>https://artifactory.prod.gcp.openx.org</repo-url>
+        <publish-snapshot-path>artifactory/libs-snapshot-local</publish-snapshot-path>
+        <publish-release-path>artifactory/libs-release-local</publish-release-path>
+        <snapshot-path>artifactory/libs-snapshot</snapshot-path>
+        <release-path>artifactory/libs-release</release-path>
+      </properties>
+    </profile>
+  </profiles>
+
+  <distributionManagement>
+    <repository>
+      <id>releases</id>
+      <url>${repo-url}/${publish-release-path}</url>
+    </repository>
+    <snapshotRepository>
+      <id>snapshots</id>
+      <url>${repo-url}/${publish-snapshot-path}</url>
+    </snapshotRepository>
+  </distributionManagement>
+
+  <repositories>
+    <repository>
+      <id>libs-release</id>
+      <url>${repo-url}/${release-path}</url>
+    </repository>
+    <repository>
+      <id>libs-snapshot</id>
+      <url>${repo-url}/${snapshot-path}</url>
+      <snapshots>
+        <enabled>true</enabled>
+        <updatePolicy>always</updatePolicy>
+      </snapshots>
+    </repository>
+  </repositories>
+
+  <pluginRepositories>
+    <pluginRepository>
+      <id>libs-release</id>
+      <url>${repo-url}/${release-path}</url>
+    </pluginRepository>
+    <pluginRepository>
+      <id>libs-snapshot</id>
+      <url>${repo-url}/${snapshot-path}</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </pluginRepository>
+  </pluginRepositories>
+
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
@@ -41,14 +107,20 @@
   </dependencies>
 
   <build>
+    <extensions>
+      <extension>
+        <groupId>com.google.cloud.artifactregistry</groupId>
+        <artifactId>artifactregistry-maven-wagon</artifactId>
+        <version>2.1.1</version>
+      </extension>
+    </extensions>
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.8.1</version>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
+          <release>8</release>
         </configuration>
-        <version>2.3.2</version>
       </plugin>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>

From c9fac37821ea7e8adc7eb245ea57d4bae02d8f27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C5=82awomir=20Kluz?= <slawomir.kluz@openx.com>
Date: Mon, 2 Aug 2021 17:20:13 +0200
Subject: [PATCH 3/3] basic cloud-build script

---
 .ci/cloudbuild.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.ci/cloudbuild.yaml b/.ci/cloudbuild.yaml
index 0b63254..9a41358 100644
--- a/.ci/cloudbuild.yaml
+++ b/.ci/cloudbuild.yaml
@@ -17,4 +17,3 @@ options:
   volumes:
     - name: 'mvn-cache'
       path: '/root/.m2'
-tags: ['qa']