[struts-site] branch master updated: Adds a note about moderating users

2022-09-17 Thread lukaszlenart
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 c23536f3a Adds a note about moderating users
c23536f3a is described below

commit c23536f3aa8ed9d04b4953522371aeb9ad434904
Author: Lukasz Lenart 
AuthorDate: Sat Sep 17 09:19:38 2022 +0200

Adds a note about moderating users
---
 source/mail.md | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/source/mail.md b/source/mail.md
index d76a739bf..b525684ff 100644
--- a/source/mail.md
+++ b/source/mail.md
@@ -33,6 +33,16 @@ Archives if you are looking for older discussions. There are 
many other archives
 If you want to **discuss patches or contribute to Struts** you should 
subscribe to the [developers list](dev-mail).
 {:.alert .alert-success}
 
+## Moderators
+
+Users with the moderate right to the above lists can check subscribers, 
subscribe and unsubscribe given users,
+check [Mailing list 
moderation](https://infra.apache.org/mailing-list-moderation.html) for more 
details, basically
+to unsubscribe someone you can email:
+
+```
+{listname}-unsubscribe-badboy=menace@tlp.apache.org
+```
+
 ## Guidelines
 
 Mailing lists provide a simple and effective communication mechanism. With 
potentially thousands of subscribers, there 



[struts-site] branch asf-site updated: Automatic Site Publish by Buildbot

2022-09-17 Thread git-site-role
This is an automated email from the ASF dual-hosted git repository.

git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/struts-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new 85409 Automatic Site Publish by Buildbot
85409 is described below

commit 854092a088af0e8b972e7582ab11fb857b40
Author: buildbot 
AuthorDate: Sat Sep 17 07:20:12 2022 +

Automatic Site Publish by Buildbot
---
 output/mail.html | 9 +
 1 file changed, 9 insertions(+)

diff --git a/output/mail.html b/output/mail.html
index 3db484dc4..1fa11f777 100644
--- a/output/mail.html
+++ b/output/mail.html
@@ -181,6 +181,15 @@ Archives if you are looking for older discussions. There 
are many other archives
 
 If you want to discuss patches or 
contribute to Struts you should subscribe to the developers list.
 
+Moderators
+
+Users with the moderate right to the above lists can check subscribers, 
subscribe and unsubscribe given users,
+check https://infra.apache.org/mailing-list-moderation.html";>Mailing 
list moderation for more details, basically
+to unsubscribe someone you can email:
+
+{listname}-unsubscribe-badboy=menace@tlp.apache.org
+
+
 Guidelines
 
 Mailing lists provide a simple and effective communication mechanism. With 
potentially thousands of subscribers, there 



[struts-site] branch asf-staging updated: Updates stage by Jenkins

2022-09-17 Thread git-site-role
This is an automated email from the ASF dual-hosted git repository.

git-site-role pushed a commit to branch asf-staging
in repository https://gitbox.apache.org/repos/asf/struts-site.git


The following commit(s) were added to refs/heads/asf-staging by this push:
 new 7c1f4cb16 Updates stage by Jenkins
7c1f4cb16 is described below

commit 7c1f4cb168ccd131ce724cca562a6a2066b41557
Author: jenkins 
AuthorDate: Sat Sep 17 07:21:45 2022 +

Updates stage by Jenkins
---
 content/mail.html | 9 +
 1 file changed, 9 insertions(+)

diff --git a/content/mail.html b/content/mail.html
index 3db484dc4..1fa11f777 100644
--- a/content/mail.html
+++ b/content/mail.html
@@ -181,6 +181,15 @@ Archives if you are looking for older discussions. There 
are many other archives
 
 If you want to discuss patches or 
contribute to Struts you should subscribe to the developers list.
 
+Moderators
+
+Users with the moderate right to the above lists can check subscribers, 
subscribe and unsubscribe given users,
+check https://infra.apache.org/mailing-list-moderation.html";>Mailing 
list moderation for more details, basically
+to unsubscribe someone you can email:
+
+{listname}-unsubscribe-badboy=menace@tlp.apache.org
+
+
 Guidelines
 
 Mailing lists provide a simple and effective communication mechanism. With 
potentially thousands of subscribers, there 



[struts] 02/02: Includes commons-text in minimal library set

2022-09-17 Thread lukaszlenart
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch WW-5226-weld
in repository https://gitbox.apache.org/repos/asf/struts.git

commit 7b655207ec8de281e5c53320de4f83eab59df2d1
Author: Lukasz Lenart 
AuthorDate: Sat Sep 17 09:40:54 2022 +0200

Includes commons-text in minimal library set
---
 assembly/src/main/assembly/min-lib.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/assembly/src/main/assembly/min-lib.xml 
b/assembly/src/main/assembly/min-lib.xml
index 3e6e4a176..3cae96356 100644
--- a/assembly/src/main/assembly/min-lib.xml
+++ b/assembly/src/main/assembly/min-lib.xml
@@ -36,6 +36,7 @@
 org.apache.struts:struts2-core
 org.freemarker:freemarker
 org.apache.commons:commons-lang3
+org.apache.commons:commons-text
 org.apache.logging.log4j:log4j-api
 ognl:ognl
 commons-fileupload:commons-fileupload



[struts] branch WW-5226-weld created (now 7b655207e)

2022-09-17 Thread lukaszlenart
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a change to branch WW-5226-weld
in repository https://gitbox.apache.org/repos/asf/struts.git


  at 7b655207e Includes commons-text in minimal library set

This branch includes the following new commits:

 new c9c39130f WW-5226 Upgrades Weld to version 2.4.8.Final
 new 7b655207e Includes commons-text in minimal library set

The 2 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/02: WW-5226 Upgrades Weld to version 2.4.8.Final

2022-09-17 Thread lukaszlenart
This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch WW-5226-weld
in repository https://gitbox.apache.org/repos/asf/struts.git

commit c9c39130f6f11adaaedf15aa584c2a5f76c47661
Author: Lukasz Lenart 
AuthorDate: Sat Sep 17 09:40:38 2022 +0200

WW-5226 Upgrades Weld to version 2.4.8.Final
---
 .../apache/struts2/cdi/CdiObjectFactoryTest.java   | 31 +++---
 pom.xml|  4 +--
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git 
a/plugins/cdi/src/test/java/org/apache/struts2/cdi/CdiObjectFactoryTest.java 
b/plugins/cdi/src/test/java/org/apache/struts2/cdi/CdiObjectFactoryTest.java
index 7bee7629a..bae580cd4 100644
--- a/plugins/cdi/src/test/java/org/apache/struts2/cdi/CdiObjectFactoryTest.java
+++ b/plugins/cdi/src/test/java/org/apache/struts2/cdi/CdiObjectFactoryTest.java
@@ -18,33 +18,33 @@
  */
 package org.apache.struts2.cdi;
 
-import org.jboss.weld.environment.se.StartMain;
-import static org.junit.Assert.*;
-
+import org.jboss.weld.bootstrap.api.helpers.RegistrySingletonProvider;
+import org.jboss.weld.environment.se.Weld;
 import org.jboss.weld.environment.se.WeldContainer;
-import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.springframework.mock.jndi.SimpleNamingContextBuilder;
 
 import javax.enterprise.inject.spi.InjectionTarget;
 
-/**
- * CdiObjectFactoryTest.
- */
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
 public class CdiObjectFactoryTest {
 
-@Before
-public void setUp() throws Exception {
+@BeforeClass
+public static void setup() throws Exception {
+Weld weld = new 
Weld().containerId(RegistrySingletonProvider.STATIC_INSTANCE);
+WeldContainer container = weld.initialize();
+
 SimpleNamingContextBuilder builder = new SimpleNamingContextBuilder();
 builder.activate();
-
-StartMain sm = new StartMain(new String[0]);
-WeldContainer weldContainer = sm.go();
-builder.bind(CdiObjectFactory.CDI_JNDIKEY_BEANMANAGER_COMP, 
weldContainer.getBeanManager());
+builder.bind(CdiObjectFactory.CDI_JNDIKEY_BEANMANAGER_COMP, 
container.getBeanManager());
 }
 
 @Test
-public void testFindBeanManager() throws Exception {
+public void testFindBeanManager() {
 assertNotNull(new CdiObjectFactory().findBeanManager());
 }
 
@@ -56,7 +56,8 @@ public class CdiObjectFactoryTest {
 assertNotNull(fooConsumer.fooService);
 }
 
-@Test public void testGetInjectionTarget() throws Exception {
+@Test
+public void testGetInjectionTarget() {
 final CdiObjectFactory cdiObjectFactory = new CdiObjectFactory();
 final InjectionTarget injectionTarget = 
cdiObjectFactory.getInjectionTarget(FooConsumer.class);
 assertNotNull(injectionTarget);
diff --git a/pom.xml b/pom.xml
index f36e4b92c..fe0e45379 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1202,13 +1202,13 @@
 
 org.jboss.weld
 weld-core
-2.2.16.SP1
+2.4.8.Final
 
 
 
 org.jboss.weld.se
 weld-se
-2.2.16.SP1
+2.4.8.Final
 
 
 



[struts] branch master updated: Blocks force pushes to the master branch

2022-09-17 Thread lukaszlenart
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 f04b68db0 Blocks force pushes to the master branch
f04b68db0 is described below

commit f04b68db03dd56bfac94186c0d62978fe7ac7d1b
Author: Lukasz Lenart 
AuthorDate: Sat Sep 17 10:02:31 2022 +0200

Blocks force pushes to the master branch
---
 .asf.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.asf.yaml b/.asf.yaml
index 379309b9a..dad75e1ef 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -12,3 +12,5 @@ notifications:
 
 github:
   del_branch_on_merge: true
+  protected_branches:
+master: { }