[1/4] struts-site git commit: Switches to Alpine Linux to reduce size

2016-03-14 Thread lukaszlenart 
Repository: struts-site
Updated Branches:
  refs/heads/master d4509abb7 -> 7f6817166


Switches to Alpine Linux to reduce size


Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/7f681716
Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/7f681716
Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/7f681716

Branch: refs/heads/master
Commit: 7f6817166ace7b4e475c90e417c5c1b792016a59
Parents: b33eee4
Author: Lukasz Lenart 
Authored: Mon Mar 14 17:26:29 2016 +0100
Committer: Lukasz Lenart 
Committed: Mon Mar 14 17:35:27 2016 +0100

--
 Gemfile  |  3 ++-
 Gemfile.lock |  2 ++
 docker/Dockerfile| 63 +++
 docker/run-jekyll.sh |  4 ---
 4 files changed, 18 insertions(+), 54 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts-site/blob/7f681716/Gemfile
--
diff --git a/Gemfile b/Gemfile
index a8af254..00fc2c7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 
-ruby '2.2.3'
+ruby '2.2.4'
 
+gem 'json', '>= 1'
 gem 'jekyll', '~> 3'

http://git-wip-us.apache.org/repos/asf/struts-site/blob/7f681716/Gemfile.lock
--
diff --git a/Gemfile.lock b/Gemfile.lock
index 12f4dba..6956446 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -16,6 +16,7 @@ GEM
   sass (~> 3.4)
 jekyll-watch (1.3.1)
   listen (~> 3.0)
+json (1.8.3)
 kramdown (1.10.0)
 liquid (3.0.6)
 listen (3.0.6)
@@ -34,6 +35,7 @@ PLATFORMS
 
 DEPENDENCIES
   jekyll (~> 3)
+  json (>= 1)
 
 BUNDLED WITH
1.11.2

http://git-wip-us.apache.org/repos/asf/struts-site/blob/7f681716/docker/Dockerfile
--
diff --git a/docker/Dockerfile b/docker/Dockerfile
index ca7c0dc..8f85eca 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,58 +1,23 @@
-FROM debian
+FROM alpine
 MAINTAINER Lukasz Lenart 
 LABEL Description="This image is used to support building Apache Struts main 
website"
 RUN \
