Skip to content

Commit

Permalink
Merge pull request #24 from reneleonhardt/updates
Browse files Browse the repository at this point in the history
chore(deps): Use dependencyManagement
  • Loading branch information
jorsol authored Jun 3, 2024
2 parents 527e8bd + dccb993 commit 6e86135
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 9 deletions.
4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ updates:
directory: "/"
schedule:
interval: "weekly"
- package-ecosystem: "maven"
directory: "/scram-client/src/it/jpms-scram-client"
schedule:
interval: "weekly"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
Expand Down
2 changes: 0 additions & 2 deletions coverage-report/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,10 @@
<dependency>
<groupId>com.ongres.scram</groupId>
<artifactId>scram-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.ongres.scram</groupId>
<artifactId>scram-client</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>

Expand Down
1 change: 0 additions & 1 deletion scram-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
<dependency>
<groupId>com.ongres.scram</groupId>
<artifactId>scram-common</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion scram-client/src/it/jpms-scram-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>3.4.0</version>
<version>3.4.1</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
Expand Down
1 change: 0 additions & 1 deletion scram-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
<dependency>
<groupId>com.ongres.stringprep</groupId>
<artifactId>saslprep</artifactId>
<version>2.1</version>
</dependency>
</dependencies>

Expand Down
37 changes: 33 additions & 4 deletions scram-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,9 @@
<maven.compiler.target>${base.java.version}</maven.compiler.target>
<project.build.outputTimestamp>2024-04-03T17:00:00Z</project.build.outputTimestamp>
<!-- Dependency versions -->
<jetbrains-annotations.version>24.1.0</jetbrains-annotations.version>
<junit5.version>5.10.2</junit5.version>
<saslprep.version>2.1</saslprep.version>
<!-- Plugins versions -->
<compiler-plugin.version>3.13.0</compiler-plugin.version>
<jar-plugin.version>3.4.1</jar-plugin.version>
Expand All @@ -96,6 +98,7 @@
<!-- Checkstyle, SpotBugs and PMD properties -->
<checkstyle.version>10.17.0</checkstyle.version>
<checkstyle-plugin.version>3.3.1</checkstyle-plugin.version>
<errorprone.version>2.28.0</errorprone.version>
<spotbugs.version>4.8.5</spotbugs.version>
<spotbugs-plugin.version>4.8.5.0</spotbugs-plugin.version>
<findsecbugs.version>1.13.0</findsecbugs.version>
Expand All @@ -110,17 +113,43 @@
<pmd.ruleset>${checks.location}/pmd-ruleset.xml</pmd.ruleset>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.ongres.scram</groupId>
<artifactId>scram-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.ongres.scram</groupId>
<artifactId>scram-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.ongres.stringprep</groupId>
<artifactId>saslprep</artifactId>
<version>${saslprep.version}</version>
</dependency>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>${junit5.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>${junit5.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>24.1.0</version>
<version>${jetbrains-annotations.version}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
Expand Down Expand Up @@ -345,7 +374,7 @@
<configuration>
<rules>
<requireMavenVersion>
<version>[3.9.6,)</version>
<version>[3.9.7,)</version>
</requireMavenVersion>
<requireJavaVersion>
<version>[21,)</version>
Expand Down Expand Up @@ -476,7 +505,7 @@
<path>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
<version>2.28.0</version>
<version>${errorprone.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
Expand Down

0 comments on commit 6e86135

Please sign in to comment.