This is an automated email from the ASF dual-hosted git repository. struberg pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openwebbeans.git
The following commit(s) were added to refs/heads/main by this push: new 7fbe82ddc OWB-1433 some maven upgrades and min java11 7fbe82ddc is described below commit 7fbe82ddcfbd7929c887b9342ee4d46b7c56cb28 Author: Mark Struberg <strub...@apache.org> AuthorDate: Wed Nov 8 18:22:18 2023 +0100 OWB-1433 some maven upgrades and min java11 --- pom.xml | 13 +++++++------ .../org/apache/webbeans/inject/instance/InstanceImpl.java | 3 ++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 6da990850..a4ad87864 100644 --- a/pom.xml +++ b/pom.xml @@ -88,6 +88,7 @@ <!-- jetty 9.4.13+ broke session persistence: https://github.com/eclipse/jetty.project/issues/3597 --> <jetty.version>9.4.12.v20180830</jetty.version> + <surefire.version>3.2.2</surefire.version> </properties> <mailingLists> @@ -300,7 +301,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.6</version> + <version>3.2.0</version> </plugin> <plugin> @@ -380,16 +381,15 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.5.1</version> + <version>3.8.1</version> <configuration> - <source>1.8</source> - <target>1.8</target> + <source>11</source> + <target>11</target> </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>3.2.2</version> <configuration> <includes> <include>**/*Test.java</include> @@ -416,7 +416,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.17</version> + <version>3.1.0</version> <executions> <execution> <id>verify-style</id> @@ -538,6 +538,7 @@ <module name="NeedBraces" /> <module name="LeftCurly"> <property name="option" value="nl" /> + <property name="tokens" value=" ANNOTATION_DEF,CLASS_DEF,CTOR_DEF,ENUM_CONSTANT_DEF,ENUM_DEF,INTERFACE_DEF,LITERAL_CASE,LITERAL_CATCH,LITERAL_DEFAULT,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_SWITCH,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE,METHOD_DEF,OBJBLOCK,STATIC_INIT"/> </module> <module name="RightCurly"> <property name="option" value="alone" /> diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java b/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java index 73a7075f6..3041db52d 100644 --- a/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java +++ b/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java @@ -256,7 +256,8 @@ public class InstanceImpl<T> implements Instance<T>, Serializable public Iterator<T> iterator() { final Iterator<Bean<?>> beans = resolveBeans().iterator(); - return new Iterator<T>() { + return new Iterator<T>() + { @Override public boolean hasNext() {