Skip to content

Update Upstream & Fix build#276

Open
Dreeam-qwq wants to merge 47 commits intomasterfrom
chore/update-upstream
Open

Update Upstream & Fix build#276
Dreeam-qwq wants to merge 47 commits intomasterfrom
chore/update-upstream

Conversation

@Dreeam-qwq
Copy link
Collaborator

Changes

  • Update some needed changes from upstream
  • Fix build
  • Move some AuthMeReReloaded dependencies to the Spigot library loader and also keep some dependency relocations.

sgdc3 and others added 30 commits April 26, 2024 01:29
…uire mvn 3.9, require spigot 1.19, use the spigot runtime dependency download system, use the official maxmind geoip database parser
# Conflicts:
#	pom.xml
#	src/test/java/fr/xephi/authme/service/GeoIpServiceTest.java
#	src/test/java/fr/xephi/authme/service/ValidationServiceTest.java
…t 1.16.5, fix datasourcecolumns runtime library
Bumps [org.apache.maven.plugins:maven-install-plugin](https://github.com/apache/maven-install-plugin) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/apache/maven-install-plugin/releases)
- [Commits](apache/maven-install-plugin@maven-install-plugin-3.1.1...maven-install-plugin-3.1.2)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-install-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [org.apache.maven.plugins:maven-deploy-plugin](https://github.com/apache/maven-deploy-plugin) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/apache/maven-deploy-plugin/releases)
- [Commits](apache/maven-deploy-plugin@maven-deploy-plugin-3.1.1...maven-deploy-plugin-3.1.2)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-deploy-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [at.favre.lib:bcrypt](https://github.com/patrickfav/bcrypt) from 0.9.0 to 0.10.2.
- [Release notes](https://github.com/patrickfav/bcrypt/releases)
- [Changelog](https://github.com/patrickfav/bcrypt/blob/main/CHANGELOG)
- [Commits](patrickfav/bcrypt@v0.9.0...v0.10.2)

---
updated-dependencies:
- dependency-name: at.favre.lib:bcrypt
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.6.3 to 3.7.0.
- [Release notes](https://github.com/apache/maven-javadoc-plugin/releases)
- [Commits](apache/maven-javadoc-plugin@maven-javadoc-plugin-3.6.3...maven-javadoc-plugin-3.7.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-javadoc-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.2.5 to 3.3.0.
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](apache/maven-surefire@surefire-3.2.5...surefire-3.3.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-surefire-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [org.apache.maven.plugins:maven-shade-plugin](https://github.com/apache/maven-shade-plugin) from 3.5.3 to 3.6.0.
- [Release notes](https://github.com/apache/maven-shade-plugin/releases)
- [Commits](apache/maven-shade-plugin@maven-shade-plugin-3.5.3...maven-shade-plugin-3.6.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-shade-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [org.mariadb.jdbc:mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 3.3.3 to 3.4.0.
- [Release notes](https://github.com/mariadb-corporation/mariadb-connector-j/releases)
- [Changelog](https://github.com/mariadb-corporation/mariadb-connector-j/blob/master/CHANGELOG.md)
- [Commits](mariadb-corporation/mariadb-connector-j@3.3.3...3.4.0)

---
updated-dependencies:
- dependency-name: org.mariadb.jdbc:mariadb-java-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [org.checkerframework:checker-qual](https://github.com/typetools/checker-framework) from 3.42.0 to 3.44.0.
- [Release notes](https://github.com/typetools/checker-framework/releases)
- [Changelog](https://github.com/typetools/checker-framework/blob/master/docs/CHANGELOG.md)
- [Commits](typetools/checker-framework@checker-framework-3.42.0...checker-framework-3.44.0)

---
updated-dependencies:
- dependency-name: org.checkerframework:checker-qual
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…erframework-checker-qual-3.44.0

Bump org.checkerframework:checker-qual from 3.42.0 to 3.44.0
…db.jdbc-mariadb-java-client-3.4.0

Bump org.mariadb.jdbc:mariadb-java-client from 3.3.3 to 3.4.0
sgdc3 and others added 17 commits June 28, 2024 18:26
…e.maven.plugins-maven-shade-plugin-3.6.0

Bump org.apache.maven.plugins:maven-shade-plugin from 3.5.3 to 3.6.0
…e.maven.plugins-maven-surefire-plugin-3.3.0

Bump org.apache.maven.plugins:maven-surefire-plugin from 3.2.5 to 3.3.0
…e.maven.plugins-maven-install-plugin-3.1.2

Bump org.apache.maven.plugins:maven-install-plugin from 3.1.1 to 3.1.2
…lib-bcrypt-0.10.2

Bump at.favre.lib:bcrypt from 0.9.0 to 0.10.2
…e.maven.plugins-maven-deploy-plugin-3.1.2

Bump org.apache.maven.plugins:maven-deploy-plugin from 3.1.1 to 3.1.2
…e.maven.plugins-maven-javadoc-plugin-3.7.0

Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.3 to 3.7.0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants