Skip to content

Commit 298cf63

Browse files
dependabot[bot]dependabot[bot]
authored
Chore(deps): Bump commons-io from 2.8.0 to 2.11.0
Bumps commons-io from 2.8.0 to 2.11.0. --- updated-dependencies: - dependency-name: commons-io:commons-io dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
1 parent d46bca7 commit 298cf63

File tree

1 file changed

+69
-47
lines changed

1 file changed

+69
-47
lines changed

‎pom.xml‎

Lines changed: 69 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333

3434
<properties>
3535
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
36-
<spotbugs-maven-plugin.version>4.4.2.2</spotbugs-maven-plugin.version>
37-
<spotbugs.version>4.4.2</spotbugs.version>
36+
<spotbugs-maven-plugin.version>4.5.0.0</spotbugs-maven-plugin.version>
37+
<spotbugs.version>4.5.0</spotbugs.version>
3838
<spotbugs-maven-plugin.failOnError>true</spotbugs-maven-plugin.failOnError>
3939
<hamcrest.version>2.2</hamcrest.version>
4040
<okhttp3.version>4.9.2</okhttp3.version>
@@ -103,40 +103,36 @@
103103
<groupId>org.jacoco</groupId>
104104
<artifactId>jacoco-maven-plugin</artifactId>
105105
<version>0.8.7</version>
106+
<configuration>
107+
<!-- no need to get data about external code. It dramatically reduces performance of JaCoCo for nothing -->
108+
<excludes>
109+
<exclude>/org/kohsuke/github/extras/HttpClient*</exclude>
110+
</excludes>
111+
</configuration>
106112
<executions>
107113
<execution>
108114
<goals>
109-
<goal>prepare-agent</goal>
115+
<goal>prepare-agent-integration</goal>
110116
</goals>
111117
<configuration>
112118
<propertyName>jacoco.surefire.argLine</propertyName>
113-
<!-- no need to get data about external code. It dramatically reduces performance of JaCoCo for nothing -->
114-
<includes>
115-
<include>org.kohsuke.*</include>
116-
<include>org/kohsuke/*</include>
117-
</includes>
118-
<excludes>
119-
<exclude>org/kohsuke/github/extras/HttpClientGitHubConnector*</exclude>
120-
<exclude>org/kohsuke/github/extras/HttpClientGitHubConnector*.*</exclude>
121-
<exclude>META-INF/versions/11/org/kohsuke/github/extras/HttpClientGitHubConnector*.*</exclude>
122-
</excludes>
123119
</configuration>
124120
</execution>
125121
<!-- attached to Maven test phase -->
126122
<execution>
127123
<id>report</id>
128-
<phase>test</phase>
129124
<goals>
130-
<goal>report</goal>
125+
<goal>report-integration</goal>
131126
</goals>
132127
</execution>
133128
<execution>
134129
<id>check</id>
135-
<phase>test</phase>
130+
<phase>verify</phase>
136131
<goals>
137132
<goal>check</goal>
138133
</goals>
139134
<configuration>
135+
<dataFile>${project.build.directory}/jacoco-it.exec</dataFile>
140136
<rules>
141137
<rule>
142138
<element>BUNDLE</element>
@@ -231,6 +227,27 @@
231227
<autoReleaseAfterClose>true</autoReleaseAfterClose>
232228
</configuration>
233229
</plugin>
230+
<plugin>
231+
<groupId>org.codehaus.mojo</groupId>
232+
<artifactId>animal-sniffer-maven-plugin</artifactId>
233+
<version>1.20</version>
234+
<configuration>
235+
<signature>
236+
<groupId>org.codehaus.mojo.signature</groupId>
237+
<artifactId>java18</artifactId>
238+
<version>1.0</version>
239+
</signature>
240+
</configuration>
241+
<executions>
242+
<execution>
243+
<id>ensure-java-1.8-class-library</id>
244+
<phase>test</phase>
245+
<goals>
246+
<goal>check</goal>
247+
</goals>
248+
</execution>
249+
</executions>
250+
</plugin>
234251
</plugins>
235252
</pluginManagement>
236253
<plugins>
@@ -296,28 +313,6 @@
296313
<plugin>
297314
<groupId>org.codehaus.mojo</groupId>
298315
<artifactId>animal-sniffer-maven-plugin</artifactId>
299-
<version>1.20</version>
300-
<configuration>
301-
<signature>
302-
<groupId>org.codehaus.mojo.signature</groupId>
303-
<artifactId>java18</artifactId>
304-
<version>1.0</version>
305-
</signature>
306-
<ignores>
307-
<!-- This is not idea, but we need to allow java.net.http.* in java11 module -->
308-
<!-- Also, we still have a Java 8 CI build that protects against misuse -->
309-
java.net.http.*
310-
</ignores>
311-
</configuration>
312-
<executions>
313-
<execution>
314-
<id>ensure-java-1.8-class-library</id>
315-
<phase>test</phase>
316-
<goals>
317-
<goal>check</goal>
318-
</goals>
319-
</execution>
320-
</executions>
321316
</plugin>
322317
<plugin>
323318
<groupId>com.infradna.tool</groupId>
@@ -347,6 +342,12 @@
347342
</executions>
348343
<configuration>
349344
<java>
345+
<includes>
346+
<include>src/main/java/**/*.java</include>
347+
<include>src/main/java11/**/*.java</include>
348+
<include>src/test/java/**/*.java</include>
349+
</includes>
350+
350351
<eclipse>
351352
<file>${basedir}/src/build/eclipse/formatter.xml</file>
352353
</eclipse>
@@ -442,7 +443,7 @@
442443
<dependency>
443444
<groupId>commons-io</groupId>
444445
<artifactId>commons-io</artifactId>
445-
<version>2.8.0</version>
446+
<version>2.11.0</version>
446447
</dependency>
447448
<dependency>
448449
<groupId>com.infradna.tool</groupId>
@@ -536,7 +537,7 @@
536537
<dependency>
537538
<groupId>org.mockito</groupId>
538539
<artifactId>mockito-core</artifactId>
539-
<version>4.0.0</version>
540+
<version>4.1.0</version>
540541
<scope>test</scope>
541542
</dependency>
542543
<dependency>
@@ -592,22 +593,24 @@
592593
<executions>
593594
<execution>
594595
<id>okhttp-test</id>
595-
<phase>test</phase>
596+
<phase>integration-test</phase>
596597
<goals>
597598
<goal>test</goal>
598599
</goals>
599600
<configuration>
601+
<classesDirectory>${project.basedir}/target/github-api-${project.version}.jar</classesDirectory>
600602
<excludesFile>src/test/resources/slow-or-flaky-tests.txt</excludesFile>
601603
<argLine>@{jacoco.surefire.argLine} ${surefire.argLine} -Dtest.github.connector=okhttp</argLine>
602604
</configuration>
603605
</execution>
604606
<execution>
605607
<id>slow-or-flaky-test</id>
606-
<phase>test</phase>
608+
<phase>integration-test</phase>
607609
<goals>
608610
<goal>test</goal>
609611
</goals>
610612
<configuration>
613+
<classesDirectory>${project.basedir}/target/github-api-${project.version}.jar</classesDirectory>
611614
<rerunFailingTestsCount>2</rerunFailingTestsCount>
612615
<!-- There are some tests that take longer or are a little
613616
flaky. Run them here. -->
@@ -677,7 +680,7 @@
677680
<rules>
678681
<requireFilesExist>
679682
<files>
680-
<file>${project.build.directory}/jacoco.exec</file>
683+
<file>${project.build.directory}/jacoco-it.exec</file>
681684
</files>
682685
</requireFilesExist>
683686
</rules>
@@ -747,12 +750,18 @@
747750
<id>multirelease</id>
748751
<activation>
749752
<jdk>[11,)</jdk>
750-
<property>
751-
<name>!test</name>
752-
</property>
753753
</activation>
754754
<build>
755755
<plugins>
756+
<plugin>
757+
<groupId>org.codehaus.mojo</groupId>
758+
<artifactId>animal-sniffer-maven-plugin</artifactId>
759+
<configuration>
760+
<ignores>
761+
java.net.http.*
762+
</ignores>
763+
</configuration>
764+
</plugin>
756765
<plugin>
757766
<artifactId>maven-compiler-plugin</artifactId>
758767
<version>3.8.1</version>
@@ -804,7 +813,7 @@
804813
<artifactId>maven-surefire-plugin</artifactId>
805814
<executions>
806815
<execution>
807-
<id>java11-jar-test</id>
816+
<id>java11-test</id>
808817
<phase>integration-test</phase>
809818
<goals>
810819
<goal>test</goal>
@@ -816,6 +825,19 @@
816825
<argLine>@{jacoco.surefire.argLine} ${surefire.argLine} -Dtest.github.connector=httpclient</argLine>
817826
</configuration>
818827
</execution>
828+
<execution>
829+
<id>java11-urlconnection-test</id>
830+
<phase>integration-test</phase>
831+
<goals>
832+
<goal>test</goal>
833+
</goals>
834+
<configuration>
835+
<classesDirectory>${project.basedir}/target/github-api-${project.version}.jar</classesDirectory>
836+
<useSystemClassLoader>false</useSystemClassLoader>
837+
<excludesFile>src/test/resources/slow-or-flaky-tests.txt</excludesFile>
838+
<argLine>@{jacoco.surefire.argLine} ${surefire.argLine} -Dtest.github.connector=urlconnection</argLine>
839+
</configuration>
840+
</execution>
819841
</executions>
820842
</plugin>
821843
</plugins>

0 commit comments

Comments
 (0)