Skip to content

Commit

Permalink
Made the package org.slf4j.spi optional in an attempt to resolve a …
Browse files Browse the repository at this point in the history 
…collision.
  • Loading branch information
@filipesoliveira
filipesoliveira committed Jul 1, 2024
1 parent 4431661 commit 6c29110
Show file tree
Hide file tree
Showing 59 changed files with 66 additions and 100 deletions.
2 changes: 1 addition & 1 deletion test-repo/io/javalin/community/ssl/ssl-plugin/6.1.7-SNAPSHOT/_remote.repositories
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
#Fri Jun 14 16:24:43 BST 2024
#Mon Jul 01 11:11:11 BST 2024
ssl-plugin-6.1.7-SNAPSHOT-sources.jar>=
ssl-plugin-6.1.7-SNAPSHOT.jar>=
ssl-plugin-6.1.7-SNAPSHOT.pom>=
8 changes: 4 additions & 4 deletions test-repo/io/javalin/community/ssl/ssl-plugin/6.1.7-SNAPSHOT/maven-metadata-local.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,26 @@
<groupId>io.javalin.community.ssl</groupId>
<artifactId>ssl-plugin</artifactId>
<versioning>
<lastUpdated>20240614152124</lastUpdated>
<lastUpdated>20240701100822</lastUpdated>
<snapshot>
<localCopy>true</localCopy>
</snapshot>
<snapshotVersions>
<snapshotVersion>
<extension>pom</extension>
<value>6.1.7-SNAPSHOT</value>
<updated>20240614152124</updated>
<updated>20240701100822</updated>
</snapshotVersion>
<snapshotVersion>
<extension>jar</extension>
<value>6.1.7-SNAPSHOT</value>
<updated>20240614152124</updated>
<updated>20240701100822</updated>
</snapshotVersion>
<snapshotVersion>
<classifier>sources</classifier>
<extension>jar</extension>
<value>6.1.7-SNAPSHOT</value>
<updated>20240614152124</updated>
<updated>20240701100822</updated>
</snapshotVersion>
</snapshotVersions>
</versioning>
Expand Down
Binary file modified .../io/javalin/community/ssl/ssl-plugin/6.1.7-SNAPSHOT/ssl-plugin-6.1.7-SNAPSHOT-sources.jar
View file
Binary file not shown.
Binary file modified test-repo/io/javalin/community/ssl/ssl-plugin/6.1.7-SNAPSHOT/ssl-plugin-6.1.7-SNAPSHOT.jar
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion test-repo/io/javalin/community/ssl/ssl-plugin/maven-metadata-local.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<versions>
<version>6.1.7-SNAPSHOT</version>
</versions>
<lastUpdated>20240614152124</lastUpdated>
<lastUpdated>20240701100822</lastUpdated>
</versioning>
</metadata>
2 changes: 1 addition & 1 deletion test-repo/io/javalin/javalin-bundle/6.1.7-SNAPSHOT/_remote.repositories
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
#Fri Jun 14 16:24:34 BST 2024
#Mon Jul 01 11:10:58 BST 2024
javalin-bundle-6.1.7-SNAPSHOT.pom>=
javalin-bundle-6.1.7-SNAPSHOT.jar>=
javalin-bundle-6.1.7-SNAPSHOT-sources.jar>=
Binary file modified test-repo/io/javalin/javalin-bundle/6.1.7-SNAPSHOT/javalin-bundle-6.1.7-SNAPSHOT-sources.jar
View file
Binary file not shown.
Binary file modified test-repo/io/javalin/javalin-bundle/6.1.7-SNAPSHOT/javalin-bundle-6.1.7-SNAPSHOT.jar
View file
Binary file not shown.
8 changes: 4 additions & 4 deletions test-repo/io/javalin/javalin-bundle/6.1.7-SNAPSHOT/maven-metadata-local.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,26 @@
<groupId>io.javalin</groupId>
<artifactId>javalin-bundle</artifactId>
<versioning>
<lastUpdated>20240614152124</lastUpdated>
<lastUpdated>20240701100822</lastUpdated>
<snapshot>
<localCopy>true</localCopy>
</snapshot>
<snapshotVersions>
<snapshotVersion>
<extension>pom</extension>
<value>6.1.7-SNAPSHOT</value>
<updated>20240614152124</updated>
<updated>20240701100822</updated>
</snapshotVersion>
<snapshotVersion>
<extension>jar</extension>
<value>6.1.7-SNAPSHOT</value>
<updated>20240614152124</updated>
<updated>20240701100822</updated>
</snapshotVersion>
<snapshotVersion>
<classifier>sources</classifier>
<extension>jar</extension>
<value>6.1.7-SNAPSHOT</value>
<updated>20240614152124</updated>
<updated>20240701100822</updated>
</snapshotVersion>
</snapshotVersions>
</versioning>
Expand Down
2 changes: 1 addition & 1 deletion test-repo/io/javalin/javalin-bundle/maven-metadata-local.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<versions>
<version>6.1.7-SNAPSHOT</version>
</versions>
<lastUpdated>20240614152124</lastUpdated>
<lastUpdated>20240701100822</lastUpdated>
</versioning>
</metadata>
2 changes: 1 addition & 1 deletion test-repo/io/javalin/javalin-context-mock/6.1.7-SNAPSHOT/_remote.repositories
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
#Fri Jun 14 16:24:23 BST 2024
#Mon Jul 01 11:10:45 BST 2024
javalin-context-mock-6.1.7-SNAPSHOT.pom>=
javalin-context-mock-6.1.7-SNAPSHOT-sources.jar>=
javalin-context-mock-6.1.7-SNAPSHOT.jar>=
Binary file modified ...valin/javalin-context-mock/6.1.7-SNAPSHOT/javalin-context-mock-6.1.7-SNAPSHOT-sources.jar
View file
Binary file not shown.
Binary file modified ...po/io/javalin/javalin-context-mock/6.1.7-SNAPSHOT/javalin-context-mock-6.1.7-SNAPSHOT.jar
View file
Binary file not shown.
8 changes: 4 additions & 4 deletions test-repo/io/javalin/javalin-context-mock/6.1.7-SNAPSHOT/maven-metadata-local.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,26 @@
<groupId>io.javalin</groupId>
<artifactId>javalin-context-mock</artifactId>
<versioning>
<lastUpdated>20240614152124</lastUpdated>
<lastUpdated>20240701100822</lastUpdated>
<snapshot>
<localCopy>true</localCopy>
</snapshot>
<snapshotVersions>
<snapshotVersion>
<extension>pom</extension>
<value>6.1.7-SNAPSHOT</value>
<updated>20240614152124</updated>
<updated>20240701100822</updated>
</snapshotVersion>
<snapshotVersion>
<extension>jar</extension>
<value>6.1.7-SNAPSHOT</value>
<updated>20240614152124</updated>
<updated>20240701100822</updated>
</snapshotVersion>
<snapshotVersion>
<classifier>sources</classifier>
<extension>jar</extension>
<value>6.1.7-SNAPSHOT</value>
<updated>20240614152124</updated>
<updated>20240701100822</updated>
</snapshotVersion>
</snapshotVersions>
</versioning>
Expand Down
2 changes: 1 addition & 1 deletion test-repo/io/javalin/javalin-context-mock/maven-metadata-local.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<versions>
<version>6.1.7-SNAPSHOT</version>
</versions>
<lastUpdated>20240614152124</lastUpdated>
<lastUpdated>20240701100822</lastUpdated>
</versioning>
</metadata>
2 changes: 1 addition & 1 deletion test-repo/io/javalin/javalin-micrometer/6.1.7-SNAPSHOT/_remote.repositories
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
#Fri Jun 14 16:24:34 BST 2024
#Mon Jul 01 11:10:57 BST 2024
javalin-micrometer-6.1.7-SNAPSHOT.jar>=
javalin-micrometer-6.1.7-SNAPSHOT.pom>=
javalin-micrometer-6.1.7-SNAPSHOT-sources.jar>=
Binary file modified ...o/javalin/javalin-micrometer/6.1.7-SNAPSHOT/javalin-micrometer-6.1.7-SNAPSHOT-sources.jar
View file
Binary file not shown.
Binary file modified test-repo/io/javalin/javalin-micrometer/6.1.7-SNAPSHOT/javalin-micrometer-6.1.7-SNAPSHOT.jar
View file
Binary file not shown.
8 changes: 4 additions & 4 deletions test-repo/io/javalin/javalin-micrometer/6.1.7-SNAPSHOT/maven-metadata-local.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,26 @@
<groupId>io.javalin</groupId>
<artifactId>javalin-micrometer</artifactId>
<versioning>
<lastUpdated>20240614152124</lastUpdated>
<lastUpdated>20240701100822</lastUpdated>
<snapshot>
<localCopy>true</localCopy>
</snapshot>
<snapshotVersions>
<snapshotVersion>
<extension>pom</extension>
<value>6.1.7-SNAPSHOT</value>
<updated>20240614152124</updated>
<updated>20240701100822</updated>
</snapshotVersion>
<snapshotVersion>
<extension>jar</extension>
<value>6.1.7-SNAPSHOT</value>
<updated>20240614152124</updated>
<updated>20240701100822</updated>
</snapshotVersion>
<snapshotVersion>
<classifier>sources</classifier>
<extension>jar</extension>
<value>6.1.7-SNAPSHOT</value>
<updated>20240614152124</updated>
<updated>20240701100822</updated>
</snapshotVersion>
</snapshotVersions>
</versioning>
Expand Down
2 changes: 1 addition & 1 deletion test-repo/io/javalin/javalin-micrometer/maven-metadata-local.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<versions>
<version>6.1.7-SNAPSHOT</version>
</versions>
<lastUpdated>20240614152124</lastUpdated>
<lastUpdated>20240701100822</lastUpdated>
</versioning>
</metadata>
4 changes: 0 additions & 4 deletions .../io/javalin/javalin-openapi/4.6.9-SNAPSHOT/javalin-openapi-4.6.9-SNAPSHOT.jar.lastUpdated
View file

