Fix java compilation in codeql workflow and update some dependencies
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index cbee67c..8d08980 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -53,19 +53,22 @@
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- - name: Autobuild
- uses: github/codeql-action/autobuild@v1
+ #- name: Autobuild
+ # uses: github/codeql-action/autobuild@v1
# âšī¸ Command-line programs to run using the OS shell.
# đ https://git.io/JvXDl
- # âī¸ If the Autobuild fails above, remove it and uncomment the following three lines
- # and modify them (or add more) to build your code if your project
- # uses a compiled language
-
- #- run: |
- # make bootstrap
- # make release
+ - name: Use Java 8
+ uses: actions/setup-java@v2
+ with:
+ java-version: '8'
+ distribution: 'adopt'
+ cache: 'gradle'
+
+ - run: |
+ gradle -b bootstrap.gradle
+ ./gradlew clean assemble
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
diff --git a/build.gradle b/build.gradle
index 33322fc..f92ce40 100644
--- a/build.gradle
+++ b/build.gradle
@@ -96,7 +96,8 @@
'datafu-spark/metastore_db/**',
'datafu-spark/spark-warehouse/**',
'datafu-spark/derby.log',
- 'datafu-spark/data/**'
+ 'datafu-spark/data/**',
+ '.github/**/*'
]
}
diff --git a/gradle.properties b/gradle.properties
index 10a436d..89e1a3f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,7 +17,7 @@
group=org.apache.datafu
version=1.6.1
-gradleVersion=4.8.1
+gradleVersion=5.6.4
org.gradle.jvmargs="-XX:MaxPermSize=512m"
scalaCompatVersion=2.11
sparkCompatVersion=2.4
diff --git a/site/Gemfile.lock b/site/Gemfile.lock
index caf4bf3..4ad9bd0 100644
--- a/site/Gemfile.lock
+++ b/site/Gemfile.lock
@@ -47,8 +47,9 @@
uber (~> 0.0.14)
http_parser.rb (0.6.0)
i18n (0.7.0)
- json (2.2.0)
- kramdown (1.17.0)
+ json (2.6.0)
+ kramdown (2.3.1)
+ rexml
less (2.6.0)
commonjs (~> 0.2.7)
libv8 (3.16.14.19)
@@ -61,7 +62,7 @@
compass-import-once (= 1.0.5)
execjs (~> 2.0)
haml (>= 4.0.5)
- kramdown (~> 1.2)
+ kramdown (~> 2.3.1)
middleman-core (= 3.4.0)
middleman-sprockets (>= 3.1.2)
sass (>= 3.4.0, < 4.0)
@@ -97,18 +98,20 @@
mime-types (3.2.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2019.0331)
- mini_portile2 (2.4.0)
+ mini_portile2 (2.6.1)
minitest (5.11.3)
multi_json (1.13.1)
- nokogiri (1.9.1)
- mini_portile2 (~> 2.4.0)
+ nokogiri (1.12.5)
+ mini_portile2 (~> 2.6.1)
+ racc (~> 1.4)
padrino-helpers (0.12.9)
i18n (~> 0.6, >= 0.6.7)
padrino-support (= 0.12.9)
tilt (>= 1.4.1, < 3)
padrino-support (0.12.9)
activesupport (>= 3.1)
- rack (1.6.11)
+ racc (1.6.0)
+ rack (1.6.13)
rack-livereload (0.3.17)
rack
rack-test (1.1.0)
@@ -116,8 +119,9 @@
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
- redcarpet (3.4.0)
+ redcarpet (3.5.1)
ref (2.0.0)
+ rexml (3.2.5)
rouge (1.11.1)
sass (3.4.25)
sprockets (2.12.5)
diff --git a/site/config.rb b/site/config.rb
index 44d72ca..2a2511a 100644
--- a/site/config.rb
+++ b/site/config.rb
@@ -43,7 +43,7 @@
# page "/admin/*"
# end
-# Proxy pages (http://middlemanapp.com/dynamic-pages/)
+# Proxy pages (https://middlemanapp.com/dynamic-pages/)
# proxy "/this-page-has-no-template.html", "/template-file.html", :locals => {
# :which_fake_page => "Rendering a fake page with a local variable" }
@@ -61,7 +61,7 @@
helpers do
# Use this for the current release.
def current_source_release_link(version)
- "<a href=\"http://www.apache.org/dyn/closer.cgi/datafu/apache-datafu-#{version}/apache-datafu-sources-#{version}.tgz\">
+ "<a href=\"https://www.apache.org/dyn/closer.cgi/datafu/apache-datafu-#{version}/apache-datafu-sources-#{version}.tgz\">
apache-datafu-#{version}</a>
[ <a href=\"https://www.apache.org/dist/datafu/apache-datafu-#{version}/apache-datafu-sources-#{version}.tgz.asc\">
PGP</a> ]
