Remove mvn site and stop publishing docs to github-pages (#279)

* Change to relative links in documentation
* Remove travis deploy job and remove mvn site plugin
* Update application.properties for integrationtest
* Fix tests to align with new property name

Author: e-pettersson-ericsson

.remarkrc

@@ -0,0 +1,6 @@
+{
+  "plugins": [
+    "remark-preset-lint-recommended",
+    ["remark-lint-list-item-indent", false]
+  ]
+}

.travis.yml

@@ -23,20 +23,12 @@ before_install:
   - export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64
   - java -version
 
-# Using default 'test' stage for our tests, and only running deploy stage
+# Using default 'test' stage for our tests, and only running report_coverage
 # (after merge) on master branch
 stages:
   - test
   - name: report_coverage
     if: branch = master AND type != pull_request
-  - name: deploy
-    if: branch = master AND type != pull_request
-
-# Only used before integrationTests
-# Generate site documentation using mvn site plugin
-before_deploy:
-  - rm -rf docs
-  - mvn site -B
 
 # List of jobs to run, tied to specific stages
 jobs:
@@ -75,16 +67,6 @@ jobs:
       after_script:
         - docker-compose -f src/main/docker/docker-compose.yml down
         - fuser -k ${EI_BACKEND_PORT}/tcp
-    - stage: deploy
-      name: deployGitHubPages
-      before_install: skip    # do not run again
-      install: skip           # do not run again
-      script: skip            # do not run default test scripts
-      deploy:
-        provider: pages
-        skip_cleanup: true
-        github-token: $GITHUB_TOKEN
-        local_dir: docs/
     - stage: report_coverage
       name: report_coverage
       before_install: skip

README.md

@@ -23,7 +23,9 @@
 [![](https://jitpack.io/v/eiffel-community/eiffel-intelligence-frontend.svg)](https://jitpack.io/#eiffel-community/eiffel-intelligence-frontend)
 
 # Eiffel Intelligence Frontend
-Eiffel Intelligence Frontend is part of the [Eiffel Intelligence](https://github.com/eiffel-community/eiffel-intelligence) implementation of the [Eiffel Protocol](https://github.com/eiffel-community/eiffel). Eiffel Intelligence Frontend allows the configuration of subscription and aggregation rules in Eiffel Intelligence.
+Eiffel Intelligence Frontend is part of the [Eiffel Intelligence](https://github.com/eiffel-community/eiffel-intelligence) 
+implementation of the [Eiffel Protocol](https://github.com/eiffel-community/eiffel). 
+Eiffel Intelligence Frontend allows the configuration of subscription and aggregation rules in Eiffel Intelligence.
 
 Potential future features for Eiffel Intelligence Frontend include:
 *  Real time testing of aggregation models for new bounded contexts
@@ -36,28 +38,32 @@ Potential future features for Eiffel Intelligence Frontend include:
 *  Firefox 60.2.0 or later
 
 ## Compatibility
-To see which versions of back-end and front-end that work together you can check the [Compatibility](https://github.com/eiffel-community/eiffel-intelligence/blob/master/wiki/markdown/compatibility.md) page.
+To see which versions of back-end and front-end that work together you can 
+check the [Compatibility](https://github.com/eiffel-community/eiffel-intelligence/blob/master/wiki/compatibility.md) page.
 
 ## About this repository
 The contents of this repository are licensed under the [Apache License 2.0](./LICENSE).
 
 To get involved, please see [Code of Conduct](./CODE_OF_CONDUCT.md) and [contribution guidelines](./CONTRIBUTING.md).
 
 ## About Eiffel
-This repository forms part of the Eiffel Community. Eiffel is a protocol for technology agnostic machine-to-machine communication in continuous integration and delivery pipelines, aimed at securing scalability, flexibility and traceability. Eiffel is based on the concept of decentralized real time messaging, both to drive the continuous integration and delivery system and to document it.
+This repository forms part of the Eiffel Community. Eiffel is a protocol for 
+technology agnostic machine-to-machine communication in continuous integration 
+and delivery pipelines, aimed at securing scalability, flexibility and 
+traceability. Eiffel is based on the concept of decentralized real time 
+messaging, both to drive the continuous integration and delivery system and 
+to document it.
 
 Visit [Eiffel Community](https://eiffel-community.github.io) to get started and get involved.
 
 ## Documentation
 
-1.  [**Introduction**](./wiki/markdown/index.md)
-1.  [**Running Eiffel-Intelligence front-end**](./wiki/markdown/running-eiffel-intelligence-frontend.md)
-    -  [**Run in Docker**](./wiki/markdown/docker.md)
-    -  [**Configuration**](./wiki/markdown/configuration.md)
-1.  [**GUI Overview**](./wiki/markdown/GUI-overview.md)
-1.  [**Subscription Handling**](./wiki/markdown/subscription-handling.md)
-    -  [**Add Subscription**](./wiki/markdown/add-subscription.md)
-1.  [**Test Rules User Guide**](./wiki/markdown/test-rules.md)
-1.  [**CURL examples**](./wiki/markdown/curl-examples.md)
-
-[**Eiffel Intelligence frontend documentation can be found here**](https://eiffel-community.github.io/eiffel-intelligence-frontend/)
+1. [**Introduction**](wiki/index.md)
+2. [**Running Eiffel-Intelligence front-end**](wiki/running-eiffel-intelligence-frontend.md)
+    - [**Run in Docker**](wiki/docker.md)
+    - [**Configuration**](wiki/configuration.md)
+3. [**GUI Overview**](wiki/GUI-overview.md)
+4. [**Subscription Handling**](wiki/subscription-handling.md)
+    - [**Add Subscription**](wiki/add-subscription.md)
+5. [**Test Rules User Guide**](wiki/test-rules.md)
+6. [**CURL examples**](wiki/curl-examples.md)

pom.xml

@@ -279,54 +279,6 @@
                     </includes>
                 </configuration>
             </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-site-plugin</artifactId>
-                <version>3.7.1</version>
-                <configuration>
-                    <!-- This is where site.xml is located -->
-                    <siteDirectory>${basedir}/wiki</siteDirectory>
-                    <!-- Github pages only generates documentation from docs 
-                        directory -->
-                    <outputDirectory>${basedir}/docs</outputDirectory>
-                </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.maven.doxia</groupId>
-                        <artifactId>doxia-module-markdown</artifactId>
-                        <version>1.8</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>3.1.0</version>
-                <executions>
-                    <execution>
-                        <id>copy-resources</id>
-                        <!-- here the phase you need -->
-                        <phase>pre-site</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <!-- plugin requires all resources to exist within 
-                                resources/ directory -->
-                            <!-- but we don't want to break links in documentation -->
-                            <outputDirectory>${basedir}/wiki/resources/images</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>${basedir}/wiki/markdown/images</directory>
-                                    <includes>
-                                        <include>*.png</include>
-                                    </includes>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>cobertura-maven-plugin</artifactId>

src/integrationtest/resources/bodies/listRules.json

@@ -6,19 +6,15 @@
         "IdRule": "meta.id",
         "StartEvent": "YES",
         "IdentifyRules": "[meta.id]",
-        "MatchIdRules": {
-            "_id": "%IdentifyRules_objid%"
-        },
+        "MatchIdRules": { "_id": "%IdentifyRulesEventId%" },
         "ExtractionRules": "{ id : meta.id, type : meta.type, time : meta.time, identity : data.identity, fileInformation : data.fileInformation, buildCommand : data.buildCommand }",
         "DownstreamIdentifyRules": "links | [?type=='COMPOSITION'].target",
-        "DownstreamMergeRules": "{\"externalComposition\":{\"eventId\":%IdentifyRules%}}",
+        "DownstreamMergeRules": "{\"externalComposition\":{\"eventId\":%IdentifyRulesEventId%}}",
         "DownstreamExtractionRules": "{artifacts: [{id : meta.id}]}",
-        "ArrayMergeOptions": "",
         "HistoryIdentifyRules": "links | [?type=='COMPOSITION'].target",
         "HistoryExtractionRules": "{internalComposition:{artifacts: [{id : meta.id}]}}",
         "HistoryPathRules": "{artifacts: {id: meta.id}}",
-        "ProcessRules": null,
-        "ProcessFunction": null
+        "ProcessRules": null
     },
     {
         "TemplateName": "ARTIFACT_TEST",
@@ -27,15 +23,9 @@
         "IdRule": "meta.id",
         "StartEvent": "NO",
         "IdentifyRules": "links | [?type=='ARTIFACT'].target",
-        "MatchIdRules": {
-            "_id": "%IdentifyRules_objid%"
-        },
-        "ExtractionRules": "{ publications :[ { eventId : meta.id, time : meta.time, locations : data.locations  }] }",
-        "ArrayMergeOptions": "",
-        "HistoryIdentifyRules": "",
-        "HistoryExtractionRules": "",
-        "ProcessRules": null,
-        "ProcessFunction": null
+        "MatchIdRules": { "_id": "%IdentifyRulesEventId%" },
+        "ExtractionRules": "{ publications :[{ eventId : meta.id, time : meta.time, locations : data.locations }] }",
+        "ProcessRules": null
     },
     {
         "TemplateName": "ARTIFACT_TEST",
@@ -44,14 +34,8 @@
         "IdRule": "meta.id",
         "StartEvent": "NO",
         "IdentifyRules": "links | [?type=='SUBJECT'].target",
-        "MatchIdRules": {
-            "_id": "%IdentifyRules_objid%"
-        },
+        "MatchIdRules": { "_id": "%IdentifyRulesEventId%" },
         "ExtractionRules": "{confidenceLevels :[{ eventId:meta.id, time:meta.time, name:data.name, value:data.value}]}",
-        "ArrayMergeOptions": "",
-        "HistoryIdentifyRules": "",
-        "HistoryExtractionRules": "",
-        "ProcessRules": null,
-        "ProcessFunction": null
+        "ProcessRules": null
     }
 ]