This file was deleted.

4 changes: 0 additions & 4 deletions .../io/javalin/javalin-openapi/4.6.9-SNAPSHOT/javalin-openapi-4.6.9-SNAPSHOT.pom.lastUpdated
View file

This file was deleted.

4 changes: 0 additions & 4 deletions test-repo/io/javalin/javalin-openapi/4.6.9-SNAPSHOT/resolver-status.properties
View file

This file was deleted.

2 changes: 1 addition & 1 deletion test-repo/io/javalin/javalin-osgi/6.1.7-SNAPSHOT/_remote.repositories
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
#Fri Jun 14 16:24:51 BST 2024
#Mon Jul 01 11:11:26 BST 2024
javalin-osgi-6.1.7-SNAPSHOT.pom>=
javalin-osgi-6.1.7-SNAPSHOT.jar>=
Binary file modified test-repo/io/javalin/javalin-osgi/6.1.7-SNAPSHOT/javalin-osgi-6.1.7-SNAPSHOT.jar
View file
Binary file not shown.
1 change: 1 addition & 0 deletions test-repo/io/javalin/javalin-osgi/6.1.7-SNAPSHOT/javalin-osgi-6.1.7-SNAPSHOT.pom
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@
org.commonmark.renderer.html;resolution:=optional,\
org.jtwig;resolution:=optional,\
org.jtwig.environment;resolution:=optional,\
org.slf4j.spi;resolution:=optional,\
org.thymeleaf;resolution:=optional,\
org.thymeleaf.context;resolution:=optional,\
org.thymeleaf.templatemode;resolution:=optional,\
Expand Down
6 changes: 3 additions & 3 deletions test-repo/io/javalin/javalin-osgi/6.1.7-SNAPSHOT/maven-metadata-local.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@
<groupId>io.javalin</groupId>
<artifactId>javalin-osgi</artifactId>
<versioning>
<lastUpdated>20240614152124</lastUpdated>
<lastUpdated>20240701100822</lastUpdated>
<snapshot>
<localCopy>true</localCopy>
</snapshot>
<snapshotVersions>
<snapshotVersion>
<extension>pom</extension>
<value>6.1.7-SNAPSHOT</value>
<updated>20240614152124</updated>
<updated>20240701100822</updated>
</snapshotVersion>
<snapshotVersion>
<extension>jar</extension>
<value>6.1.7-SNAPSHOT</value>
<updated>20240614152124</updated>
<updated>20240701100822</updated>
</snapshotVersion>
</snapshotVersions>
</versioning>
Expand Down
2 changes: 1 addition & 1 deletion test-repo/io/javalin/javalin-osgi/maven-metadata-local.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<versions>
<version>6.1.7-SNAPSHOT</version>
</versions>
<lastUpdated>20240614152124</lastUpdated>
<lastUpdated>20240701100822</lastUpdated>
</versioning>
</metadata>
2 changes: 1 addition & 1 deletion test-repo/io/javalin/javalin-parent/6.1.7-SNAPSHOT/_remote.repositories
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
#Fri Jun 14 16:21:29 BST 2024
#Mon Jul 01 11:08:26 BST 2024
javalin-parent-6.1.7-SNAPSHOT.pom>=
4 changes: 2 additions & 2 deletions test-repo/io/javalin/javalin-parent/6.1.7-SNAPSHOT/maven-metadata-local.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
<groupId>io.javalin</groupId>
<artifactId>javalin-parent</artifactId>
<versioning>
<lastUpdated>20240614152124</lastUpdated>
<lastUpdated>20240701100822</lastUpdated>
<snapshot>
<localCopy>true</localCopy>
</snapshot>
<snapshotVersions>
<snapshotVersion>
<extension>pom</extension>
<value>6.1.7-SNAPSHOT</value>
<updated>20240614152124</updated>
<updated>20240701100822</updated>
</snapshotVersion>
</snapshotVersions>
</versioning>
Expand Down
10 changes: 5 additions & 5 deletions test-repo/io/javalin/javalin-parent/6.1.7-SNAPSHOT/maven-metadata-reposilite-repository.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
<groupId>io.javalin</groupId>
<artifactId>javalin-parent</artifactId>
<versioning>
<lastUpdated>20240612153116</lastUpdated>
<lastUpdated>20240701100248</lastUpdated>
<snapshot>
<timestamp>20240612.153116</timestamp>
<buildNumber>12</buildNumber>
<timestamp>20240701.100248</timestamp>
<buildNumber>14</buildNumber>
</snapshot>
<snapshotVersions>
<snapshotVersion>
<extension>pom</extension>
<value>6.1.7-20240612.153116-12</value>
<updated>20240612153116</updated>
<value>6.1.7-20240701.100248-14</value>
<updated>20240701100248</updated>
</snapshotVersion>
</snapshotVersions>
</versioning>
Expand Down
2 changes: 1 addition & 1 deletion ...po/io/javalin/javalin-parent/6.1.7-SNAPSHOT/maven-metadata-reposilite-repository.xml.sha1
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
a61d8a0c5f08a753612f79449887e80348c025d4
05eb29f0f463f16f66130b77292644998890e911
4 changes: 2 additions & 2 deletions test-repo/io/javalin/javalin-parent/6.1.7-SNAPSHOT/resolver-status.properties
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
#Wed Jun 12 16:31:20 BST 2024
maven-metadata-reposilite-repository.xml.lastUpdated=1718206280062
#Mon Jul 01 11:03:11 BST 2024
maven-metadata-reposilite-repository.xml.lastUpdated=1719828191008
3 changes: 2 additions & 1 deletion test-repo/io/javalin/javalin-parent/maven-metadata-local.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
<artifactId>javalin-parent</artifactId>
<versioning>
<versions>
<version>4.6.9-SNAPSHOT</version>
<version>6.1.7-SNAPSHOT</version>
</versions>
<lastUpdated>20240614152124</lastUpdated>
<lastUpdated>20240701100822</lastUpdated>
</versioning>
</metadata>
2 changes: 1 addition & 1 deletion test-repo/io/javalin/javalin-rendering/6.1.7-SNAPSHOT/_remote.repositories
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
#Fri Jun 14 16:24:38 BST 2024
#Mon Jul 01 11:11:03 BST 2024
javalin-rendering-6.1.7-SNAPSHOT.jar>=
javalin-rendering-6.1.7-SNAPSHOT.pom>=
javalin-rendering-6.1.7-SNAPSHOT-sources.jar>=
Binary file modified .../io/javalin/javalin-rendering/6.1.7-SNAPSHOT/javalin-rendering-6.1.7-SNAPSHOT-sources.jar
View file
Binary file not shown.
Binary file modified test-repo/io/javalin/javalin-rendering/6.1.7-SNAPSHOT/javalin-rendering-6.1.7-SNAPSHOT.jar
View file
Binary file not shown.
8 changes: 4 additions & 4 deletions test-repo/io/javalin/javalin-rendering/6.1.7-SNAPSHOT/maven-metadata-local.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,26 @@
<groupId>io.javalin</groupId>
<artifactId>javalin-rendering</artifactId>
<versioning>
<lastUpdated>20240614152124</lastUpdated>
<lastUpdated>20240701100822</lastUpdated>
<snapshot>
<localCopy>true</localCopy>
</snapshot>
<snapshotVersions>
<snapshotVersion>
<extension>pom</extension>
<value>6.1.7-SNAPSHOT</value>
<updated>20240614152124</updated>
<updated>20240701100822</updated>
</snapshotVersion>
<snapshotVersion>
<extension>jar</extension>
<value>6.1.7-SNAPSHOT</value>
<updated>20240614152124</updated>
<updated>20240701100822</updated>
</snapshotVersion>
<snapshotVersion>
<classifier>sources</classifier>
<extension>jar</extension>
<value>6.1.7-SNAPSHOT</value>
<updated>20240614152124</updated>
<updated>20240701100822</updated>
</snapshotVersion>
</snapshotVersions>
</versioning>
Expand Down
2 changes: 1 addition & 1 deletion test-repo/io/javalin/javalin-rendering/maven-metadata-local.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<versions>
<version>6.1.7-SNAPSHOT</version>
</versions>
<lastUpdated>20240614152124</lastUpdated>
<lastUpdated>20240701100822</lastUpdated>
</versioning>
</metadata>
4 changes: 0 additions & 4 deletions ...javalin/javalin-testtools/4.6.9-SNAPSHOT/javalin-testtools-4.6.9-SNAPSHOT.jar.lastUpdated
View file

