diff --git a/java-dlp/CHANGELOG.md b/java-dlp/CHANGELOG.md
index 4fc49fc61af7..a17d9185d924 100644
--- a/java-dlp/CHANGELOG.md
+++ b/java-dlp/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Changelog
 
+## [3.6.0](https://github.com/googleapis/java-dlp/compare/v3.5.0...v3.6.0) (2022-07-13)
+
+
+### Features
+
+* InfoType categories were added to built-in infoTypes ([#922](https://github.com/googleapis/java-dlp/issues/922)) ([5a3af6c](https://github.com/googleapis/java-dlp/commit/5a3af6cba0b6749f50568f760d1feb870537a550))
+
+
+### Bug Fixes
+
+* enable longpaths support for windows test ([#1485](https://github.com/googleapis/java-dlp/issues/1485)) ([#924](https://github.com/googleapis/java-dlp/issues/924)) ([6a6a873](https://github.com/googleapis/java-dlp/commit/6a6a873d24020c10e27d8db7ed158ad93e7077e3))
+* suppress checkstyle for certain methods ([#921](https://github.com/googleapis/java-dlp/issues/921)) ([28ae04d](https://github.com/googleapis/java-dlp/commit/28ae04d11c3690c302129c59555b4e9210b5f0d8))
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-pubsub to v1.120.1 ([#917](https://github.com/googleapis/java-dlp/issues/917)) ([98adc52](https://github.com/googleapis/java-dlp/commit/98adc52996c1fe40b1f2ef7245a2b54d8dec4157))
+
 ## [3.5.0](https://github.com/googleapis/java-dlp/compare/v3.4.0...v3.5.0) (2022-07-01)
 
 
diff --git a/java-dlp/google-cloud-dlp-bom/pom.xml b/java-dlp/google-cloud-dlp-bom/pom.xml
index 98d4a147a3f0..e405636e4fda 100644
--- a/java-dlp/google-cloud-dlp-bom/pom.xml
+++ b/java-dlp/google-cloud-dlp-bom/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-dlp-bom</artifactId>
-  <version>3.5.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-dlp:current} -->
+  <version>3.6.0</version><!-- {x-version-update:google-cloud-dlp:current} -->
   <packaging>pom</packaging>
   <parent>
     <groupId>com.google.cloud</groupId>
@@ -52,17 +52,17 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-dlp</artifactId>
-        <version>3.5.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-dlp:current} -->
+        <version>3.6.0</version><!-- {x-version-update:google-cloud-dlp:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-dlp-v2</artifactId>
-        <version>3.5.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-dlp-v2:current} -->
+        <version>3.6.0</version><!-- {x-version-update:grpc-google-cloud-dlp-v2:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-dlp-v2</artifactId>
-        <version>3.5.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-dlp-v2:current} -->
+        <version>3.6.0</version><!-- {x-version-update:proto-google-cloud-dlp-v2:current} -->
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/java-dlp/google-cloud-dlp/pom.xml b/java-dlp/google-cloud-dlp/pom.xml
index aed88f946b2f..72780d63dfa8 100644
--- a/java-dlp/google-cloud-dlp/pom.xml
+++ b/java-dlp/google-cloud-dlp/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-dlp</artifactId>
-  <version>3.5.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-dlp:current} -->
+  <version>3.6.0</version><!-- {x-version-update:google-cloud-dlp:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud DLP</name>
   <url>https://github.com/googleapis/java-dlp</url>
@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-dlp-parent</artifactId>
-    <version>3.5.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-dlp:current} -->
+    <version>3.6.0</version><!-- {x-version-update:google-cloud-dlp:current} -->
   </parent>
   <properties>
     <site.installationModule>google-cloud-dlp</site.installationModule>
diff --git a/java-dlp/grpc-google-cloud-dlp-v2/pom.xml b/java-dlp/grpc-google-cloud-dlp-v2/pom.xml
index d2a2f7700985..ebce868d60e0 100644
--- a/java-dlp/grpc-google-cloud-dlp-v2/pom.xml
+++ b/java-dlp/grpc-google-cloud-dlp-v2/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>grpc-google-cloud-dlp-v2</artifactId>
-  <version>3.5.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-dlp-v2:current} -->
+  <version>3.6.0</version><!-- {x-version-update:grpc-google-cloud-dlp-v2:current} -->
   <name>grpc-google-cloud-dlp-v2</name>
   <description>GRPC library for grpc-google-cloud-dlp-v2</description>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-dlp-parent</artifactId>
-    <version>3.5.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-dlp:current} -->
+    <version>3.6.0</version><!-- {x-version-update:google-cloud-dlp:current} -->
   </parent>
   <dependencies>
     <dependency>
diff --git a/java-dlp/pom.xml b/java-dlp/pom.xml
index 798ec76d9c0b..7384fd0bf54b 100644
--- a/java-dlp/pom.xml
+++ b/java-dlp/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-dlp-parent</artifactId>
   <packaging>pom</packaging>
-  <version>3.5.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-dlp:current} -->
+  <version>3.6.0</version><!-- {x-version-update:google-cloud-dlp:current} -->
   <name>Google Cloud DLP Parent</name>
   <url>https://github.com/googleapis/java-dlp</url>
   <description>
@@ -61,17 +61,17 @@
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-dlp-v2</artifactId>
-        <version>3.5.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-dlp-v2:current} -->
+        <version>3.6.0</version><!-- {x-version-update:proto-google-cloud-dlp-v2:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-dlp-v2</artifactId>
-        <version>3.5.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-dlp-v2:current} -->
+        <version>3.6.0</version><!-- {x-version-update:grpc-google-cloud-dlp-v2:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-dlp</artifactId>
-        <version>3.5.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-dlp:current} -->
+        <version>3.6.0</version><!-- {x-version-update:google-cloud-dlp:current} -->
       </dependency>
 
       <dependency>
diff --git a/java-dlp/proto-google-cloud-dlp-v2/pom.xml b/java-dlp/proto-google-cloud-dlp-v2/pom.xml
index aefcbc37b816..6ea3d8668189 100644
--- a/java-dlp/proto-google-cloud-dlp-v2/pom.xml
+++ b/java-dlp/proto-google-cloud-dlp-v2/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>proto-google-cloud-dlp-v2</artifactId>
-  <version>3.5.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-dlp-v2:current} -->
+  <version>3.6.0</version><!-- {x-version-update:proto-google-cloud-dlp-v2:current} -->
   <name>proto-google-cloud-dlp-v2</name>
   <description>PROTO library for proto-google-cloud-dlp-v2</description>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-dlp-parent</artifactId>
