Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update metafacture dependencies and switch to Java 11 #161

Merged
merged 5 commits into from
Mar 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Set up JDK 1.8
- name: Set up JDK 11
uses: actions/setup-java@v1
with:
java-version: 1.8
java-version: 11
- name: Checkout metafacture-core
uses: actions/checkout@v2
with:
path: metafacture-core
repository: metafacture/metafacture-core
ref: metafacture-core-5.7.0
ref: metafacture-core-6.0.0
- name: Install metafacture-core
working-directory: metafacture-core
run: ./gradlew install
Expand All @@ -27,7 +27,7 @@ jobs:
with:
path: metafacture-fix
repository: metafacture/metafacture-fix
ref: 0.7.0
ref: 1.0.0
- name: Install metafacture-fix
working-directory: metafacture-fix
run: ./gradlew install
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Set up JDK 1.8
- name: Set up JDK 11
uses: actions/setup-java@v1
with:
java-version: 1.8
java-version: 11
- name: Checkout metafacture-core
uses: actions/checkout@v2
with:
path: metafacture-core
repository: metafacture/metafacture-core
ref: metafacture-core-5.7.0
ref: metafacture-core-6.0.0
- name: Install metafacture-core
working-directory: metafacture-core
run: ./gradlew install
Expand All @@ -26,7 +26,7 @@ jobs:
with:
path: metafacture-fix
repository: metafacture/metafacture-fix
ref: 0.7.0
ref: 1.0.0
- name: Install metafacture-fix
working-directory: metafacture-fix
run: ./gradlew install
Expand Down
10 changes: 7 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Both deployments provide a web application and an HTTP API

## Installation

