Skip to content

Commit d332e2e

Browse files
jabubakelesv
jabubake
authored and
lesv
committed
* DLP => v2 (WIP) Pending tasks: -> Update / Add Tests -> Region tag / comment review -> Submit for code review + fixes -> Merge once google-cloud-java PR : googleapis/google-cloud-java#2958 is released * Update to most recent versioning. * Updated DeIdentification samples and tests. * Revert pubsub to public version. * Fix Inspect samples/tests (minus pubsub). * Updated Jobs and add tests. * Updated Metadata classes. * Updated QuickStart tests and samples. * Updated Redact samples and tests. * Updated RiskAnalysis. * Update Template samples. * Update trigger tests. * Make Checkstyle Happy Again. * Fix (and ignore) tests using pubsub. * Update PR tests to complete all tests before returning results. (GoogleCloudPlatform#1065) * Return results of all tests. * Use for loop instead of while. * WIP: Address PR feedback, part 1 * Update deps * Address PR feedback * Remove mvn clean verify failure * Add ReID FPE sample * Address PR feedback * Add k-map sample * checkstyle fixes
1 parent cb3f1ce commit d332e2e

21 files changed

+3010
-930
lines changed

‎dlp/pom.xml‎

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<groupId>com.google.cloud.samples</groupId>
3131
<artifactId>shared-configuration</artifactId>
3232
<version>1.0.8</version>
33+
<relativePath></relativePath>
3334
</parent>
3435

3536
<properties>
@@ -40,13 +41,16 @@
4041
</properties>
4142

4243
<dependencies>
43-
<!-- [START dlp_maven] -->
4444
<dependency>
4545
<groupId>com.google.cloud</groupId>
4646
<artifactId>google-cloud-dlp</artifactId>
4747
<version>0.40.0-beta</version>
4848
</dependency>
49-
<!-- [END dlp_maven] -->
49+
<dependency>
50+
<groupId>com.google.cloud</groupId>
51+
<artifactId>google-cloud-pubsub</artifactId>
52+
<version>0.40.0-beta</version>
53+
</dependency>
5054
<dependency>
5155
<groupId>commons-cli</groupId>
5256
<artifactId>commons-cli</artifactId>
@@ -60,27 +64,27 @@
6064
</dependency>
6165
</dependencies>
6266
<!-- Build jar with dependencies for testing -->
63-
<build>
64-
<plugins>
65-
<plugin>
66-
<artifactId>maven-assembly-plugin</artifactId>
67-
<version>3.0.0</version>
68-
<configuration>
69-
<descriptorRefs>
70-
<descriptorRef>jar-with-dependencies</descriptorRef>
71-
</descriptorRefs>
72-
</configuration>
73-
<executions>
74-
<execution>
75-
<id>make-assembly</id> <!-- this is used for inheritance merges -->
76-
<phase>package</phase> <!-- bind to the packaging phase -->
77-
<goals>
78-
<goal>single</goal>
79-
</goals>
80-
</execution>
81-
</executions>
82-
</plugin>
83-
</plugins>
84-
</build>
67+
<build>
68+
<plugins>
69+
<plugin>
70+
<artifactId>maven-assembly-plugin</artifactId>
71+
<version>3.0.0</version>
72+
<configuration>
73+
<descriptorRefs>
74+
<descriptorRef>jar-with-dependencies</descriptorRef>
75+
</descriptorRefs>
76+
</configuration>
77+
<executions>
78+
<execution>
79+
<id>make-assembly</id> <!-- this is used for inheritance merges -->
80+
<phase>package</phase> <!-- bind to the packaging phase -->
81+
<goals>
82+
<goal>single</goal>
83+
</goals>
84+
</execution>
85+
</executions>
86+
</plugin>
87+
</plugins>
88+
</build>
8589
</project>
8690
<!-- [END dlp_pom] -->

0 commit comments

Comments
 (0)