Bump metafacture-core dependency to 7.0.0 (#221)

.github/workflows/build.yml

@@ -13,15 +13,15 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 11
-    - name: Checkout metafacture-core
-      uses: actions/checkout@v2
-      with:
-        path: metafacture-core
-        repository: metafacture/metafacture-core
-        ref: master
-    - name: Install metafacture-core
-      working-directory: metafacture-core
-      run: ./gradlew install
+    #- name: Checkout metafacture-core
+    #  uses: actions/checkout@v2
+    #  with:
+    #    path: metafacture-core
+    #    repository: metafacture/metafacture-core
+    #    ref: master
+   # - name: Install metafacture-core
+   #   working-directory: metafacture-core
+   #   run: ./gradlew install
     - name: Set up Node.js
       uses: actions/setup-node@v2
     - uses: actions/checkout@v2

.github/workflows/test.yml

@@ -12,15 +12,15 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 11
-    - name: Checkout metafacture-core
-      uses: actions/checkout@v2
-      with:
-        path: metafacture-core
-        repository: metafacture/metafacture-core
-        ref: master
-    - name: Install metafacture-core
-      working-directory: metafacture-core
-      run: ./gradlew install
+    #- name: Checkout metafacture-core
+    #  uses: actions/checkout@v2
+    #  with:
+    #    path: metafacture-core
+    #    repository: metafacture/metafacture-core
+    #    ref: master
+    #- name: Install metafacture-core
+    #  working-directory: metafacture-core
+    #  run: ./gradlew install
     - name: Set up Node.js
       uses: actions/setup-node@v2
     - name: Install karma and headless chrome

Dockerfile.dev

@@ -36,12 +36,6 @@ RUN git clone https://github.com/metafacture/metafacture-core.git .
 #RUN git checkout metafacture-core-6.0.0
 RUN ./gradlew install
 
-## metafacture-fix
-WORKDIR $INSTALL_DIR/metafacture-fix
-RUN git clone https://github.com/metafacture/metafacture-fix.git .
-RUN git checkout 1.2.0
-RUN ./gradlew install
-
 ## metafacture-playground
 WORKDIR $INSTALL_DIR/metafacture-playground
 COPY --chown="$USERNAME:$USERNAME" ./ .

Dockerfile.prod

@@ -30,17 +30,11 @@ ARG INSTALL_DIR=/home/$USERNAME
 
 ## metafacture-core
 WORKDIR $INSTALL_DIR/metafacture-core
-RUN git clone https://github.com/metafacture/metafacture-core.git .
+#RUN git clone https://github.com/metafacture/metafacture-core.git .
 # use master for now, not a specific version
 # must match dependencies in project.clj
-#RUN git checkout metafacture-core-6.0.0
-RUN ./gradlew install
-
-## metafacture-fix
-WORKDIR $INSTALL_DIR/metafacture-fix
-RUN git clone https://github.com/metafacture/metafacture-fix.git .
-RUN git checkout 1.2.0
-RUN ./gradlew install
+#RUN git checkout metafacture-core-7.0.0
+#RUN ./gradlew install
 
 ## metafacture-playground
 WORKDIR $INSTALL_DIR/metafacture-playground

README.md

@@ -142,16 +142,15 @@ Browse to http://localhost:3000.
 
 ### Show dependency versions in UI
 
-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.
+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.
 
-![Display versions of dependencies](/resources/img/displayVersions.JPG)
+![Display version of dependency](/resources/img/displayVersions.JPG)
 
-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.
-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.
-To display the Metafacture Core dependency we use ```org.metafacture/metafacture-framework```.
+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.
+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.
 
 #### Use a release version
-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).
+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).
 
 #### Use Master/Main or other branch
 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

@@ -22,36 +22,36 @@
                  [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 "master-SNAPSHOT"]