Before starting you need to install [Leiningen](https://leiningen.org/) and a JDK (minimum Java 8).
Before starting you need to install [Leiningen](https://leiningen.org/) and a JDK (minimum Java 11).

### Install Leiningen

Expand All @@ -32,7 +32,7 @@ It is possible to display the current version of dependencies in the UI. To disp

Clone and install metafacture-core:
```bash
$ git clone https://github.com/metafacture/metafacture-core.git -b 5.7.0
$ git clone https://github.com/metafacture/metafacture-core.git -b 6.0.0
$ cd metafacture-core
```

Expand All @@ -53,7 +53,7 @@ It is possible to display the current version of dependencies in the UI. To disp

Clone and install metafacture-fix:
```bash
$ git clone https://github.com/metafacture/metafacture-fix.git -b 0.7.0
$ git clone https://github.com/metafacture/metafacture-fix.git -b 1.0.0
$ cd metafacture-fix
```

Expand Down Expand Up @@ -92,7 +92,11 @@ lein watch
Wait a bit, perhaps 20 seconds, keeping an eye out for a sign the compile has finished, then browse to http://localhost:8280.

### Start in production mode
Set the java version to 11, like:

```bash
export JAVA_CMD=/usr/lib/jvm/java-11-openjdk-amd64/bin/java
```
To compile and build the frontend run:

```
Expand Down
65 changes: 34 additions & 31 deletions project.clj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(defproject metafacture-playground "0.3.0-SNAPSHOT"
(defproject metafacture-playground "1.0.0"
:description "Web application to play around with workflows using Metafacture languages Fix and Flux"
:dependencies [[org.clojure/clojure "1.10.1"]
[org.clojure/clojurescript "1.10.773"
Expand All @@ -22,36 +22,39 @@
[org.clojure/data.json "2.4.0"]
[com.degel/re-frame-storage-fx "0.1.1"]
[jtk-dvlp/re-frame-readfile-fx "2.0.0"]
[org.metafacture/metafacture-commons "5.7.0"]
[org.metafacture/metafacture-framework "5.7.0"]
[org.metafacture/metafacture-flowcontrol "5.7.0"]
[org.metafacture/metafacture-mangling "5.7.0"]
[org.metafacture/metafacture-plumbing "5.7.0"]
[org.metafacture/metafacture-monitoring "5.7.0"]
[org.metafacture/metafacture-scripting "5.7.0"]
[org.metafacture/metafacture-javaintegration "5.7.0"]
[org.metafacture/metafacture-strings "5.7.0"]
[org.metafacture/metafacture-formeta "5.7.0"]
[org.metafacture/metafacture-formatting "5.7.0"]
[org.metafacture/metafacture-xml "5.7.0"]
[org.metafacture/metafacture-html "5.7.0"]
[org.metafacture/metafacture-triples "5.7.0"]
[org.metafacture/metafacture-statistics "5.7.0"]
[org.metafacture/metafacture-io "5.7.0"]
[org.metafacture/metafacture-biblio "5.7.0"]
[org.metafacture/metafacture-csv "5.7.0"]
[org.metafacture/metafacture-elasticsearch "5.7.0"]
[org.metafacture/metafacture-files "5.7.0"]
[org.metafacture/metafacture-jdom "5.7.0"]
[org.metafacture/metafacture-json "5.7.0"]
[org.metafacture/metafacture-linkeddata "5.7.0"]
[org.metafacture/metafacture-flux "5.7.0"]
[org.metafacture/metafacture-runner "5.7.0"]
[org.metafacture/metafacture-yaml "5.7.0"]
[org.metafacture/metamorph-api "5.7.0"]
[org.metafacture/metamorph "5.7.0"]
[org.metafacture/metamorph-test "5.7.0"]
[org.metafacture/metafix "0.7.0" :exclusions [[org.eclipse.xtext/xtext-dev-bom]]]]
[org.metafacture/metafacture-commons "6.0.0"]
[org.metafacture/metafacture-framework "6.0.0"]
[org.metafacture/metafacture-flowcontrol "6.0.0"]
[org.metafacture/metafacture-mangling "6.0.0"]
[org.metafacture/metafacture-plumbing "6.0.0"]
[org.metafacture/metafacture-monitoring "6.0.0"]
[org.metafacture/metafacture-scripting "6.0.0"]
[org.metafacture/metafacture-javaintegration "6.0.0"]
[org.metafacture/metafacture-strings "6.0.0"]
[org.metafacture/metafacture-formeta "6.0.0"]
[org.metafacture/metafacture-formatting "6.0.0"]
[org.metafacture/metafacture-xml "6.0.0"]
[org.metafacture/metafacture-html "6.0.0"]
[org.metafacture/metafacture-triples "6.0.0"]
[org.metafacture/metafacture-statistics "6.0.0"]
[org.metafacture/metafacture-io "6.0.0"]
[org.metafacture/metafacture-biblio "6.0.0"]
[org.metafacture/metafacture-csv "6.0.0"]
[org.metafacture/metafacture-elasticsearch "6.0.0"]
[org.metafacture/metafacture-files "6.0.0"]
[org.metafacture/metafacture-jdom "6.0.0"]
[org.metafacture/metafacture-json "6.0.0"]
[org.metafacture/metafacture-linkeddata "6.0.0"]
[org.metafacture/metafacture-flux "6.0.0" :exclusions [org.eclipse.xtext/xtext-dev-bom org.eclipse.emf/org.eclipse.emf.common]]
[org.metafacture/metafacture-runner "6.0.0"]
[org.metafacture/metafacture-yaml "6.0.0"]
[org.metafacture/metamorph-api "6.0.0"]
[org.metafacture/metamorph "6.0.0"]
[org.metafacture/metamorph-test "6.0.0"]
[org.metafacture/metafix "1.0.0" :exclusions [org.eclipse.xtext/xtext-dev-bom]]
]

:managed-dependencies [[org.antlr/antlr-runtime "3.2"]]

:plugins [[lein-shadow "0.4.0"]

Expand Down
2 changes: 1 addition & 1 deletion resources/versions/metafacture-framework
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://github.com/metafacture/metafacture-core/tree/metafacture-core-5.7.0
https://github.com/metafacture/metafacture-core/tree/metafacture-core-6.0.0
2 changes: 1 addition & 1 deletion resources/versions/metafix
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://github.com/metafacture/metafacture-fix/tree/0.7.0
https://github.com/metafacture/metafacture-fix/tree/1.0.0
Loading