Update README with ruby fixes and instructions. Update jekyll and deps. | Not one conflict, today was a good day. (C) whatthecommit.com :)

Author: daggerok

.travis.yml

@@ -10,7 +10,7 @@ env:
   - secure: hw6pdShvlvOYQE2N8qVUigZ3A06bj55LmOB786/B3zxWzwAa8mjfPo7jYD5eHTkiuUSpVKMhnr0MsKy//NJu+UIm2OqwZjhTMqYaiZx3a3mtontKgbcLsHJI7IyfQF3OqQVsvhoi+3yf8rfyysq4tnP+0RPlfqtYnrrNNolOBQRdaixQgACfzqYfkYM11EdInXZY6WZkfkIJHvmYhFJKB6D8LgEKdrY6q7W/KmPB9T37c2fcMxe/4aSaoHzFX3JPi6OLc3tT21Kv+XRQPYV7tp3XP67M6rGq2RKzXrKzLoYEjIU5d0pFbygmwE5YBdfn7j7C10rxAeFZ/UOXYJtCJW9ZojKkitwiDzUvo3Bu+Q3v0XDPE/hQ4RwC4zbmeT8DH2GnSSTNnAq+55ESbVXPGAo4FsW/PBlqBx4KlfOpjNbyBPeECGy1xYbOi547YqAYxkqVn3augp5OgZ/bNFRM80ib9k6lv81hFhBrC7Yp1b8GmO6XeUG0QZoOkKclO0DtzhM972uQiYL2Wb6i+Ll7cVeP6Oss+8VNENZTne2+weVVsl/tHFbjLI8mWaQmROqfVpekYl1UzJVx3iJQKSFiRTJlhXjnZYxabet+HPAggw0r40yWJUZRsRH3rFekBNmdjaVRQ+8nihdUOPS9bzCHYO/IUYuTrKDN7B3IJrFiVVU=
 
 language: java
-jdk: openjdk8
+jdk: openjdk11
 rvm: 2.6.4
 
 addons:
@@ -24,18 +24,10 @@ addons:
     - bash
     - curl
     - unzip
-    - python3-dev
-    - python3-pip
-    - python3-six
-    - python3-setuptools
+    - httpie
 
 install: true
 before_install:
-- export PATH=$HOME/.local/bin:$PATH
-- pip3 install --user $(whoami) --upgrade pip >/dev/null
-- pip install --user $(whoami) --upgrade httpie >/dev/null 2>&1
-- http --version --debug
-#
 - source <(curl -s https://raw.githubusercontent.com/daggerok/bash-functions/master/main.bash)
 - stop_any 80 8001 8002 8080 5432
 
@@ -47,10 +39,9 @@ jobs:
   include:
 
   - stage: test
-    jdk: openjdk8
-    name: mvn
+    name: test
     script:
-    - cd $TRAVIS_BUILD_DIR && ./mvnw -U >/dev/null
+    - cd $TRAVIS_BUILD_DIR && ./mvnw
     - java -jar $TRAVIS_BUILD_DIR/target/*-all.jar &
     - wait_for 8080
     - |
@@ -85,88 +76,34 @@ jobs:
       ]' | http post :8080/events/collection
 
     - http :8080/events/00000000-0000-0000-0000-000000000001/collection Accept:application/json
-    - http :8080/events/00000000-0000-0000-0000-000000000000 Accept:application/json
+    - http :8080/events/00000000-0000-0000-0000-000000000000            Accept:application/json
     - http :8080/events
     - http delete :8080/events
 
     - http :8080/counter
-    - http post :8080/counter aggregateId=00000000-0000-0000-0000-000000000000 type=CounterCreated counterName=hi
-    - http put :8080/counter aggregateId=00000000-0000-0000-0000-000000000000 type=CounterIncremented by=travis withValue=1
-    - http put :8080/counter aggregateId=00000000-0000-0000-0000-000000000000 type=CounterIncremented withValue=2
-    - http delete :8080/counter aggregateId=00000000-0000-0000-0000-000000000000 type=CounterSuspended reason="just because I can"
-    - http :8080/counter/00000000-0000-0000-0000-000000000000
-    - http :8080/counter
+    - http post   :8080/counter aggregateId=0-0-0-0-0 type=CounterCreated counterName=hi
+    - http put    :8080/counter aggregateId=0-0-0-0-0 type=CounterIncremented by=travis withValue=1
+    - http put    :8080/counter aggregateId=0-0-0-0-0 type=CounterIncremented withValue=2
+    - http delete :8080/counter aggregateId=0-0-0-0-0 type=CounterSuspended reason="just because I can"
+    - http get    :8080/counter/0-0-0-0-0
+    - http get    :8080/counter
     - http delete :8080/events
-    - http :8080/counter/00000000-0000-0000-0000-000000000000
+    - http get    :8080/counter/0-0-0-0-0
     - stop_any 80 8080
 
   - stage: test
-    jdk: openjdk8
+    jdk: openjdk11
     name: display-property-updates
     script: cd $TRAVIS_BUILD_DIR && ./mvnw versions:display-property-updates -U
 
   - stage: test
-    jdk: openjdk11
-    name: test jdk11
+    name: test documentation build
     script:
-    - cd $TRAVIS_BUILD_DIR && ./mvnw
-    - java -jar $TRAVIS_BUILD_DIR/target/*-all.jar &
-    - wait_for 8080
-    - |
-      echo '[
-        {
-          "type":"CounterCreated",
-          "aggregateId": "00000000-0000-0000-0000-000000000000",
-          "counterName": "hello 1"
-        },
-        {
-          "type":"CounterIncremented",
-          "aggregateId": "00000000-0000-0000-0000-000000000000",
-          "by": "max",
-          "withValue": 2
-        },
-        {
-          "type":"CounterIncremented",
-          "aggregateId": "00000000-0000-0000-0000-000000000000",
-          "by": "max",
-          "withValue": 3
-        },
-        {
-          "type":"CounterIncremented",
-          "aggregateId": "00000000-0000-0000-0000-000000000000",
-          "by": "max"
-        },
-        {
-          "type":"CounterSuspended",
-          "aggregateId": "00000000-0000-0000-0000-000000000000",
-          "reason": "because!"
-        }
-      ]' | http post :8080/events/collection
-
-    - http :8080/events/00000000-0000-0000-0000-000000000001/collection Accept:application/json
-    - http :8080/events/00000000-0000-0000-0000-000000000000 Accept:application/json
-    - http :8080/events
-    - http delete :8080/events
-
-    - http :8080/counter
-    - http post :8080/counter aggregateId=00000000-0000-0000-0000-000000000000 type=CounterCreated counterName=hi
-    - http put :8080/counter aggregateId=00000000-0000-0000-0000-000000000000 type=CounterIncremented by=travis withValue=1
-    - http put :8080/counter aggregateId=00000000-0000-0000-0000-000000000000 type=CounterIncremented withValue=2
-    - http delete :8080/counter aggregateId=00000000-0000-0000-0000-000000000000 type=CounterSuspended reason="just because I can"
-    - http :8080/counter/00000000-0000-0000-0000-000000000000
-    - http :8080/counter
-    - http delete :8080/events
-    - http :8080/counter/00000000-0000-0000-0000-000000000000
-    - stop_any 80 8080
-
-  - stage: test
-    jdk: openjdk11
-    name: display-property-updates jdk11
-    script: cd $TRAVIS_BUILD_DIR && ./mvnw versions:display-property-updates -U
+    - cd $TRAVIS_BUILD_DIR && ./mvnw exec:exec
+    - cd $TRAVIS_BUILD_DIR && ./mvnw -Pjekyll-search
+    - cd $TRAVIS_BUILD_DIR && ./mvnw -Pjekyll-build
 
   - stage: deploy
-    jdk: openjdk11
-    rvm: 2.6.4
     name: GitHub release and GitHub pages deployment
     script: skip
     if: branch = "master" AND type NOT IN (pull_request)
@@ -188,7 +125,6 @@ jobs:
         condition: "$TRAVIS_PULL_REQUEST = false"
 
 cache:
-  pip: true
   bundler: true
   packages: true
   directories:

README.md

@@ -47,6 +47,26 @@ _fat jar_
 ./mvnw clean ; ./mvnw ; java -jar ./target/*-all.jar
 ```
 
+build _docs_ on my macOS:
+
+```bash
+brew reinstall libffi
+export LDFLAGS="-L/usr/local/opt/libffi/lib"
+export CPPFLAGS="-I/usr/local/opt/libffi/include"
+export PKG_CONFIG_PATH="/usr/local/opt/libffi/lib/pkgconfig"
+export PATH=$HOME/.local/share/gem/ruby/3.0.0/bin:$PATH
+gem install --user-install bundler jekyll just-the-docs
+
+./mvnw -Dbundle=`which bundle` exec:exec
+#./mvnw -Dbundle=`which bundle` -P jekyll-serve
+
+./mvnw -Dbundle=`which bundle` -P gem-install ; \
+  ./mvnw -Dbundle=`which bundle` -P bundle-update-jekyll ; \
+  ./mvnw -Dbundle=`which bundle` -P bundle-install ; \
+  ./mvnw -Dbundle=`which bundle` -P jekyll-search ; \
+  ./mvnw -Dbundle=`which bundle` -P jekyll-build
+```
+
 NOTE: _This project has been based on [GitHub: daggerok/main-starter (branch: maven-java)](https://github.com/daggerok/main-starter/tree/maven-java)_
 
 links:

docs/.gitignore

@@ -1,3 +1,4 @@
 _site
 .sass-cache
 .jekyll-metadata
+.jekyll-cache

docs/Gemfile

@@ -8,18 +8,18 @@ source "https://rubygems.org"
 #
 # This will help ensure the proper Jekyll version is running.
 # Happy Jekylling!
-gem "jekyll", "~> 3.8.6"
+gem "jekyll", "~> 4.2.0"
 
 # This is the default theme for new Jekyll sites. You may change this to anything you like.
-gem "just-the-docs", "~> 0.2.6"
+gem "just-the-docs", "~> 0.3.3"
 
 # If you want to use GitHub Pages, remove the "gem "jekyll"" above and
 # uncomment the line below. To upgrade, run `bundle update github-pages`.
 # gem "github-pages", group: :jekyll_plugins
 
 # If you have any plugins, put them here!
 group :jekyll_plugins do
-  gem "jekyll-feed", "~> 0.6"
+  gem "jekyll-feed", "~> 0.12"
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
@@ -30,5 +30,8 @@ install_if -> { RUBY_PLATFORM =~ %r!mingw|mswin|java! } do
 end
 
 # Performance-booster for watching directories on Windows
-gem "wdm", "~> 0.1.0", :install_if => Gem.win_platform?
+gem "wdm", "~> 0.1.1", :install_if => Gem.win_platform?
+
+# bundle exec jekyll serve workaround:
+gem "webrick"
 

docs/Gemfile.lock

@@ -4,80 +4,86 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     colorator (1.1.0)
-    concurrent-ruby (1.1.5)
-    em-websocket (0.5.1)
+    concurrent-ruby (1.1.8)
+    em-websocket (0.5.2)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     eventmachine (1.2.7)
-    ffi (1.11.1)
+    ffi (1.15.0)
     forwardable-extended (2.6.0)
     http_parser.rb (0.6.0)
-    i18n (0.9.5)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
-    jekyll (3.8.6)
+    jekyll (4.2.0)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
-      i18n (~> 0.7)
-      jekyll-sass-converter (~> 1.0)
+      i18n (~> 1.0)
+      jekyll-sass-converter (~> 2.0)
       jekyll-watch (~> 2.0)
-      kramdown (~> 1.14)
+      kramdown (~> 2.3)
+      kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
-      mercenary (~> 0.3.3)
+      mercenary (~> 0.4.0)
       pathutil (~> 0.9)
-      rouge (>= 1.7, < 4)
+      rouge (~> 3.0)
       safe_yaml (~> 1.0)
+      terminal-table (~> 2.0)
     jekyll-feed (0.12.1)
       jekyll (>= 3.7, < 5.0)
-    jekyll-sass-converter (1.5.2)
-      sass (~> 3.4)
-    jekyll-seo-tag (2.6.1)
-      jekyll (>= 3.3, < 5.0)
+    jekyll-sass-converter (2.1.0)
+      sassc (> 2.0.1, < 3.0)
+    jekyll-seo-tag (2.7.1)
+      jekyll (>= 3.8, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    just-the-docs (0.2.6)
-      jekyll (~> 3.8.5)
+    just-the-docs (0.3.3)
+      jekyll (>= 3.8.5)
       jekyll-seo-tag (~> 2.0)
-      rake (~> 12.3.1)
-    kramdown (1.17.0)
+      rake (>= 12.3.1, < 13.1.0)
+    kramdown (2.3.0)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
     liquid (4.0.3)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    mercenary (0.3.6)
+    listen (3.4.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    mercenary (0.4.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (4.0.1)
-    rake (12.3.3)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    public_suffix (4.0.6)
+    rake (13.0.3)
+    rb-fsevent (0.10.4)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rouge (3.9.0)
-    ruby_dep (1.5.0)
+    rexml (3.2.4)
+    rouge (3.26.0)
     safe_yaml (1.0.5)
-    sass (3.7.4)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    terminal-table (2.0.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     tzinfo-data (1.2019.2)
       tzinfo (>= 1.0.0)
+    unicode-display_width (1.7.0)
     wdm (0.1.1)
+    webrick (1.7.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  jekyll (~> 3.8.6)
-  jekyll-feed (~> 0.6)
-  just-the-docs (~> 0.2.6)
+  jekyll (~> 4.2.0)
+  jekyll-feed (~> 0.12)
+  just-the-docs (~> 0.3.3)
   tzinfo (~> 1.2)
   tzinfo-data
-  wdm (~> 0.1.0)
+  wdm (~> 0.1.1)
+  webrick
 
 BUNDLED WITH
-   2.0.2
+   2.2.14