[struts] branch master updated: Upgrades Maven Wrapper
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.git The following commit(s) were added to refs/heads/master by this push: new c82fdb5e7 Upgrades Maven Wrapper c82fdb5e7 is described below commit c82fdb5e7671850d5b1f90b0273e81ce1e07c9a7 Author: Lukasz Lenart AuthorDate: Thu May 5 12:27:38 2022 +0200 Upgrades Maven Wrapper --- .mvn/wrapper/maven-wrapper.properties | 2 +- pom.xml | 11 ++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 8c79a83ae..db95c131d 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.5/apache-maven-3.8.5-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar diff --git a/pom.xml b/pom.xml index 949f01c2c..6f747d661 100644 --- a/pom.xml +++ b/pom.xml @@ -406,6 +406,11 @@ + +org.apache.maven.plugins +maven-wrapper-plugin +3.1.0 + @@ -473,7 +478,11 @@ - + +org.apache.maven.plugins +maven-wrapper-plugin +3.1.0 + install
[struts] branch WW-5181-static-methods created (now 7541d9ab3)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch WW-5181-static-methods in repository https://gitbox.apache.org/repos/asf/struts.git at 7541d9ab3 WW-5181 Blocks permanently access to static methods This branch includes the following new commits: new 7541d9ab3 WW-5181 Blocks permanently access to static methods The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[struts] 01/01: WW-5181 Blocks permanently access to static methods
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch WW-5181-static-methods
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 7541d9ab35bfdfb239325b6b05d2a7ebdbe91c75
Author: Lukasz Lenart
AuthorDate: Thu May 5 12:12:10 2022 +0200
WW-5181 Blocks permanently access to static methods
---
.../StrutsDefaultConfigurationProvider.java| 1 -
.../com/opensymphony/xwork2/ognl/OgnlUtil.java | 8 +-
.../opensymphony/xwork2/ognl/OgnlValueStack.java | 20 ++--
.../xwork2/ognl/OgnlValueStackFactory.java | 44 ++--
.../xwork2/ognl/SecurityMemberAccess.java | 80 +-
.../xwork2/ognl/accessor/XWorkMethodAccessor.java | 12 +--
.../java/org/apache/struts2/StrutsConstants.java | 3 -
.../struts2/config/entities/ConstantConfig.java| 10 --
.../interceptor/ParametersInterceptorTest.java | 15 ++-
.../com/opensymphony/xwork2/ognl/OgnlUtilTest.java | 8 +-
.../xwork2/ognl/OgnlValueStackTest.java| 120 +++--
.../xwork2/ognl/SecurityMemberAccessTest.java | 107 +-
.../xwork2/ognl/SetPropertiesTest.java | 16 +--
.../ognl => test}/SecurityMemberAccessTest.java| 109 ++-
.../com/test/TestSecurityMemberAccess.java}| 22 ++--
.../util/SecurityMemberAccessInServletsTest.java | 4 +-
core/src/test/resources/xwork-test-beans.xml | 1 +
.../xwork2/ognl/SecurityMemberAccessProxyTest.java | 4 +-
.../SecurityMemberAccessProxyTest.java | 7 +-
19 files changed, 223 insertions(+), 368 deletions(-)
diff --git
a/core/src/main/java/com/opensymphony/xwork2/config/providers/StrutsDefaultConfigurationProvider.java
b/core/src/main/java/com/opensymphony/xwork2/config/providers/StrutsDefaultConfigurationProvider.java
index f93237367..56dffabe0 100644
---
a/core/src/main/java/com/opensymphony/xwork2/config/providers/StrutsDefaultConfigurationProvider.java
+++
b/core/src/main/java/com/opensymphony/xwork2/config/providers/StrutsDefaultConfigurationProvider.java
@@ -233,7 +233,6 @@ public class StrutsDefaultConfigurationProvider implements
ConfigurationProvider
props.setProperty(StrutsConstants.STRUTS_OGNL_ENABLE_EXPRESSION_CACHE,
Boolean.TRUE.toString());
props.setProperty(StrutsConstants.STRUTS_OGNL_ENABLE_EVAL_EXPRESSION,
Boolean.FALSE.toString());
props.setProperty(StrutsConstants.STRUTS_CONFIGURATION_XML_RELOAD,
Boolean.FALSE.toString());
-props.setProperty(StrutsConstants.STRUTS_ALLOW_STATIC_METHOD_ACCESS,
Boolean.FALSE.toString());
props.setProperty(StrutsConstants.STRUTS_ALLOW_STATIC_FIELD_ACCESS,
Boolean.TRUE.toString());
props.setProperty(StrutsConstants.STRUTS_MATCHER_APPEND_NAMED_PARAMETERS,
Boolean.TRUE.toString());
}
diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
index 007206cb8..4911dfa17 100644
--- a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
+++ b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
@@ -75,7 +75,6 @@ public class OgnlUtil {
private Container container;
private boolean allowStaticFieldAccess = true;
-private boolean allowStaticMethodAccess;
private boolean disallowProxyMemberAccess;
public OgnlUtil() {
@@ -212,11 +211,6 @@ public class OgnlUtil {
this.allowStaticFieldAccess =
BooleanUtils.toBoolean(allowStaticFieldAccess);
}
-@Inject(value = StrutsConstants.STRUTS_ALLOW_STATIC_METHOD_ACCESS,
required = false)
-protected void setAllowStaticMethodAccess(String allowStaticMethodAccess) {
-this.allowStaticMethodAccess =
BooleanUtils.toBoolean(allowStaticMethodAccess);
-}
-
@Inject(value = StrutsConstants.STRUTS_DISALLOW_PROXY_MEMBER_ACCESS,
required = false)
protected void setDisallowProxyMemberAccess(String
disallowProxyMemberAccess) {
this.disallowProxyMemberAccess =
BooleanUtils.toBoolean(disallowProxyMemberAccess);
@@ -798,7 +792,7 @@ public class OgnlUtil {
resolver = container.getInstance(CompoundRootAccessor.class);
}
-SecurityMemberAccess memberAccess = new
SecurityMemberAccess(allowStaticMethodAccess, allowStaticFieldAccess);
+SecurityMemberAccess memberAccess = new
SecurityMemberAccess(allowStaticFieldAccess);
memberAccess.setDisallowProxyMemberAccess(disallowProxyMemberAccess);
if (devMode) {
diff --git
a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
index c08da937e..1b874fc44 100644
--- a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
+++ b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
@@ -72,13 +72,13 @@ public class OgnlValueStack implements Serializable,
ValueStack, Clearab
[struts] branch master updated: Uses Maven Wrapper in Jenkins pipeline
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.git
The following commit(s) were added to refs/heads/master by this push:
new 8e49362bf Uses Maven Wrapper in Jenkins pipeline
8e49362bf is described below
commit 8e49362bf85c3e816a436f7e38162b879d513da8
Author: Lukasz Lenart
AuthorDate: Fri May 6 07:15:13 2022 +0200
Uses Maven Wrapper in Jenkins pipeline
---
Jenkinsfile | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index a49a9517f..bcac8e895 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -39,12 +39,12 @@ pipeline {
stages {
stage('Build') {
steps {
-sh 'mvn -B clean install -DskipTests -DskipAssembly'
+sh './mvnw -B clean install -DskipTests -DskipAssembly'
}
}
stage('Test') {
steps {
-sh 'mvn -B test'
+sh './mvnw -B test'
}
post {
always {
@@ -74,12 +74,12 @@ pipeline {
stages {
stage('Build') {
steps {
-sh 'mvn -B clean install -DskipTests -DskipAssembly'
+sh './mvnw -B clean install -DskipTests -DskipAssembly'
}
}
stage('Test') {
steps {
-sh 'mvn -B test'
+sh './mvnw -B test'
}
post {
always {
@@ -94,7 +94,7 @@ pipeline {
}
steps {
withCredentials([string(credentialsId: 'asf-struts-sonarcloud',
variable: 'SONARCLOUD_TOKEN')]) {
- sh 'mvn sonar:sonar -DskipAssembly
-Dsonar.login=${SONARCLOUD_TOKEN}'
+ sh './mvnw sonar:sonar -DskipAssembly
-Dsonar.login=${SONARCLOUD_TOKEN}'
}
}
}
@@ -119,12 +119,12 @@ pipeline {
stages {
stage('Build') {
steps {
-sh 'mvn -B clean install -DskipTests -DskipAssembly'
+sh './mvnw -B clean install -DskipTests -DskipAssembly'
}
}
stage('Test') {
steps {
-sh 'mvn -B test'
+sh './mvnw -B test'
// step([$class: 'JiraIssueUpdater', issueSelector: [$class:
'DefaultIssueSelector'], scm: scm])
}
post {
@@ -142,7 +142,7 @@ pipeline {
dir("local-snapshots-dir/") {
deleteDir()
}
-sh 'mvn -B source:jar javadoc:jar -DskipAssembbly'
+sh './mvnw -B source:jar javadoc:jar -DskipAssembbly'
}
}
stage('Deploy Snapshot') {
@@ -151,7 +151,7 @@ pipeline {
}
steps {
withCredentials([file(credentialsId:
'lukaszlenart-repository-access-token', variable: 'CUSTOM_SETTINGS')]) {
- sh 'mvn -s \${CUSTOM_SETTINGS} deploy'
+ sh './mvnw -s \${CUSTOM_SETTINGS} deploy'
}
}
}
[struts] branch master updated: Fixes typo in deploy step
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.git
The following commit(s) were added to refs/heads/master by this push:
new 4eb2ee838 Fixes typo in deploy step
4eb2ee838 is described below
commit 4eb2ee8384c0f128d1919d09b90da7009f9a64a2
Author: Lukasz Lenart
AuthorDate: Fri May 6 07:24:29 2022 +0200
Fixes typo in deploy step
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index bcac8e895..d9548562c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -142,7 +142,7 @@ pipeline {
dir("local-snapshots-dir/") {
deleteDir()
}
-sh './mvnw -B source:jar javadoc:jar -DskipAssembbly'
+sh './mvnw -B source:jar javadoc:jar -DskipAssembly'
}
}
stage('Deploy Snapshot') {
[struts] branch master updated: Skips test during deploy
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.git
The following commit(s) were added to refs/heads/master by this push:
new 6024dd6fa Skips test during deploy
6024dd6fa is described below
commit 6024dd6fa46f158081db79803f85289f07b8663c
Author: Lukasz Lenart
AuthorDate: Fri May 6 07:29:29 2022 +0200
Skips test during deploy
---
Jenkinsfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index d9548562c..233ade32d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -142,7 +142,7 @@ pipeline {
dir("local-snapshots-dir/") {
deleteDir()
}
-sh './mvnw -B source:jar javadoc:jar -DskipAssembly'
+sh './mvnw -B source:jar javadoc:jar -DskipTests -DskipAssembly'
}
}
stage('Deploy Snapshot') {
@@ -151,7 +151,7 @@ pipeline {
}
steps {
withCredentials([file(credentialsId:
'lukaszlenart-repository-access-token', variable: 'CUSTOM_SETTINGS')]) {
- sh './mvnw -s \${CUSTOM_SETTINGS} deploy'
+ sh './mvnw -s \${CUSTOM_SETTINGS} deploy -DskipTests
-DskipAssembly'
}
}
}
[struts] branch master updated: Adjusts Travis build to be aligned with Jenkins pipeline
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.git The following commit(s) were added to refs/heads/master by this push: new 086b514d5 Adjusts Travis build to be aligned with Jenkins pipeline 086b514d5 is described below commit 086b514d593b3a334c53fd72151ddfaf095db04b Author: Lukasz Lenart AuthorDate: Fri May 6 07:47:12 2022 +0200 Adjusts Travis build to be aligned with Jenkins pipeline --- .travis.yml | 8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index b679ae6b0..2528350e8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,13 +18,9 @@ matrix: script: - if [ "$STRUTS_IT" == "true" ]; then - ./mvnw clean verify org.jacoco:jacoco-maven-plugin:report org.jacoco:jacoco-maven-plugin:report-integration org.eluder.coveralls:coveralls-maven-plugin:report -Ptravis-coveralls -DskipAssembly -B; + ./mvnw clean package verify org.jacoco:jacoco-maven-plugin:report org.jacoco:jacoco-maven-plugin:report-integration org.eluder.coveralls:coveralls-maven-plugin:report -Ptravis-coveralls -DskipAssembly -B; else - if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then -./mvnw test -DskipAssembly -B; - else -./mvnw test -DskipAssembly -Dupdate-impact -B; - fi; + ./mvnw test -DskipAssembly -B; fi; cache:
[struts] branch master updated: Tries to fix Travis build
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.git The following commit(s) were added to refs/heads/master by this push: new 9873a7f56 Tries to fix Travis build 9873a7f56 is described below commit 9873a7f56b279bb05ce7362ff95e3f48a1d289f2 Author: Lukasz Lenart AuthorDate: Fri May 6 08:35:06 2022 +0200 Tries to fix Travis build --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2528350e8..73addc767 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,13 +14,13 @@ global: matrix: include: - jdk: oraclejdk8 - env: STRUTS_IT=true # do integration tests and coverage reports when jdk7,9 and 11 tests prospered + env: STRUTS_IT=true # do integration tests and coverage reports when jdk 9 and 11 tests prospered script: - if [ "$STRUTS_IT" == "true" ]; then ./mvnw clean package verify org.jacoco:jacoco-maven-plugin:report org.jacoco:jacoco-maven-plugin:report-integration org.eluder.coveralls:coveralls-maven-plugin:report -Ptravis-coveralls -DskipAssembly -B; else - ./mvnw test -DskipAssembly -B; + ./mvnw clean package test -DskipAssembly -B; fi; cache:
