Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(#958) Upgrades jcabi-parent to v0.49.5 #1097

Merged
merged 11 commits into from
Dec 17, 2021
Merged

(#958) Upgrades jcabi-parent to v0.49.5 #1097

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
25e4169
Upgrades jcabi parent to 0.49.5 #958
Sep 8, 2021
20c1b66
Remove hibernate validator in pom.xml #958
Sep 8, 2021
17ff103
Applies Qulice compliance #958
Sep 8, 2021
c968fb6
Updates pom dependencies #958
Sep 8, 2021
64bc175
Updates pom dependencies #958
Sep 8, 2021
5ccaa11
Fix FindBugs errors #958
Sep 8, 2021
64df52c
Excludes some dependencies verification #958
Sep 8, 2021
2f413bb
Configures Qulice exclusions #958
Sep 8, 2021
2c19b2e
Exclude qulice dependency checks #958
baudoliver7 Nov 30, 2021
c990e9e
Fix conflicts #958
baudoliver7 Nov 30, 2021
72f09dd
Format pom.xml #958
baudoliver7 Nov 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 36 additions & 12 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,14 @@ SOFTWARE.
<dependency>
<groupId>javax.json</groupId>
<artifactId>javax.json-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>4.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
<dependency>
<groupId>com.jcabi</groupId>
Expand Down Expand Up @@ -152,6 +153,12 @@ SOFTWARE.
<version>2.0</version>
<scope>compile</scope>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.jcabi.incubator</groupId>
Expand Down Expand Up @@ -229,20 +236,12 @@ SOFTWARE.
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.8.0-alpha2</version>
<version>1.7.25</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.8.0-alpha2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
Expand Down Expand Up @@ -372,6 +371,30 @@ SOFTWARE.
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.ning.maven.plugins</groupId>
<artifactId>duplicate-finder-maven-plugin</artifactId>
<configuration>
<ignoredDependencies>
<dependency>
<groupId>javax.json</groupId>
<artifactId>javax.json-api</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.0</version>
</dependency>
</ignoredDependencies>
</configuration>
<!--
@todo #958:30min duplicate-finder-maven-plugin found module-info as duplicate
and different class in [javax.json:javax.json-api:1.1,javax.xml.bind:jaxb-api:2.3.0].
After resolving duplicatefinder in Qulice, remove this plugin and configure qulice
plugin to enable these exclusions (see at https://www.qulice.com/qulice-maven-plugin/example-exclude.html).
-->
</plugin>
</plugins>
</build>
<profiles>
Expand Down Expand Up @@ -401,6 +424,7 @@ SOFTWARE.
<excludes combine.children="append">
<exclude>checkstyle:/src/site/resources/.*</exclude>
<exclude>duplicatefinder:.*</exclude>
<exclude>dependencies:.*</exclude>
</excludes>
</configuration>
</plugin>
Expand Down