[struts-site] branch dependabot/bundler/addressable-2.8.1 created (now dab545215)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/bundler/addressable-2.8.1 in repository https://gitbox.apache.org/repos/asf/struts-site.git at dab545215 Bump addressable from 2.7.0 to 2.8.1 No new revisions were added by this update.
[struts-examples] branch master updated: Adjust example to expose problem with processing action: prefix Refers to WW-5238
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts-examples.git
The following commit(s) were added to refs/heads/master by this push:
new b600a63 Adjust example to expose problem with processing action:
prefix Refers to WW-5238
b600a63 is described below
commit b600a6301c53ad9c9e854d2b1f820377eefb0d8a
Author: Lukasz Lenart
AuthorDate: Thu Oct 6 09:38:29 2022 +0200
Adjust example to expose problem with processing action: prefix
Refers to WW-5238
---
.../java/org/apache/struts/register/action/Register.java | 4 ++--
form-processing/src/main/resources/struts.xml | 14 +++---
form-processing/src/main/webapp/WEB-INF/register.jsp | 2 +-
form-processing/src/main/webapp/WEB-INF/web.xml| 6 +-
4 files changed, 15 insertions(+), 11 deletions(-)
diff --git
a/form-processing/src/main/java/org/apache/struts/register/action/Register.java
b/form-processing/src/main/java/org/apache/struts/register/action/Register.java
index 98eb692..bfa99db 100644
---
a/form-processing/src/main/java/org/apache/struts/register/action/Register.java
+++
b/form-processing/src/main/java/org/apache/struts/register/action/Register.java
@@ -7,12 +7,12 @@ public class Register extends ActionSupport {
private Person personBean;
-public String execute() throws Exception {
+public String execute2() throws Exception {
//call Service class to store personBean's state in database
return SUCCESS;
}
-public String cancel() throws Exception {
+public String cancel2() throws Exception {
return SUCCESS;
}
diff --git a/form-processing/src/main/resources/struts.xml
b/form-processing/src/main/resources/struts.xml
index 2addd1a..56f4999 100644
--- a/form-processing/src/main/resources/struts.xml
+++ b/form-processing/src/main/resources/struts.xml
@@ -7,7 +7,15 @@
-
+
+
+
+test/index
+
+
+
+
+
@@ -25,10 +33,10 @@
/WEB-INF/register.jsp
-
+
index
-
+
/WEB-INF/thankyou.jsp
diff --git a/form-processing/src/main/webapp/WEB-INF/register.jsp
b/form-processing/src/main/webapp/WEB-INF/register.jsp
index 7750abb..5f17f61 100644
--- a/form-processing/src/main/webapp/WEB-INF/register.jsp
+++ b/form-processing/src/main/webapp/WEB-INF/register.jsp
@@ -9,7 +9,7 @@
Register for a prize by completing this form.
-
+
diff --git a/form-processing/src/main/webapp/WEB-INF/web.xml
b/form-processing/src/main/webapp/WEB-INF/web.xml
index 90088a1..3ea49e9 100644
--- a/form-processing/src/main/webapp/WEB-INF/web.xml
+++ b/form-processing/src/main/webapp/WEB-INF/web.xml
@@ -3,10 +3,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";>
Form_Processing_Struts2_Mvn
-
-index.jsp
-
-
struts2
@@ -19,7 +15,7 @@
-/index
+test/index
[struts-site] branch master updated: Uses fixed version of Ruby 2.7.6 and upgrades Bundler to 2.3.13
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/master by this push:
new a1717e633 Uses fixed version of Ruby 2.7.6 and upgrades Bundler to
2.3.13
a1717e633 is described below
commit a1717e63346024cc44f4ad6fc7041847e8066c4f
Author: Lukasz Lenart
AuthorDate: Thu Oct 6 10:55:27 2022 +0200
Uses fixed version of Ruby 2.7.6 and upgrades Bundler to 2.3.13
---
.gitignore | 1 +
Gemfile.lock | 70 +---
Jenkinsfile | 4 +++-
3 files changed, 47 insertions(+), 28 deletions(-)
diff --git a/.gitignore b/.gitignore
index 15690204f..5aa5ce38d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ content
target
.bundle
.jekyll-metadata
+.jekyll-cache
_site
.project
.settings/
diff --git a/Gemfile.lock b/Gemfile.lock
index 9ad60d1bc..6a10d368d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,53 +1,69 @@
GEM
remote: https://rubygems.org/
specs:
-addressable (2.7.0)
- public_suffix (>= 2.0.2, < 5.0)
+addressable (2.8.1)
+ public_suffix (>= 2.0.2, < 6.0)
colorator (1.1.0)
-ffi (1.11.1)
+concurrent-ruby (1.1.10)
+em-websocket (0.5.3)
+ eventmachine (>= 0.12.9)
+ http_parser.rb (~> 0)
+eventmachine (1.2.7)
+ffi (1.15.5)
forwardable-extended (2.6.0)
-jekyll (3.6.3)
+http_parser.rb (0.8.0)
+i18n (1.12.0)
+ concurrent-ruby (~> 1.0)
+jekyll (4.2.2)
addressable (~> 2.4)
colorator (~> 1.0)
- jekyll-sass-converter (~> 1.0)
- jekyll-watch (~> 1.1)
- kramdown (~> 1.14)
+ em-websocket (~> 0.5)
+ i18n (~> 1.0)
+ jekyll-sass-converter (~> 2.0)
+ jekyll-watch (~> 2.0)
+ 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, < 3)
+ rouge (~> 3.0)
safe_yaml (~> 1.0)
-jekyll-sass-converter (1.5.2)
- sass (~> 3.4)
-jekyll-watch (1.5.1)
+ terminal-table (~> 2.0)
+jekyll-sass-converter (2.2.0)
+ sassc (> 2.0.1, < 3.0)
+jekyll-watch (2.2.1)
listen (~> 3.0)
-json (2.1.0)
-kramdown (1.17.0)
+json (2.6.2)
+kramdown (2.4.0)
+ rexml
+kramdown-parser-gfm (1.1.0)
+ kramdown (~> 2.0)
liquid (4.0.3)
-listen (3.2.0)
+listen (3.7.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
-mercenary (0.3.6)
+mercenary (0.4.0)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
-public_suffix (4.0.1)
-rb-fsevent (0.10.3)
-rb-inotify (0.10.0)
+public_suffix (5.0.0)
+rb-fsevent (0.11.2)
+rb-inotify (0.10.1)
ffi (~> 1.0)
-rouge (2.2.1)
+rexml (3.2.5)
+rouge (3.30.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)
+unicode-display_width (1.8.0)
PLATFORMS
- ruby
+ x86_64-darwin-21
DEPENDENCIES
jekyll
json
BUNDLED WITH
- 2.1.4
+ 2.3.13
diff --git a/Jenkinsfile b/Jenkinsfile
index 937ecfd54..379a744ca 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -22,8 +22,10 @@ pipeline {
echo Generiting a new version of website
curl -sSL https://get.rvm.io | bash -s -- --path ${RUBY_PATH}
+ rvm install 2.7.6
+
mkdir -p ${GEM_HOME}
- gem install --install-dir ${GEM_HOME} bundler -v '2.1.4'
+ gem install --install-dir ${GEM_HOME} bundler -v '2.3.13'
bundle install --path ${GEM_HOME}
bundle
[struts-site] branch master updated: Adds missing search path to rvm
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/master by this push:
new b5fc1379e Adds missing search path to rvm
b5fc1379e is described below
commit b5fc1379ecf8a225e830001233d624a63873b0f3
Author: Lukasz Lenart
AuthorDate: Thu Oct 6 12:05:05 2022 +0200
Adds missing search path to rvm
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 379a744ca..15ee3113f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -13,7 +13,7 @@ pipeline {
environment {
RUBY_PATH="${env.WORKSPACE_TMP}/.rvm"
GEM_HOME="${RUBY_PATH}/gems"
-PATH="${GEM_HOME}/bin:${env.PATH}"
+PATH="${RUBY_PATH}/bin:${GEM_HOME}/bin:${env.PATH}"
}
stages {
stage('Build a staged website') {
[struts-site] branch master updated: Reorders path and cleans up before installing rvm
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/master by this push:
new 52d6de5d3 Reorders path and cleans up before installing rvm
52d6de5d3 is described below
commit 52d6de5d3afb355f1333287b19f47d06b332c3e2
Author: Lukasz Lenart
AuthorDate: Thu Oct 6 12:26:52 2022 +0200
Reorders path and cleans up before installing rvm
---
Jenkinsfile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 15ee3113f..49f015a5e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -13,14 +13,14 @@ pipeline {
environment {
RUBY_PATH="${env.WORKSPACE_TMP}/.rvm"
GEM_HOME="${RUBY_PATH}/gems"
-PATH="${RUBY_PATH}/bin:${GEM_HOME}/bin:${env.PATH}"
+PATH="${GEM_HOME}/bin:${RUBY_PATH}/bin:${env.PATH}"
}
stages {
stage('Build a staged website') {
steps {
sh """
- echo Generiting a new version of website
-
+ echo Generiting a new version of website
+ rm -rv ${RUBY_PATH}
curl -sSL https://get.rvm.io | bash -s -- --path ${RUBY_PATH}
rvm install 2.7.6
[struts-site] branch master updated: Stops installing rvm
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/master by this push:
new dc2c86bf5 Stops installing rvm
dc2c86bf5 is described below
commit dc2c86bf5d69621594847d9d602080651e057f58
Author: Lukasz Lenart
AuthorDate: Thu Oct 6 12:41:39 2022 +0200
Stops installing rvm
---
Jenkinsfile | 7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 49f015a5e..42c6f5cf5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,17 +11,14 @@ pipeline {
skipStagesAfterUnstable()
}
environment {
-RUBY_PATH="${env.WORKSPACE_TMP}/.rvm"
-GEM_HOME="${RUBY_PATH}/gems"
-PATH="${GEM_HOME}/bin:${RUBY_PATH}/bin:${env.PATH}"
+GEM_HOME="${env.WORKSPACE_TMP}/gems"
+PATH="${GEM_HOME}/bin:${env.PATH}"
}
stages {
stage('Build a staged website') {
steps {
sh """
echo Generiting a new version of website
- rm -rv ${RUBY_PATH}
- curl -sSL https://get.rvm.io | bash -s -- --path ${RUBY_PATH}
rvm install 2.7.6
mkdir -p ${GEM_HOME}
[struts-site] branch master updated: Uses Docker to build staged site
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts-site.git
The following commit(s) were added to refs/heads/master by this push:
new 738e1a04d Uses Docker to build staged site
738e1a04d is described below
commit 738e1a04d0c47f9ecd8eb4f7c69b5c4fcebfee38
Author: Lukasz Lenart
AuthorDate: Fri Oct 7 08:54:37 2022 +0200
Uses Docker to build staged site
---
Gemfile.lock | 6 +++---
Jenkinsfile| 13 +
docker-build.fish | 5 -
docker-build.sh| 2 +-
docker-run.fish| 3 ---
docker-run.sh | 5 -
docker/Dockerfile | 21 -
source/_plugins/remote_file_content.rb | 2 +-
8 files changed, 10 insertions(+), 47 deletions(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index 6a10d368d..31c2f9b4a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -33,7 +33,7 @@ GEM
sassc (> 2.0.1, < 3.0)
jekyll-watch (2.2.1)
listen (~> 3.0)
-json (2.6.2)
+json (2.6.1)
kramdown (2.4.0)
rexml
kramdown-parser-gfm (1.1.0)
@@ -59,11 +59,11 @@ GEM
unicode-display_width (1.8.0)
PLATFORMS
- x86_64-darwin-21
+ x86_64-linux-musl
DEPENDENCIES
jekyll
json
BUNDLED WITH
- 2.3.13
+ 2.3.22
diff --git a/Jenkinsfile b/Jenkinsfile
index 42c6f5cf5..5a7eca8a5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -16,16 +16,13 @@ pipeline {
}
stages {
stage('Build a staged website') {
+ agent {
+docker {
+ image 'jekyll/jekyll:4.2.2'
+}
+ }
steps {
sh """
- echo Generiting a new version of website
- rvm install 2.7.6
-
- mkdir -p ${GEM_HOME}
- gem install --install-dir ${GEM_HOME} bundler -v '2.3.13'
-
- bundle install --path ${GEM_HOME}
- bundle
bundle exec jekyll build
"""
}
diff --git a/docker-build.fish b/docker-build.fish
deleted file mode 100755
index f950c1130..0
--- a/docker-build.fish
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/local/bin/fish
-set -x JEKYLL_VERSION 3.8
-
-docker run --rm -v $PWD:/srv/jekyll -it jekyll/jekyll:$JEKYLL_VERSION jekyll
build
-
diff --git a/docker-build.sh b/docker-build.sh
index f33173811..95277602e 100755
--- a/docker-build.sh
+++ b/docker-build.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-export JEKYLL_VERSION=3.8
+export JEKYLL_VERSION=4.2.2
docker run --rm -v $PWD:/srv/jekyll -it jekyll/jekyll:$JEKYLL_VERSION jekyll
build
diff --git a/docker-run.fish b/docker-run.fish
deleted file mode 100755
index 94e0a8843..0
--- a/docker-run.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/local/bin/fish
-
-docker run --rm -v $PWD:/srv/jekyll -it -p 4000:4000 jekyll/jekyll:3.8 jekyll
serve --watch --trace --host 0.0.0.0 --force_polling --incremental
diff --git a/docker-run.sh b/docker-run.sh
deleted file mode 100755
index ff1efab5b..0
--- a/docker-run.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-export JEKYLL_VERSION=3.8
-
-docker run --rm -v $PWD:/srv/jekyll -it -p 4000:4000
jekyll/jekyll:$JEKYLL_VERSION jekyll serve --watch --trace --host 0.0.0.0
--force_polling --incremental
-
diff --git a/docker/Dockerfile b/docker/Dockerfile
deleted file mode 100644
index eb4303a59..0
--- a/docker/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM alpine
-MAINTAINER Lukasz Lenart
-LABEL Description="This image is used to support building Apache Struts main
website"
-RUN \
- apk update && \
- apk upgrade && \
- apk add bash sudo curl-dev ruby-dev build-base libffi-dev && \
- apk add ruby ruby-io-console ruby-bundler nodejs && \
- gem clean && gem install bundler io-console --pre --no-document && \
- sudo rm -rf /usr/lib/ruby/gems/*/cache/*.gem && \
- rm -rf /var/cache/apk/* && \
- addgroup -S -g 1000 jekyll && \
- adduser -S -G jekyll -u 1000 -h /home/jekyll -D jekyll && \
- mkdir -p /srv/jekyll && \
- chown jekyll:jekyll /srv/jekyll && \
- echo "jekyll ALL=NOPASSWD:ALL" >> /etc/sudoers
-
-EXPOSE 4000
-WORKDIR /srv/jekyll
-USER jekyll
-ENTRYPOINT bundle install && bundle exec jekyll build && bundle exec jekyll
serve --watch --trace --host=0.0.0.0 --force_polling --incremental
diff --git a/source/_plugins/remote_file_content.rb
b/source/_plugins/remote_file_content.rb
index b81e1b7ca..090dddf94 100644
--- a/source/_plugins/remote_file_content.rb
+++ b/source/_plugins/remote_file_content.rb
@@ -28,7 +28,7 @@ module Jekyll
end
def fetchContent(url)
- Net::HTTP.get(URI.parse(URI.encode(url.strip)))
+ Net::HTTP.get(URI.parse(url.strip))
end
end
end