-  apt-get update && \
-  apt-get install -y \
-make \
-gcc \
-sudo \
-netcat \
-iproute \
-net-tools \
-vim \
-bzip2 \
-git-core \
-libssl-dev \
-libreadline-dev \
-zlib1g-dev \
-node \
-curl && \
-  apt-get clean && \
+  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 --no-document && \
+  sudo rm -rf /usr/lib/ruby/gems/*/cache/*.gem && \
 
-  addgroup --system --gid 1000 jekyll &&  \
-  adduser --system --ingroup jekyll --uid 1000 --home /home/jekyll 
--disabled-password jekyll && \
+  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
-ADD run-jekyll.sh /usr/bin/run-jekyll.sh
-WORKDIR /srv/jekyll
+
 EXPOSE 4000
+WORKDIR /srv/jekyll
 USER jekyll
-RUN \
-  cd && \
-  
-  git clone git://github.com/sstephenson/rbenv.git .rbenv && \
-  echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.profile && \
-  echo 'eval "$(rbenv init -)"' >> ~/.profile && \
-  . ~/.profile && \
-
-  git clone git://github.com/sstephenson/ruby-build.git 
~/.rbenv/plugins/ruby-build && \
-  echo 'export PATH="$HOME/.rbenv/plugins/ruby-build/bin:$PATH"' >> ~/.profile 
&& \
-  . ~/.profile && \
-
-  git clone https://github.com/sstephenson/rbenv-gem-rehash.git 
~/.rbenv/plugins/rbenv-gem-rehash && \
-
-  rbenv install 2.2.3 && \
-  rbenv global 2.2.3 && \
-  ruby -v && \
-  echo "gem: --no-ri --no-rdoc" > ~/.gemrc && \
-
-  gem clean && gem install bundler --no-document && \
-  
-  sudo rm -rf /usr/lib/ruby/gems/*/cache/*.gem
-ENV HOME /home/jekyll
-ENV PATH ${PATH}:${HOME}/.rbenv/plugins/ruby-build/bin
-ENV PATH ${PATH}:${HOME}/.rbenv/bin
-ENV PATH ${PATH}:${HOME}/.rbenv/shims
-ENTRYPOINT ["/usr/bin/run-jekyll.sh"]
+ENTRYPOINT bundle install && bundle exec jekyll serve --watch --trace 
--host=0.0.0.0

http://git-wip-us.apache.org/repos/asf/struts-site/blob/7f681716/docker/run-jekyll.sh
--
diff --git a/docker/run-jekyll.sh b/docker/run-jekyll.sh
deleted file mode 100755
index c0cc54f..000
--- a/docker/run-jekyll.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-bundle install
-bundle exec jekyll serve --watch --trace --host=0.0.0.0

[4/4] struts-site git commit: Uses dedicated shell script to start Jekyll

2016-03-14 Thread lukaszlenart 
Uses dedicated shell script to start Jekyll


Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/3a87e1b5
Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/3a87e1b5
Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/3a87e1b5

Branch: refs/heads/master
Commit: 3a87e1b5b34cd198ca59c101138737c2e632be7a
Parents: d4509ab
Author: Lukasz Lenart 
Authored: Fri Mar 4 11:51:15 2016 +0100
Committer: Lukasz Lenart 
Committed: Mon Mar 14 17:35:27 2016 +0100

--
 docker/Dockerfile| 3 ++-
 docker/run-jekyll.sh | 4 
 2 files changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/struts-site/blob/3a87e1b5/docker/Dockerfile
--
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 58738cf..ca7c0dc 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -25,6 +25,7 @@ RUN \
   mkdir -p /srv/jekyll && \
   chown jekyll:jekyll /srv/jekyll && \
   echo "jekyll ALL=NOPASSWD:ALL" >> /etc/sudoers
+ADD run-jekyll.sh /usr/bin/run-jekyll.sh
 WORKDIR /srv/jekyll
 EXPOSE 4000
 USER jekyll
@@ -54,4 +55,4 @@ ENV HOME /home/jekyll
 ENV PATH ${PATH}:${HOME}/.rbenv/plugins/ruby-build/bin
 ENV PATH ${PATH}:${HOME}/.rbenv/bin
 ENV PATH ${PATH}:${HOME}/.rbenv/shims
-CMD ["bundle", "exec", "jekyll", "serve", "--watch", "--trace", 
"--host=0.0.0.0"]
\ No newline at end of file
+ENTRYPOINT ["/usr/bin/run-jekyll.sh"]

http://git-wip-us.apache.org/repos/asf/struts-site/blob/3a87e1b5/docker/run-jekyll.sh
--
diff --git a/docker/run-jekyll.sh b/docker/run-jekyll.sh
new file mode 100755
index 000..c0cc54f
--- /dev/null
+++ b/docker/run-jekyll.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+bundle install
+bundle exec jekyll serve --watch --trace --host=0.0.0.0

[3/4] struts-site git commit: Simplifies run scripts

2016-03-14 Thread lukaszlenart 
Simplifies run scripts


Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/b33eee40
Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/b33eee40
Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/b33eee40

Branch: refs/heads/master
Commit: b33eee403faa382bcfb316617d6bafca9ae06ecb
Parents: bb6a626
Author: Lukasz Lenart 
Authored: Fri Mar 4 11:52:09 2016 +0100
Committer: Lukasz Lenart 
Committed: Mon Mar 14 17:35:27 2016 +0100

--
 docker-run.fish | 2 +-
 docker-run.sh   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts-site/blob/b33eee40/docker-run.fish
--
diff --git a/docker-run.fish b/docker-run.fish
index 2c3f69e..1cb2809 100755
--- a/docker-run.fish
+++ b/docker-run.fish
@@ -1,2 +1,2 @@
 #!/usr/local/bin/fish
-docker run -v $PWD:/srv/jekyll -it -p 4000:4000 
theapachestruts/struts-site-jekyll bundle exec jekyll serve --watch --trace 
--host=0.0.0.0 --force_polling
+docker run -v $PWD:/srv/jekyll -it -p 4000:4000 
theapachestruts/struts-site-jekyll

http://git-wip-us.apache.org/repos/asf/struts-site/blob/b33eee40/docker-run.sh
--
diff --git a/docker-run.sh b/docker-run.sh
index 64d3a9b..3e5d930 100755
--- a/docker-run.sh
+++ b/docker-run.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-docker run -v $(pwd):/srv/jekyll -it -p 4000:4000 
theapachestruts/struts-site-jekyll bundle exec jekyll serve --watch --trace 
--host=0.0.0.0 --force_polling
+docker run -v $(pwd):/srv/jekyll -it -p 4000:4000 
theapachestruts/struts-site-jekyll

[2/4] struts-site git commit: Upgrades to Jekyll 3

2016-03-14 Thread lukaszlenart 
Upgrades to Jekyll 3


Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/bb6a626a
Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/bb6a626a
Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/bb6a626a

Branch: refs/heads/master
Commit: bb6a626aa7cc63bf99b03958f8826e9672c780f8
Parents: 3a87e1b
Author: Lukasz Lenart 
Authored: Fri Mar 4 11:51:30 2016 +0100
Committer: Lukasz Lenart 
Committed: Mon Mar 14 17:35:27 2016 +0100

--
 Gemfile  |  2 +-
 Gemfile.lock | 71 ---
 _config.yml  | 17 ++---
 3 files changed, 28 insertions(+), 62 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts-site/blob/bb6a626a/Gemfile
--
diff --git a/Gemfile b/Gemfile
index cc68592..a8af254 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 ruby '2.2.3'
 
-gem 'jekyll', '~> 2'
+gem 'jekyll', '~> 3'

http://git-wip-us.apache.org/repos/asf/struts-site/blob/bb6a626a/Gemfile.lock
--
diff --git a/Gemfile.lock b/Gemfile.lock
index 757f503..12f4dba 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,70 +1,39 @@
 GEM
   remote: https://rubygems.org/
   specs:
-blankslate (2.1.2.4)
-celluloid (0.16.0)
-  timers (~> 4.0.0)
-classifier-reborn (2.0.3)
-  fast-stemmer (~> 1.0)
-coffee-script (2.3.0)
-  coffee-script-source
-  execjs
-coffee-script-source (1.9.1)
 colorator (0.1)
-execjs (2.3.0)
-fast-stemmer (1.0.2)
-ffi (1.9.6)
-hitimes (1.2.2)
-jekyll (2.5.3)
-  classifier-reborn (~> 2.0)
+ffi (1.9.10)
+jekyll (3.1.2)
   colorator (~> 0.1)
-  jekyll-coffeescript (~> 1.0)
-  jekyll-gist (~> 1.0)
-  jekyll-paginate (~> 1.0)
   jekyll-sass-converter (~> 1.0)
   jekyll-watch (~> 1.1)
   kramdown (~> 1.3)
-  liquid (~> 2.6.1)
+  liquid (~> 3.0)
   mercenary (~> 0.3.3)
-  pygments.rb (~> 0.6.0)
-  redcarpet (~> 3.1)
+  rouge (~> 1.7)
   safe_yaml (~> 1.0)
-  toml (~> 0.1.0)
-jekyll-coffeescript (1.0.1)
-  coffee-script (~> 2.2)
-jekyll-gist (1.1.0)
-jekyll-paginate (1.1.0)
-jekyll-sass-converter (1.3.0)
-  sass (~> 3.2)
-jekyll-watch (1.2.1)
-  listen (~> 2.7)
-kramdown (1.5.0)
-liquid (2.6.2)
-listen (2.8.5)
-  celluloid (>= 0.15.2)
+jekyll-sass-converter (1.4.0)
+  sass (~> 3.4)
+jekyll-watch (1.3.1)
+  listen (~> 3.0)
+kramdown (1.10.0)
+liquid (3.0.6)
+listen (3.0.6)
   rb-fsevent (>= 0.9.3)
-  rb-inotify (>= 0.9)
+  rb-inotify (>= 0.9.7)
 mercenary (0.3.5)
-parslet (1.5.0)
-  blankslate (~> 2.0)
-posix-spawn (0.3.10)
-pygments.rb (0.6.2)
-  posix-spawn (~> 0.3.6)
-  yajl-ruby (~> 1.2.0)
-rb-fsevent (0.9.4)
-rb-inotify (0.9.5)
+rb-fsevent (0.9.7)
+rb-inotify (0.9.7)
   ffi (>= 0.5.0)
-redcarpet (3.2.2)
+rouge (1.10.1)
 safe_yaml (1.0.4)
-sass (3.4.12)
-timers (4.0.1)
-  hitimes
-toml (0.1.2)
-  parslet (~> 1.5.0)
-yajl-ruby (1.2.1)
+sass (3.4.21)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  jekyll (~> 2)
+  jekyll (~> 3)
+
+BUNDLED WITH
+   1.11.2

http://git-wip-us.apache.org/repos/asf/struts-site/blob/bb6a626a/_config.yml
--
diff --git a/_config.yml b/_config.yml
index cbac87d..e9e00fe 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,7 +1,6 @@
 name:   Apache Struts
 markdown:   kramdown
 markdown_ext:   md
-highlighter:pygments
 source: source
 destination:content
 encoding:   UTF-8
@@ -11,15 +10,13 @@ kramdown:
   entity_output: as_char
   toc_levels:1..6
   smart_quotes:  lsquo,rsquo,ldquo,rdquo
-  use_coderay:   true
-
-  coderay:
-coderay_wrap:  div
-coderay_line_numbers:  inline
-coderay_line_number_start: 1
-coderay_tab_width: 4
-coderay_bold_every:10
-coderay_css:   style
+  syntax_highlighter_opts:
+wrap:  div
+line_numbers:  inline
+line_number_start: 1
+tab_width: 4
+bold_every:10
+css:   style
 
 # Defines root of the site:
 # "" - when you want to deploy to production

svn commit: r12740 - /dev/struts/2.3.26/

2016-03-14 Thread lukaszlenart 
Author: lukaszlenart
Date: Mon Mar 14 11:46:21 2016
New Revision: 12740

Log:
Updates test release 2.3.26

Added:
dev/struts/2.3.26/
dev/struts/2.3.26/struts-2.3.26-all.zip   (with props)
dev/struts/2.3.26/struts-2.3.26-all.zip.asc   (with props)
dev/struts/2.3.26/struts-2.3.26-all.zip.md5
dev/struts/2.3.26/struts-2.3.26-all.zip.sha1
dev/struts/2.3.26/struts-2.3.26-apps.zip   (with props)
dev/struts/2.3.26/struts-2.3.26-apps.zip.asc   (with props)
dev/struts/2.3.26/struts-2.3.26-apps.zip.md5
dev/struts/2.3.26/struts-2.3.26-apps.zip.sha1
dev/struts/2.3.26/struts-2.3.26-docs.zip   (with props)
dev/struts/2.3.26/struts-2.3.26-docs.zip.asc   (with props)
dev/struts/2.3.26/struts-2.3.26-docs.zip.md5
dev/struts/2.3.26/struts-2.3.26-docs.zip.sha1
dev/struts/2.3.26/struts-2.3.26-lib.zip   (with props)
dev/struts/2.3.26/struts-2.3.26-lib.zip.asc   (with props)
dev/struts/2.3.26/struts-2.3.26-lib.zip.md5
dev/struts/2.3.26/struts-2.3.26-lib.zip.sha1
dev/struts/2.3.26/struts-2.3.26-min-lib.zip   (with props)
dev/struts/2.3.26/struts-2.3.26-min-lib.zip.asc   (with props)
dev/struts/2.3.26/struts-2.3.26-min-lib.zip.md5
dev/struts/2.3.26/struts-2.3.26-min-lib.zip.sha1
dev/struts/2.3.26/struts-2.3.26-src.zip   (with props)
dev/struts/2.3.26/struts-2.3.26-src.zip.asc   (with props)
dev/struts/2.3.26/struts-2.3.26-src.zip.md5
dev/struts/2.3.26/struts-2.3.26-src.zip.sha1

Added: dev/struts/2.3.26/struts-2.3.26-all.zip
==
Binary file - no diff available.

Propchange: dev/struts/2.3.26/struts-2.3.26-all.zip
--
svn:mime-type = application/zip

Added: dev/struts/2.3.26/struts-2.3.26-all.zip.asc
==
Binary file - no diff available.

Propchange: dev/struts/2.3.26/struts-2.3.26-all.zip.asc
--
svn:mime-type = application/pgp-signature

Added: dev/struts/2.3.26/struts-2.3.26-all.zip.md5
==
--- dev/struts/2.3.26/struts-2.3.26-all.zip.md5 (added)
+++ dev/struts/2.3.26/struts-2.3.26-all.zip.md5 Mon Mar 14 11:46:21 2016
@@ -0,0 +1 @@
+0f0f11dd8184b1d83cfb474b26f3b46d
\ No newline at end of file

Added: dev/struts/2.3.26/struts-2.3.26-all.zip.sha1
==
--- dev/struts/2.3.26/struts-2.3.26-all.zip.sha1 (added)
+++ dev/struts/2.3.26/struts-2.3.26-all.zip.sha1 Mon Mar 14 11:46:21 2016
@@ -0,0 +1 @@
+ef399e18b58aac7035e5cdbc8dd2e759f4dcb2f4
\ No newline at end of file

Added: dev/struts/2.3.26/struts-2.3.26-apps.zip
==
Binary file - no diff available.

Propchange: dev/struts/2.3.26/struts-2.3.26-apps.zip
--
svn:mime-type = application/zip

Added: dev/struts/2.3.26/struts-2.3.26-apps.zip.asc
==
Binary file - no diff available.

Propchange: dev/struts/2.3.26/struts-2.3.26-apps.zip.asc
--
svn:mime-type = application/pgp-signature

Added: dev/struts/2.3.26/struts-2.3.26-apps.zip.md5
==
--- dev/struts/2.3.26/struts-2.3.26-apps.zip.md5 (added)
+++ dev/struts/2.3.26/struts-2.3.26-apps.zip.md5 Mon Mar 14 11:46:21 2016
@@ -0,0 +1 @@
+e53d072218864238f1467b9075654ca2
\ No newline at end of file

Added: dev/struts/2.3.26/struts-2.3.26-apps.zip.sha1
==
--- dev/struts/2.3.26/struts-2.3.26-apps.zip.sha1 (added)
+++ dev/struts/2.3.26/struts-2.3.26-apps.zip.sha1 Mon Mar 14 11:46:21 2016
@@ -0,0 +1 @@
+c11d9e7a3d6a0d47105d2cf0270b0c05311637b3
\ No newline at end of file

Added: dev/struts/2.3.26/struts-2.3.26-docs.zip
==
Binary file - no diff available.

Propchange: dev/struts/2.3.26/struts-2.3.26-docs.zip
--
svn:mime-type = application/zip

Added: dev/struts/2.3.26/struts-2.3.26-docs.zip.asc
==
Binary file - no diff available.

Propchange: dev/struts/2.3.26/struts-2.3.26-docs.zip.asc
--
svn:mime-type = application/pgp-signature

Added: dev/struts/2.3.26/struts-2.3.26-docs.zip.md5

struts git commit: [maven-release-plugin] prepare for next development iteration

2016-03-14 Thread lukaszlenart 
Repository: struts
Updated Branches:
  refs/heads/support-2-3 013077abc -> 94c446265


[maven-release-plugin] prepare for next development iteration


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/94c44626
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/94c44626
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/94c44626

Branch: refs/heads/support-2-3
Commit: 94c44626588cbafc39507550ea37fab2b679d7d1
Parents: 013077a
Author: Lukasz Lenart 
Authored: Mon Mar 14 11:39:11 2016 +0100
Committer: Lukasz Lenart 
Committed: Mon Mar 14 11:39:11 2016 +0100

--
 apps/blank/pom.xml  | 2 +-
 apps/jboss-blank/pom.xml| 2 +-
 apps/mailreader/pom.xml | 2 +-
 apps/pom.xml| 2 +-
 apps/portlet/pom.xml| 2 +-
 apps/rest-showcase/pom.xml  | 4 ++--
 apps/showcase/pom.xml   | 2 +-
 archetypes/pom.xml  | 2 +-
 archetypes/struts2-archetype-angularjs/pom.xml  | 2 +-
 archetypes/struts2-archetype-blank/pom.xml  | 2 +-
 archetypes/struts2-archetype-convention/pom.xml | 2 +-
 archetypes/struts2-archetype-dbportlet/pom.xml  | 2 +-
 archetypes/struts2-archetype-plugin/pom.xml | 2 +-
 archetypes/struts2-archetype-portlet/pom.xml| 2 +-
 archetypes/struts2-archetype-starter/pom.xml| 2 +-
 assembly/pom.xml| 2 +-
 bom/pom.xml | 6 +++---
 bundles/admin/pom.xml   | 2 +-
 bundles/demo/pom.xml| 2 +-
 bundles/pom.xml | 2 +-
 core/pom.xml| 2 +-
 plugins/cdi/pom.xml | 2 +-
 plugins/codebehind/pom.xml  | 2 +-
 plugins/config-browser/pom.xml  | 2 +-
 plugins/convention/pom.xml  | 2 +-
 plugins/dojo/pom.xml| 2 +-
 plugins/dwr/pom.xml | 2 +-
 plugins/embeddedjsp/pom.xml | 2 +-
 plugins/gxp/pom.xml | 2 +-
 plugins/jasperreports/pom.xml   | 2 +-
 plugins/java8-support/pom.xml   | 2 +-
 plugins/javatemplates/pom.xml   | 2 +-
 plugins/jfreechart/pom.xml  | 2 +-
 plugins/jsf/pom.xml | 2 +-
 plugins/json/pom.xml| 2 +-
 plugins/junit/pom.xml   | 2 +-
 plugins/osgi/pom.xml| 2 +-
 plugins/oval/pom.xml| 2 +-
 plugins/pell-multipart/pom.xml  | 2 +-
 plugins/plexus/pom.xml  | 2 +-
 plugins/pom.xml | 2 +-
 plugins/portlet-tiles/pom.xml   | 2 +-
 plugins/portlet/pom.xml | 2 +-
 plugins/rest/pom.xml| 2 +-
 plugins/sitegraph/pom.xml   | 2 +-
 plugins/sitemesh/pom.xml| 2 +-
 plugins/spring/pom.xml  | 2 +-
 plugins/struts1/pom.xml | 2 +-
 plugins/testng/pom.xml  | 2 +-
 plugins/tiles/pom.xml   | 2 +-
 plugins/tiles3/pom.xml  | 2 +-
 pom.xml | 4 ++--
 xwork-core/pom.xml  | 2 +-
 53 files changed, 57 insertions(+), 57 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/94c44626/apps/blank/pom.xml
--
diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml
index 9ce1249..060cc2a 100644
--- a/apps/blank/pom.xml
+++ b/apps/blank/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-apps
-2.3.26
+2.3.27-SNAPSHOT
 
 
 struts2-blank

http://git-wip-us.apache.org/repos/asf/struts/blob/94c44626/apps/jboss-blank/pom.xml
--
diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml
index 767ab10..3c9a4c7 100644
--- a/apps/jboss-blank/pom.xml
+++ b/apps/jboss-blank/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-apps
-2.3.26
+2.3.27-SNAPSHOT
 
 
 struts2-jboss-blank

http://git-wip-us.apache.org/repos/asf/struts/blob/94c44626/apps/mailreader/pom.xml
--
diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml
index 923c0e2..2173a0b

[struts] Git Push Summary

2016-03-14 Thread lukaszlenart 
Repository: struts
Updated Tags:  refs/tags/STRUTS_2_3_26 [created] 5db89654b

struts git commit: [maven-release-plugin] prepare release STRUTS_2_3_26

2016-03-14 Thread lukaszlenart 
Repository: struts
Updated Branches:
  refs/heads/support-2-3 fbb91d1bb -> 013077abc


[maven-release-plugin] prepare release STRUTS_2_3_26


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/013077ab
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/013077ab
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/013077ab

Branch: refs/heads/support-2-3
Commit: 013077abcb8d450d7313fb9fc766fe45f0b6f9c5
Parents: fbb91d1
Author: Lukasz Lenart 
Authored: Mon Mar 14 11:38:57 2016 +0100
Committer: Lukasz Lenart 
Committed: Mon Mar 14 11:38:57 2016 +0100

--
 apps/blank/pom.xml  | 2 +-
 apps/jboss-blank/pom.xml| 2 +-
 apps/mailreader/pom.xml | 2 +-
 apps/pom.xml| 2 +-
 apps/portlet/pom.xml| 2 +-
 apps/rest-showcase/pom.xml  | 4 ++--
 apps/showcase/pom.xml   | 2 +-
 archetypes/pom.xml  | 2 +-
 archetypes/struts2-archetype-angularjs/pom.xml  | 2 +-
 archetypes/struts2-archetype-blank/pom.xml  | 2 +-
 archetypes/struts2-archetype-convention/pom.xml | 2 +-
 archetypes/struts2-archetype-dbportlet/pom.xml  | 2 +-
 archetypes/struts2-archetype-plugin/pom.xml | 2 +-
 archetypes/struts2-archetype-portlet/pom.xml| 2 +-
 archetypes/struts2-archetype-starter/pom.xml| 2 +-
 assembly/pom.xml| 2 +-
 bom/pom.xml | 6 +++---
 bundles/admin/pom.xml   | 2 +-
 bundles/demo/pom.xml| 2 +-
 bundles/pom.xml | 2 +-
 core/pom.xml| 2 +-
 plugins/cdi/pom.xml | 2 +-
 plugins/codebehind/pom.xml  | 2 +-
 plugins/config-browser/pom.xml  | 2 +-
 plugins/convention/pom.xml  | 2 +-
 plugins/dojo/pom.xml| 2 +-
 plugins/dwr/pom.xml | 2 +-
 plugins/embeddedjsp/pom.xml | 2 +-
 plugins/gxp/pom.xml | 2 +-
 plugins/jasperreports/pom.xml   | 2 +-
 plugins/java8-support/pom.xml   | 2 +-
 plugins/javatemplates/pom.xml   | 2 +-
 plugins/jfreechart/pom.xml  | 2 +-
 plugins/jsf/pom.xml | 2 +-
 plugins/json/pom.xml| 2 +-
 plugins/junit/pom.xml   | 2 +-
 plugins/osgi/pom.xml| 2 +-
 plugins/oval/pom.xml| 2 +-
 plugins/pell-multipart/pom.xml  | 2 +-
 plugins/plexus/pom.xml  | 2 +-
 plugins/pom.xml | 2 +-
 plugins/portlet-tiles/pom.xml   | 2 +-
 plugins/portlet/pom.xml | 2 +-
 plugins/rest/pom.xml| 2 +-
 plugins/sitegraph/pom.xml   | 2 +-
 plugins/sitemesh/pom.xml| 2 +-
 plugins/spring/pom.xml  | 2 +-
 plugins/struts1/pom.xml | 2 +-
 plugins/testng/pom.xml  | 2 +-
 plugins/tiles/pom.xml   | 2 +-
 plugins/tiles3/pom.xml  | 2 +-
 pom.xml | 4 ++--
 xwork-core/pom.xml  | 2 +-
 53 files changed, 57 insertions(+), 57 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/013077ab/apps/blank/pom.xml
--
diff --git a/apps/blank/pom.xml b/apps/blank/pom.xml
index bfc9cc0..9ce1249 100644
--- a/apps/blank/pom.xml
+++ b/apps/blank/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-apps
-2.3.26-SNAPSHOT
+2.3.26
 
 
 struts2-blank

http://git-wip-us.apache.org/repos/asf/struts/blob/013077ab/apps/jboss-blank/pom.xml
--
diff --git a/apps/jboss-blank/pom.xml b/apps/jboss-blank/pom.xml
index 94ea70c..767ab10 100644
--- a/apps/jboss-blank/pom.xml
+++ b/apps/jboss-blank/pom.xml
@@ -26,7 +26,7 @@
 
 org.apache.struts
 struts2-apps
-2.3.26-SNAPSHOT
+2.3.26
 
 
 struts2-jboss-blank

http://git-wip-us.apache.org/repos/asf/struts/blob/013077ab/apps/mailreader/pom.xml
--
diff --git a/apps/mailreader/pom.xml b/apps/mailreader/pom.xml
index 554df4a..923c0e2 100644
---

struts git commit: Reverts excluded classes

2016-03-14 Thread lukaszlenart 
Repository: struts
Updated Branches:
  refs/heads/master fc2179cf1 -> 4271682d2


Reverts excluded classes


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/4271682d
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/4271682d
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/4271682d

Branch: refs/heads/master
Commit: 4271682d2b944e9022e4e4c499df43e0ce7e58fd
Parents: fc2179c
Author: Lukasz Lenart 
Authored: Mon Mar 14 11:25:00 2016 +0100
Committer: Lukasz Lenart 
Committed: Mon Mar 14 11:25:56 2016 +0100

--
 core/src/main/resources/struts-default.xml  | 15 +++-
 .../xwork2/ognl/SecurityMemberAccessTest.java   | 81 
 2 files changed, 94 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/4271682d/core/src/main/resources/struts-default.xml
--
diff --git a/core/src/main/resources/struts-default.xml 
b/core/src/main/resources/struts-default.xml
index 82bc63b..47c8c8a 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -39,14 +39,25 @@
 
 
 
+  value="
+java.lang.Object,
+java.lang.Runtime,
+java.lang.System,
+java.lang.Class,
+java.lang.ClassLoader,
+java.lang.Shutdown,
+ognl.OgnlContext,
+ognl.MemberAccess,
+ognl.ClassResolver,
+ognl.TypeConverter,
+com.opensymphony.xwork2.ActionContext" />
 
 
 
 
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/struts/blob/4271682d/core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
--
diff --git 
a/core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java 
b/core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
index 778f919..6bc6354 100644
--- 
a/core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
+++ 
b/core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
@@ -1,9 +1,11 @@
 package com.opensymphony.xwork2.ognl;
 
+import com.opensymphony.xwork2.util.TextParseUtil;
 import junit.framework.TestCase;
 
 import java.lang.reflect.Member;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -306,6 +308,7 @@ public class SecurityMemberAccessTest extends TestCase {
 public void testAccessPrimitiveInt() throws Exception {
 // given
 SecurityMemberAccess sma = new SecurityMemberAccess(false);
+
sma.setExcludedPackageNames(TextParseUtil.commaDelimitedStringToSet("java.lang.,ognl,javax"));
 
 String propertyName = "intField";
 Member member = FooBar.class.getMethod("get" + 
propertyName.substring(0, 1).toUpperCase() + propertyName.substring(1));
@@ -317,6 +320,74 @@ public class SecurityMemberAccessTest extends TestCase {
 assertTrue(accessible);
 }
 
+public void testAccessPrimitiveDoubleWithNames() throws Exception {
+// given
+SecurityMemberAccess sma = new SecurityMemberAccess(false);
+
sma.setExcludedPackageNames(TextParseUtil.commaDelimitedStringToSet("java.lang.,ognl,javax"));
+
+
+Set excluded = new HashSet();
+excluded.add(Object.class);
+excluded.add(Runtime.class);
+excluded.add(System.class);
+excluded.add(Class.class);
+excluded.add(ClassLoader.class);
+sma.setExcludedClasses(excluded);
+
+String propertyName = "doubleValue";
+Member member = Double.class.getMethod(propertyName);
+
+// when
+boolean accessible = sma.isAccessible(context, target, member, 
propertyName);
+// then
+assertTrue(accessible);
+
+// given
+propertyName = "exit";
+member = System.class.getMethod(propertyName, int.class);
+
+// when
+accessible = sma.isAccessible(context, target, member, propertyName);
+
+// then
+assertFalse(accessible);
+
+// given
+propertyName = "intField";
+member = FooBar.class.getMethod("get" + propertyName.substring(0, 
1).toUpperCase() + propertyName.substring(1));
+
+// when
+accessible = sma.isAccessible(context, target, member, propertyName);
+// then
+assertTrue(accessible);
+
+// given
+propertyName = "doubleField";
+member = FooBar.class.getMethod("get" + propertyName.substring(0,

struts git commit: Reverts excluded classes

2016-03-14 Thread lukaszlenart 
Repository: struts
Updated Branches:
  refs/heads/support-2-3 a67ac4525 -> fbb91d1bb


Reverts excluded classes


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/fbb91d1b
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/fbb91d1b
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/fbb91d1b

Branch: refs/heads/support-2-3
Commit: fbb91d1bb9b7c8033d8de02f19f75daae192ce2f
Parents: a67ac45
Author: Lukasz Lenart 
Authored: Mon Mar 14 11:25:00 2016 +0100
Committer: Lukasz Lenart 
Committed: Mon Mar 14 11:25:00 2016 +0100

--
 core/src/main/resources/struts-default.xml  | 15 +++-
 .../xwork2/ognl/SecurityMemberAccessTest.java   | 81 
 2 files changed, 94 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/struts/blob/fbb91d1b/core/src/main/resources/struts-default.xml
--
diff --git a/core/src/main/resources/struts-default.xml 
b/core/src/main/resources/struts-default.xml
index a83bcc0..6fafc5b 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -39,14 +39,25 @@
 
 
 
+  value="
+java.lang.Object,
+java.lang.Runtime,
+java.lang.System,
+java.lang.Class,
+java.lang.ClassLoader,
+java.lang.Shutdown,
+ognl.OgnlContext,
+ognl.MemberAccess,
+ognl.ClassResolver,
+ognl.TypeConverter,
+com.opensymphony.xwork2.ActionContext" />
 
 
 
 
 
 
-
+
 
 
 

http://git-wip-us.apache.org/repos/asf/struts/blob/fbb91d1b/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
--
diff --git 
a/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
 
b/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
index 778f919..6bc6354 100644
--- 
a/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
+++ 
b/xwork-core/src/test/java/com/opensymphony/xwork2/ognl/SecurityMemberAccessTest.java
@@ -1,9 +1,11 @@
 package com.opensymphony.xwork2.ognl;
 
+import com.opensymphony.xwork2.util.TextParseUtil;
 import junit.framework.TestCase;
 
 import java.lang.reflect.Member;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -306,6 +308,7 @@ public class SecurityMemberAccessTest extends TestCase {
 public void testAccessPrimitiveInt() throws Exception {
 // given
 SecurityMemberAccess sma = new SecurityMemberAccess(false);
+
sma.setExcludedPackageNames(TextParseUtil.commaDelimitedStringToSet("java.lang.,ognl,javax"));
 
 String propertyName = "intField";
 Member member = FooBar.class.getMethod("get" + 
propertyName.substring(0, 1).toUpperCase() + propertyName.substring(1));
@@ -317,6 +320,74 @@ public class SecurityMemberAccessTest extends TestCase {
 assertTrue(accessible);
 }
 
+public void testAccessPrimitiveDoubleWithNames() throws Exception {
+// given
+SecurityMemberAccess sma = new SecurityMemberAccess(false);
+
sma.setExcludedPackageNames(TextParseUtil.commaDelimitedStringToSet("java.lang.,ognl,javax"));
+
+
+Set excluded = new HashSet();
+excluded.add(Object.class);
+excluded.add(Runtime.class);
+excluded.add(System.class);
+excluded.add(Class.class);
+excluded.add(ClassLoader.class);
+sma.setExcludedClasses(excluded);
+
+String propertyName = "doubleValue";
+Member member = Double.class.getMethod(propertyName);
+
+// when
+boolean accessible = sma.isAccessible(context, target, member, 
propertyName);
+// then
+assertTrue(accessible);
+
+// given
+propertyName = "exit";
+member = System.class.getMethod(propertyName, int.class);
+
+// when
+accessible = sma.isAccessible(context, target, member, propertyName);
+
+// then
+assertFalse(accessible);
+
+// given
+propertyName = "intField";
+member = FooBar.class.getMethod("get" + propertyName.substring(0, 
1).toUpperCase() + propertyName.substring(1));
+
+// when
+accessible = sma.isAccessible(context, target, member, propertyName);
+// then
+assertTrue(accessible);
+
+// given
+propertyName = "doubleField";
+member = FooBar.class.getMethod("get" +