-                 [org.metafacture/metafacture-framework "master-SNAPSHOT"]
-                 [org.metafacture/metafacture-flowcontrol "master-SNAPSHOT"]
-                 [org.metafacture/metafacture-mangling "master-SNAPSHOT"]
-                 [org.metafacture/metafacture-plumbing "master-SNAPSHOT"]
-                 [org.metafacture/metafacture-monitoring "master-SNAPSHOT"]
-                 [org.metafacture/metafacture-scripting "master-SNAPSHOT"]
-                 [org.metafacture/metafacture-javaintegration "master-SNAPSHOT"]
-                 [org.metafacture/metafacture-strings "master-SNAPSHOT"]
-                 [org.metafacture/metafacture-formeta "master-SNAPSHOT"]
-                 [org.metafacture/metafacture-formatting "master-SNAPSHOT"]
-                 [org.metafacture/metafacture-xml "master-SNAPSHOT"]
-                 [org.metafacture/metafacture-html "master-SNAPSHOT"]
-                 [org.metafacture/metafacture-triples "master-SNAPSHOT"]
-                 [org.metafacture/metafacture-statistics "master-SNAPSHOT"]
-                 [org.metafacture/metafacture-io "master-SNAPSHOT"]
-                 [org.metafacture/metafacture-biblio "master-SNAPSHOT"]
-                 [org.metafacture/metafacture-csv "master-SNAPSHOT"]
-                 [org.metafacture/metafacture-elasticsearch "master-SNAPSHOT"]
-                 [org.metafacture/metafacture-files "master-SNAPSHOT"]
-                 [org.metafacture/metafacture-jdom "master-SNAPSHOT"]
-                 [org.metafacture/metafacture-json "master-SNAPSHOT"]
-                 [org.metafacture/metafacture-linkeddata "master-SNAPSHOT"]
-                 [org.metafacture/metafacture-flux "master-SNAPSHOT" :exclusions [org.eclipse.xtext/xtext-dev-bom org.eclipse.emf/org.eclipse.emf.common]]
-                 [org.metafacture/metafacture-runner "master-SNAPSHOT"]
-                 [org.metafacture/metafacture-yaml "master-SNAPSHOT"]
-                 [org.metafacture/metamorph-api "master-SNAPSHOT"]
-                 [org.metafacture/metamorph "master-SNAPSHOT"]
-                 [org.metafacture/metamorph-test "master-SNAPSHOT"]
-                 [org.metafacture/metafix "master-SNAPSHOT" :exclusions [org.eclipse.xtext/xtext-dev-bom]]
+                 [org.metafacture/metafacture-commons "7.0.0"]
+                 [org.metafacture/metafacture-framework "7.0.0"]
+                 [org.metafacture/metafacture-flowcontrol "7.0.0"]
+                 [org.metafacture/metafacture-mangling "7.0.0"]
+                 [org.metafacture/metafacture-plumbing "7.0.0"]
+                 [org.metafacture/metafacture-monitoring "7.0.0"]
+                 [org.metafacture/metafacture-scripting "7.0.0"]
+                 [org.metafacture/metafacture-javaintegration "7.0.0"]
+                 [org.metafacture/metafacture-strings "7.0.0"]
+                 [org.metafacture/metafacture-formeta "7.0.0"]
+                 [org.metafacture/metafacture-formatting "7.0.0"]
+                 [org.metafacture/metafacture-xml "7.0.0"]
+                 [org.metafacture/metafacture-html "7.0.0"]
+                 [org.metafacture/metafacture-triples "7.0.0"]
+                 [org.metafacture/metafacture-statistics "7.0.0"]
+                 [org.metafacture/metafacture-io "7.0.0"]
+                 [org.metafacture/metafacture-biblio "7.0.0"]
+                 [org.metafacture/metafacture-csv "7.0.0"]
+                 [org.metafacture/metafacture-elasticsearch "7.0.0"]
+                 [org.metafacture/metafacture-files "7.0.0"]
+                 [org.metafacture/metafacture-jdom "7.0.0"]
+                 [org.metafacture/metafacture-json "7.0.0"]
+                 [org.metafacture/metafacture-linkeddata "7.0.0"]
+                 [org.metafacture/metafacture-flux "7.0.0" :exclusions [org.eclipse.xtext/xtext-dev-bom org.eclipse.emf/org.eclipse.emf.common]]
+                 [org.metafacture/metafacture-runner "7.0.0"]
+                 [org.metafacture/metafacture-yaml "7.0.0"]
+                 [org.metafacture/metamorph-api "7.0.0"]
+                 [org.metafacture/metamorph "7.0.0"]
+                 [org.metafacture/metamorph-test "7.0.0"]
+                 [org.metafacture/metafix "7.0.0" :exclusions [org.eclipse.xtext/xtext-dev-bom]]
                 ]
 
   :managed-dependencies [[org.antlr/antlr-runtime "3.2"]]

resources/versions/metafacture-framework

@@ -1 +1 @@
-https://github.com/metafacture/metafacture-core/releases/tag/metafacture-core-6.2.0
+https://github.com/metafacture/metafacture-core/releases/tag/metafacture-core-7.0.0