Skip to content

Commit b7cb3dc

Browse files
ludochgae-java-bot
authored andcommitted
Refactor check_build.sh to use Copybara for initial file setup, using gemini to fix all warnings seen previously about incorrect non fatal configuration setup.
PiperOrigin-RevId: 848213925 Change-Id: If88c9a10164e5f6fcd2444bfb2551e1d9e381e1b
1 parent 9ff2027 commit b7cb3dc

File tree

24 files changed

+126
-62
lines changed

24 files changed

+126
-62
lines changed

api_dev/src/main/java/com/google/appengine/tools/info/Jetty121EE11Sdk.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ protected List<File> getJetty121Jars(String subDir) {
221221
|| f.getName().contains("jakarta.interceptor")
222222
|| f.getName().contains("jakarta.servlet-api-6.0.0") // for EE10
223223
|| f.getName().contains("jakarta.transaction")
224-
// TODO(ludo) Still needed for EE11, not sure why
224+
// TODO Still needed for EE11, not sure why
225225
// || f.getName().contains("jetty-servlet-api-") // no javax.
226226
|| f.getName().contains("ee8") // we want ee11 only. jakarta apis should be in shared
227227
|| f.getName().contains("ee9") // we want ee11 only. jakarta apis should be in shared

appengine_jsr107/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@
5858
</dependency>
5959
<dependency>
6060
<groupId>org.mockito</groupId>
61-
<artifactId>mockito-all</artifactId>
62-
<version>1.10.19</version>
61+
<artifactId>mockito-core</artifactId>
6362
<scope>test</scope>
6463
</dependency>
6564
<dependency>

appengine_testing_tests/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@
5555

5656
<dependency>
5757
<groupId>org.mockito</groupId>
58-
<artifactId>mockito-all</artifactId>
59-
<version>1.10.19</version>
58+
<artifactId>mockito-core</artifactId>
6059
<scope>test</scope>
6160
</dependency>
6261
<dependency>

applications/guestbook/pom.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
<dependency>
5555
<groupId>javax.servlet</groupId>
5656
<artifactId>javax.servlet-api</artifactId>
57-
<version>3.1.0</version>
5857
<scope>provided</scope>
5958
</dependency>
6059
<dependency>
@@ -67,13 +66,11 @@
6766
<dependency>
6867
<groupId>junit</groupId>
6968
<artifactId>junit</artifactId>
70-
<version>4.13.2</version>
7169
<scope>test</scope>
7270
</dependency>
7371
<dependency>
7472
<groupId>org.mockito</groupId>
75-
<artifactId>mockito-all</artifactId>
76-
<version>2.0.2-beta</version>
73+
<artifactId>mockito-core</artifactId>
7774
<scope>test</scope>
7875
</dependency>
7976
<dependency>

applications/guestbook_jakarta/pom.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
<dependency>
5555
<groupId>jakarta.servlet</groupId>
5656
<artifactId>jakarta.servlet-api</artifactId>
57-
<version>6.0.0</version>
5857
<scope>provided</scope>
5958
</dependency>
6059
<dependency>
@@ -67,13 +66,11 @@
6766
<dependency>
6867
<groupId>junit</groupId>
6968
<artifactId>junit</artifactId>
70-
<version>4.13.2</version>
7169
<scope>test</scope>
7270
</dependency>
7371
<dependency>
7472
<groupId>org.mockito</groupId>
75-
<artifactId>mockito-all</artifactId>
76-
<version>2.0.2-beta</version>
73+
<artifactId>mockito-core</artifactId>
7774
<scope>test</scope>
7875
</dependency>
7976
<dependency>

applications/proberapp/pom.xml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@
133133
<dependency>
134134
<groupId>com.google.cloud</groupId>
135135
<artifactId>google-cloud-logging</artifactId>
136-
<version>3.23.9</version>
137136
</dependency>
138137
<dependency>
139138
<groupId>com.google.cloud</groupId>
@@ -162,7 +161,6 @@
162161
<dependency>
163162
<groupId>javax.servlet</groupId>
164163
<artifactId>javax.servlet-api</artifactId>
165-
<version>3.1.0</version>
166164
</dependency>
167165
<dependency>
168166
<groupId>junit</groupId>
@@ -177,28 +175,23 @@
177175
<dependency>
178176
<groupId>org.apache.httpcomponents</groupId>
179177
<artifactId>httpclient</artifactId>
180-
<version>4.5.14</version>
181178
</dependency>
182179
<dependency>
183180
<groupId>org.apache.httpcomponents</groupId>
184181
<artifactId>httpcore</artifactId>
185-
<version>4.4.16</version>
186182
</dependency>
187183
<dependency>
188184
<groupId>org.apache.httpcomponents</groupId>
189185
<artifactId>httpmime</artifactId>
190-
<version>4.5.14</version>
191186
</dependency>
192187
<dependency>
193188
<groupId>com.google.http-client</groupId>
194189
<artifactId>google-http-client-jackson</artifactId>
195-
<version>1.29.2</version>
196190
</dependency>
197191
<!-- Test Dependencies -->
198192
<dependency>
199193
<groupId>org.mockito</groupId>
200-
<artifactId>mockito-all</artifactId>
201-
<version>2.0.2-beta</version>
194+
<artifactId>mockito-core</artifactId>
202195
<scope>test</scope>
203196
</dependency>
204197
<dependency>

applications/proberapp/src/main/java/app/ProberApp.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -970,7 +970,7 @@ private static void testMail(HttpServletRequest request) throws Exception {
970970
mailService.send(
971971
new MailService.Message(
972972
sender, "[email protected]", "java-prober-test-subject", "java-prober-test-textbody"));
973-
// TODO(jihuinie): decide if we want to test sendToAdmins() in probers
973+
// TODO: decide if we want to test sendToAdmins() in probers
974974
// mailService.sendToAdmins(
975975
// new MailService.Message(sender, /* to= */ null, "test-subject", "test-textbody"));
976976
}
@@ -1161,7 +1161,7 @@ private static HttpResponse uploadFileToUrl(String uploadName, String filepath,
11611161
// The SSL certificate in GAE QA environment doesn't include `uc.r.prom-qa.sandbox.google.com`,
11621162
// and this blocks the QA app from sending HTTP request to itself. We need to suppress the cert
11631163
// validation in QA for now.
1164-
// TODO(jihuinie): remove when b/190648760 is fixed.
1164+
// TODO: remove when b/190648760 is fixed.
11651165
if (isRunningInQa()) {
11661166
httpClient = makeHttpClientWithoutSslValidation();
11671167
}

applications/servletasyncapp/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
<dependency>
4444
<groupId>javax.servlet</groupId>
4545
<artifactId>javax.servlet-api</artifactId>
46-
<version>3.1.0</version>
4746
<scope>provided</scope>
4847
</dependency>
4948
</dependencies>

applications/servletasyncappjakarta/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
<dependency>
4444
<groupId>jakarta.servlet</groupId>
4545
<artifactId>jakarta.servlet-api</artifactId>
46-
<version>6.0.0</version>
4746
<scope>provided</scope>
4847
</dependency>
4948
</dependencies>

applications/springboot/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
<dependency>
6666
<groupId>jakarta.servlet</groupId>
6767
<artifactId>jakarta.servlet-api</artifactId>
68-
<version>6.1.0</version>
6968
<scope>provided</scope>
7069
</dependency>
7170

0 commit comments

Comments
 (0)