-    <version>3.5.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-dlp:current} -->
+    <version>3.6.0</version><!-- {x-version-update:google-cloud-dlp:current} -->
   </parent>
   <dependencies>
     <dependency>
diff --git a/java-dlp/samples/snapshot/pom.xml b/java-dlp/samples/snapshot/pom.xml
index 6ee1daeceb91..ddc002fd0c0a 100644
--- a/java-dlp/samples/snapshot/pom.xml
+++ b/java-dlp/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-dlp</artifactId>
-      <version>3.5.1-SNAPSHOT</version>
+      <version>3.6.0</version>
     </dependency>
     <!-- {x-version-update-end} -->
 
diff --git a/java-dlp/versions.txt b/java-dlp/versions.txt
index e31eabb82542..5f5ad63637ff 100644
--- a/java-dlp/versions.txt
+++ b/java-dlp/versions.txt
@@ -1,6 +1,6 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-dlp:3.5.0:3.5.1-SNAPSHOT
-grpc-google-cloud-dlp-v2:3.5.0:3.5.1-SNAPSHOT
-proto-google-cloud-dlp-v2:3.5.0:3.5.1-SNAPSHOT
+google-cloud-dlp:3.6.0:3.6.0
+grpc-google-cloud-dlp-v2:3.6.0:3.6.0
+proto-google-cloud-dlp-v2:3.6.0:3.6.0