Skip to content

Commit bcd1dd9

Browse files
committed
Bump metafacture-core dependency to 7.0.0 (#221)
1 parent 7943370 commit bcd1dd9

File tree

8 files changed

+57
-71
lines changed

8 files changed

+57
-71
lines changed

.github/workflows/build.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ jobs:
1313
uses: actions/setup-java@v1
1414
with:
1515
java-version: 11
16-
- name: Checkout metafacture-core
17-
uses: actions/checkout@v2
18-
with:
19-
path: metafacture-core
20-
repository: metafacture/metafacture-core
21-
ref: master
22-
- name: Install metafacture-core
23-
working-directory: metafacture-core
24-
run: ./gradlew install
16+
#- name: Checkout metafacture-core
17+
# uses: actions/checkout@v2
18+
# with:
19+
# path: metafacture-core
20+
# repository: metafacture/metafacture-core
21+
# ref: master
22+
# - name: Install metafacture-core
23+
# working-directory: metafacture-core
24+
# run: ./gradlew install
2525
- name: Set up Node.js
2626
uses: actions/setup-node@v2
2727
- uses: actions/checkout@v2

.github/workflows/test.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ jobs:
1212
uses: actions/setup-java@v1
1313
with:
1414
java-version: 11
15-
- name: Checkout metafacture-core
16-
uses: actions/checkout@v2
17-
with:
18-
path: metafacture-core
19-
repository: metafacture/metafacture-core
20-
ref: master
21-
- name: Install metafacture-core
22-
working-directory: metafacture-core
23-
run: ./gradlew install
15+
#- name: Checkout metafacture-core
16+
# uses: actions/checkout@v2
17+
# with:
18+
# path: metafacture-core
19+
# repository: metafacture/metafacture-core
20+
# ref: master
21+
#- name: Install metafacture-core
22+
# working-directory: metafacture-core
23+
# run: ./gradlew install
2424
- name: Set up Node.js
2525
uses: actions/setup-node@v2
2626
- name: Install karma and headless chrome

Dockerfile.dev

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,6 @@ RUN git clone https://github.com/metafacture/metafacture-core.git .
3636
#RUN git checkout metafacture-core-6.0.0
3737
RUN ./gradlew install
3838

39-
## metafacture-fix
40-
WORKDIR $INSTALL_DIR/metafacture-fix
41-
RUN git clone https://github.com/metafacture/metafacture-fix.git .
42-
RUN git checkout 1.2.0
43-
RUN ./gradlew install
44-
4539
## metafacture-playground
4640
WORKDIR $INSTALL_DIR/metafacture-playground
4741
COPY --chown="$USERNAME:$USERNAME" ./ .

Dockerfile.prod

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,11 @@ ARG INSTALL_DIR=/home/$USERNAME
3030

3131
## metafacture-core
3232
WORKDIR $INSTALL_DIR/metafacture-core
33-
RUN git clone https://github.com/metafacture/metafacture-core.git .
33+
#RUN git clone https://github.com/metafacture/metafacture-core.git .
3434
# use master for now, not a specific version
3535
# must match dependencies in project.clj
36-
#RUN git checkout metafacture-core-6.0.0
37-
RUN ./gradlew install
38-
39-
## metafacture-fix
40-
WORKDIR $INSTALL_DIR/metafacture-fix
41-
RUN git clone https://github.com/metafacture/metafacture-fix.git .
42-
RUN git checkout 1.2.0
43-
RUN ./gradlew install
36+
#RUN git checkout metafacture-core-7.0.0
37+
#RUN ./gradlew install
4438

4539
## metafacture-playground
4640
WORKDIR $INSTALL_DIR/metafacture-playground

README.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -142,16 +142,15 @@ Browse to http://localhost:3000.
142142

143143
### Show dependency versions in UI
144144

145-
When installing the Metafacture Playground to a server it's important for users to know which version of Metafacture Core and Metafacture Fix are used to process the workflows in the playground.
145+
When installing the Metafacture Playground to a server it's important for users to know which version of Metafacture Core is used to process the workflows in the playground.
146146

147-
![Display versions of dependencies](/resources/img/displayVersions.JPG)
147+
![Display version of dependency](/resources/img/displayVersion.JPG)
148148

149-
To display these versions (or any other dependency of the playground) you have to put a file with the corresponding dependency name into the folder ```resources/versions```, e.g. the dependency of Metafacture Fix is named ```org.metafacture/metafix``` in the project.clj, so we need a file named ```metafix``` in the folder ```resources/versions``` to display the version used in the project.clj in the UI.
150-
The content of this file is a URI that should link to the corresponding version or branch commit and should be adapted manually. In the future the content of these files should be adapted automatically when installing Metafacture Fix or Metafacture Core on the server where the playground is running.
151-
To display the Metafacture Core dependency we use ```org.metafacture/metafacture-framework```.
149+
To display the version (or any other dependency of the playground) you have to put the file with the corresponding dependency name into the folder ```resources/versions```, e.g. the dependency of Metafacture Core is named ```org.metafacture/metafacture-framework``` in the project.clj, so we need a file named ```metafacture-framework``` in the folder ```resources/versions``` to display the version used in the project.clj in the UI.
150+
The content of this file is a URI that should link to the corresponding version or branch commit and should be adapted manually. In the future the content of these files should be adapted automatically when installing Metafacture Core on the server where the playground is running.
152151

153152
#### Use a release version
154-
If a released version is used, the content of the file contains the link to the release, e.g. [https://github.com/metafacture/metafacture-core/releases/tag/metafacture-core-5.3.1](https://github.com/metafacture/metafacture-core/releases/tag/metafacture-core-5.3.1).
153+
If a released version is used, the content of the file contains the link to the release, e.g. [https://github.com/metafacture/metafacture-core/releases/tag/metafacture-core-7.0.0](https://github.com/metafacture/metafacture-core/releases/tag/metafacture-core-7.0.0).
155154

156155
#### Use Master/Main or other branch
157156
If the master/main or another branch is used, the content of the file should contain a link to the commit like [https://github.com/metafacture/metafacture-fix/commit/b36fcb9](https://github.com/metafacture/metafacture-fix/commit/b36fcb9) (Please use the short hash link).

project.clj

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -22,36 +22,36 @@
2222
[org.clojure/data.json "2.4.0"]
2323
[com.degel/re-frame-storage-fx "0.1.1"]
2424
[jtk-dvlp/re-frame-readfile-fx "2.0.0"]
25-
[org.metafacture/metafacture-commons "master-SNAPSHOT"]
26-
[org.metafacture/metafacture-framework "master-SNAPSHOT"]
27-
[org.metafacture/metafacture-flowcontrol "master-SNAPSHOT"]
28-
[org.metafacture/metafacture-mangling "master-SNAPSHOT"]
29-
[org.metafacture/metafacture-plumbing "master-SNAPSHOT"]
30-
[org.metafacture/metafacture-monitoring "master-SNAPSHOT"]
31-
[org.metafacture/metafacture-scripting "master-SNAPSHOT"]
32-
[org.metafacture/metafacture-javaintegration "master-SNAPSHOT"]
33-
[org.metafacture/metafacture-strings "master-SNAPSHOT"]
34-
[org.metafacture/metafacture-formeta "master-SNAPSHOT"]
35-
[org.metafacture/metafacture-formatting "master-SNAPSHOT"]
36-
[org.metafacture/metafacture-xml "master-SNAPSHOT"]
37-
[org.metafacture/metafacture-html "master-SNAPSHOT"]
38-
[org.metafacture/metafacture-triples "master-SNAPSHOT"]
39-
[org.metafacture/metafacture-statistics "master-SNAPSHOT"]
40-
[org.metafacture/metafacture-io "master-SNAPSHOT"]
41-
[org.metafacture/metafacture-biblio "master-SNAPSHOT"]
42-
[org.metafacture/metafacture-csv "master-SNAPSHOT"]
43-
[org.metafacture/metafacture-elasticsearch "master-SNAPSHOT"]
44-
[org.metafacture/metafacture-files "master-SNAPSHOT"]
45-
[org.metafacture/metafacture-jdom "master-SNAPSHOT"]
46-
[org.metafacture/metafacture-json "master-SNAPSHOT"]
47-
[org.metafacture/metafacture-linkeddata "master-SNAPSHOT"]
48-
[org.metafacture/metafacture-flux "master-SNAPSHOT" :exclusions [org.eclipse.xtext/xtext-dev-bom org.eclipse.emf/org.eclipse.emf.common]]
49-
[org.metafacture/metafacture-runner "master-SNAPSHOT"]
50-
[org.metafacture/metafacture-yaml "master-SNAPSHOT"]
51-
[org.metafacture/metamorph-api "master-SNAPSHOT"]
52-
[org.metafacture/metamorph "master-SNAPSHOT"]
53-
[org.metafacture/metamorph-test "master-SNAPSHOT"]
54-
[org.metafacture/metafix "master-SNAPSHOT" :exclusions [org.eclipse.xtext/xtext-dev-bom]]
25+
[org.metafacture/metafacture-commons "7.0.0"]
26+
[org.metafacture/metafacture-framework "7.0.0"]
27+
[org.metafacture/metafacture-flowcontrol "7.0.0"]
28+
[org.metafacture/metafacture-mangling "7.0.0"]
29+
[org.metafacture/metafacture-plumbing "7.0.0"]
30+
[org.metafacture/metafacture-monitoring "7.0.0"]
31+
[org.metafacture/metafacture-scripting "7.0.0"]
32+
[org.metafacture/metafacture-javaintegration "7.0.0"]
33+
[org.metafacture/metafacture-strings "7.0.0"]
34+
[org.metafacture/metafacture-formeta "7.0.0"]
35+
[org.metafacture/metafacture-formatting "7.0.0"]
36+
[org.metafacture/metafacture-xml "7.0.0"]
37+
[org.metafacture/metafacture-html "7.0.0"]
38+
[org.metafacture/metafacture-triples "7.0.0"]
39+
[org.metafacture/metafacture-statistics "7.0.0"]
40+
[org.metafacture/metafacture-io "7.0.0"]
41+
[org.metafacture/metafacture-biblio "7.0.0"]
42+
[org.metafacture/metafacture-csv "7.0.0"]
43+
[org.metafacture/metafacture-elasticsearch "7.0.0"]
44+
[org.metafacture/metafacture-files "7.0.0"]
45+
[org.metafacture/metafacture-jdom "7.0.0"]
46+
[org.metafacture/metafacture-json "7.0.0"]
47+
[org.metafacture/metafacture-linkeddata "7.0.0"]
48+
[org.metafacture/metafacture-flux "7.0.0" :exclusions [org.eclipse.xtext/xtext-dev-bom org.eclipse.emf/org.eclipse.emf.common]]
49+
[org.metafacture/metafacture-runner "7.0.0"]
50+
[org.metafacture/metafacture-yaml "7.0.0"]
51+
[org.metafacture/metamorph-api "7.0.0"]
52+
[org.metafacture/metamorph "7.0.0"]
53+
[org.metafacture/metamorph-test "7.0.0"]
54+
[org.metafacture/metafix "7.0.0" :exclusions [org.eclipse.xtext/xtext-dev-bom]]
5555
]
5656

5757
:managed-dependencies [[org.antlr/antlr-runtime "3.2"]]
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
https://github.com/metafacture/metafacture-core/releases/tag/metafacture-core-6.2.0
1+
https://github.com/metafacture/metafacture-core/releases/tag/metafacture-core-7.0.0

resources/versions/metafix

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)