This file was deleted.

4 changes: 0 additions & 4 deletions ...javalin/javalin-testtools/4.6.9-SNAPSHOT/javalin-testtools-4.6.9-SNAPSHOT.pom.lastUpdated
View file

This file was deleted.

4 changes: 0 additions & 4 deletions test-repo/io/javalin/javalin-testtools/4.6.9-SNAPSHOT/resolver-status.properties
View file

This file was deleted.

2 changes: 1 addition & 1 deletion test-repo/io/javalin/javalin-testtools/6.1.7-SNAPSHOT/_remote.repositories
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
#Fri Jun 14 16:24:30 BST 2024
#Mon Jul 01 11:10:52 BST 2024
javalin-testtools-6.1.7-SNAPSHOT.pom>=
javalin-testtools-6.1.7-SNAPSHOT.jar>=
javalin-testtools-6.1.7-SNAPSHOT-sources.jar>=
Binary file modified .../io/javalin/javalin-testtools/6.1.7-SNAPSHOT/javalin-testtools-6.1.7-SNAPSHOT-sources.jar
View file
Binary file not shown.
Binary file modified test-repo/io/javalin/javalin-testtools/6.1.7-SNAPSHOT/javalin-testtools-6.1.7-SNAPSHOT.jar
View file
Binary file not shown.
Loading

0 comments on commit 6c29110

Please sign in to comment.