Skip to content

Commit

Permalink
Merge branch 'master' of github.com:uPortal-Project/resource-server
Browse files Browse the repository at this point in the history
  • Loading branch information
bjagg committed Jan 19, 2022
2 parents 683a487 + b5ac56e commit 60128bc
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -122,22 +122,22 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.32</version>
<version>1.7.33</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.32</version>
<version>1.7.33</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>1.7.32</version>
<version>1.7.33</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>1.7.32</version>
<version>1.7.33</version>
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
Expand Down
4 changes: 2 additions & 2 deletions resource-server-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>3.6.2</version>
<version>3.6.4</version>
<configuration>
<goalPrefix>plugin</goalPrefix>
<outputDirectory>target/dir</outputDirectory>
Expand All @@ -85,7 +85,7 @@
<reportPlugins combine.children="append">
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
<version>3.6.2</version>
<version>3.6.4</version>
</plugin>
</reportPlugins>
</configuration>
Expand Down

0 comments on commit 60128bc

Please sign in to comment.