diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 60dde504..b0aea93f 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -9,11 +9,15 @@ updates:
# Maintain Maven Updates
- package-ecosystem: "maven" # See documentation for possible values
directory: "/" # Location of package manifests
+ target-branch: "development"
+ open-pull-requests-limit: 50
schedule:
interval: "daily"
# Maintain dependencies for GitHub Actions
- package-ecosystem: "github-actions"
directory: "/"
+ target-branch: "development"
+ open-pull-requests-limit: 50
schedule:
interval: "daily"
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index dbeaac5d..ff614751 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -38,10 +38,11 @@ jobs:
uses: actions/checkout@v2
- name: Setup Java JDK
- uses: actions/setup-java@v1.4.3
+ uses: actions/setup-java@v2.2.0
with:
# The Java version to make available on the path. Takes a whole or semver Java version, or 1.x syntax (e.g. 1.8 => Java 8.x). Early access versions can be specified in the form of e.g. 14-ea, 14.0.0-ea, or 14.0.0-ea.28
java-version: 11
+ distribution: 'adopt'
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml
index 523e8143..b5e72dcc 100644
--- a/.github/workflows/downstream.yml
+++ b/.github/workflows/downstream.yml
@@ -30,7 +30,7 @@ jobs:
with:
upstream_repository: AtlasMediaGroup/TotalFreedomMod
upstream_branch: main
- target_branch: main
+ target_branch: development
git_pull_args: --ff-only # optional arg use, defaults to simple 'pull'
# Step 3: Display a message if 'sync' step had new commits (simple test)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index cd7f4aee..603989a1 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -11,9 +11,20 @@ jobs:
# Java 11 Builds
- uses: actions/checkout@v1
- name: Set up JDK 11
- uses: actions/setup-java@v1
+ uses: actions/setup-java@v2.2.0
with:
java-version: 11
+ distribution: 'adopt'
+ - name: Build with Maven
+ run: mvn -B package --file pom.xml
+
+ # Java 16 Builds
+ - uses: actions/checkout@v1
+ - name: Set up JDK 16
+ uses: actions/setup-java@v2.2.0
+ with:
+ java-version: 16
+ distribution: 'adopt'
- name: Build with Maven
run: mvn -B package --file pom.xml
diff --git a/pom.xml b/pom.xml
index 9687c927..0f45f0cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
me.totalfreedom
TotalFreedomMod
- 2021.05
+ 2021.06
jar
@@ -109,6 +109,11 @@
ess-repo
https://ci.ender.zone/plugin/repository/everything/
+
+
+ total-freedom-libs-snapshot-local
+ https://atlasmedia.jfrog.io/artifactory/total-freedom-libs-snapshot-local/
+
@@ -135,10 +140,9 @@
- com.github.speedxx
- Mojangson
- 1957eef8d6
- compile
+ ca.momoperes
+ mojangson
+ 1.0-20210821.193420-1
@@ -193,7 +197,7 @@
net.coreprotect
coreprotect
- 19.3
+ 19.5
provided
@@ -256,7 +260,7 @@
org.apache.maven.plugins
maven-checkstyle-plugin
- 3.1.1
+ 3.1.2
compile
@@ -462,7 +466,7 @@
org.apache.maven.plugins
maven-checkstyle-plugin
- 3.1.1
+ 3.1.2
checkstyle.xml
true