victorsosa d8e4cb8b48 Merge branch 'master' into easymock_update ...

# Conflicts:
#	core/src/test/java/org/apache/struts2/interceptor/CookieInterceptorTest.java

2016-03-03 17:43:17 -04:00

..

bean-validation

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

2016-01-21 09:26:18 +01:00

cdi

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

2016-01-21 09:26:18 +01:00

config-browser

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

2016-01-21 09:26:18 +01:00

convention

Merge branch 'master' into easymock_update

2016-03-03 17:43:17 -04:00

dwr

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

2016-01-21 09:26:18 +01:00

embeddedjsp

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

2016-01-21 09:26:18 +01:00

gxp

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

2016-01-21 09:26:18 +01:00

jasperreports

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

2016-01-21 09:26:18 +01:00

java8-support

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

2016-01-21 09:26:18 +01:00

javatemplates

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

2016-01-21 09:26:18 +01:00

jfreechart

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

2016-01-21 09:26:18 +01:00

json

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

2016-01-21 09:26:18 +01:00

junit

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

2016-01-21 09:26:18 +01:00

osgi

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

2016-01-21 09:26:18 +01:00

oval

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

2016-01-21 09:26:18 +01:00

pell-multipart

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

2016-01-21 09:26:18 +01:00

plexus

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

2016-01-21 09:26:18 +01:00

portlet

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

2016-01-21 09:26:18 +01:00

portlet-tiles

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

2016-01-21 09:26:18 +01:00

rest

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

2016-01-21 09:26:18 +01:00

sitegraph

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

2016-01-21 09:26:18 +01:00

sitemesh

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

2016-01-21 09:26:18 +01:00

spring

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

2016-01-21 09:26:18 +01:00

src/site

Cleans up Maven generated website

2014-12-02 12:41:06 +01:00

testng

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

2016-01-21 09:26:18 +01:00

tiles

escaped @ characters in javadoc code sample to avoid javadoc warnings

2016-02-25 09:31:40 +01:00

pom.xml

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

2016-01-21 09:26:18 +01:00