You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2023/01/24 14:43:55 UTC
[openwebbeans] branch main updated (c7469aa50 -> 494886565)
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/openwebbeans.git
from c7469aa50 OWB-1417 re-enable slf4j plugin
new e9884e292 OWB-1417 enable owb-gradle and owb-junit5
new 494886565 OWB1417 inline checkstyle config for now
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.
Summary of changes:
pom.xml | 204 +++++++++++++++++++--
.../openwebbeans/junit5/internal/CdiExtension.java | 2 +-
...ion => jakarta.enterprise.inject.spi.Extension} | 0
3 files changed, 190 insertions(+), 16 deletions(-)
rename webbeans-junit5/src/test/resources/META-INF/services/{javax.enterprise.inject.spi.Extension => jakarta.enterprise.inject.spi.Extension} (100%)
[openwebbeans] 02/02: OWB1417 inline checkstyle config for now
Posted by st...@apache.org.
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
commit 494886565d71a329f54c84f40ce968860e7dc2e9
Author: Mark Struberg <st...@apache.org>
AuthorDate: Tue Jan 24 15:43:31 2023 +0100
OWB1417 inline checkstyle config for now
---
pom.xml | 199 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 187 insertions(+), 12 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4c23da20b..2496a5027 100644
--- a/pom.xml
+++ b/pom.xml
@@ -442,25 +442,200 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.17</version>
<executions>
- <execution>
- <id>verify-style</id>
- <phase>verify</phase>
- <goals><goal>check</goal></goals>
- </execution>
+ <execution>
+ <id>verify-style</id>
+ <phase>verify</phase>
+ <goals><goal>check</goal></goals>
+
+ <configuration>
+ <checkstyleRules>
+
+ <module name="Checker">
+
+ <!-- Checks that a package.html file exists for each package. -->
+ <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
+ <!-- module name="PackageHtml"/ -->
+
+ <!-- Checks whether files end with a new line. -->
+ <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
+ <!-- module name="NewlineAtEndOfFile"/ -->
+
+ <!-- Checks that property files contain the same keys. -->
+ <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
+ <!-- module name="Translation"/ -->
+
+ <!-- Checks for Headers -->
+ <!-- See http://checkstyle.sf.net/config_header.html -->
+<!--X disabled for now
+ <module name="Header">
+ <property name="headerFile" value="${checkstyle.header.file}"/>
+ <property name="fileExtensions" value="java"/>
+ </module>
+-->
+
+ <!-- Checks for Size Violations. -->
+ <!-- See http://checkstyle.sf.net/config_sizes.html -->
+ <module name="FileLength">
+ <property name="max" value="3500" />
+ <property name="fileExtensions" value="java"/>
+ </module>
+
+ <!-- Checks for whitespace -->
+ <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+ <module name="FileTabCharacter"/>
+
+
+ <module name="TreeWalker">
+
+<!--
+ <property name="cacheFile" value="${checkstyle.cache.file}"/>
+-->
+
+ <!-- Checks for Javadoc comments. -->
+ <!-- See http://checkstyle.sf.net/config_javadoc.html -->
+ <!-- module name="JavadocMethod"/ -->
+ <!-- module name="JavadocType"/ -->
+ <!-- module name="JavadocVariable"/ -->
+
+
+ <!-- Checks for Naming Conventions. -->
+ <!-- See http://checkstyle.sf.net/config_naming.html -->
+ <!--
+ <module name="MemberName">
+ <property name="format" value="^_[a-z][a-zA-Z0-9]*$"/>
+ </module>
+ -->
+
+ <module name="ConstantName">
+ <!-- Normal rules, except that:
+ - * any name can start with an underscore.
+ - * "log" is allowed; this is a traditional name for log objects
+ - * names ending with "ThreadLocal" are allowed so that threadlocal vars don't have to be
+ - all-caps. They are static final, but are not really constants. Yes, type prefixes
+ - on variable names sucks ("hungarian notation") but checkstyle doesn't allow
+ - name rules to vary by the type of the constant, and no other alternative seems
+ - any better.
+ -->
+ <property name="format"
+ value="^_?((log)|(logger)|([a-z][a-zA-Z]*ThreadLocal)|([A-Z][A-Z0-9]*(_[A-Z0-9]+)*))$"/>
+ </module>
+
+ <module name="LocalVariableName"/>
+ <module name="MethodName">
+ <property name="format" value="^_?[a-z][a-zA-Z0-9]*$"/>
+ </module>
+ <module name="PackageName"/>
+ <module name="LocalFinalVariableName"/>
+ <module name="ParameterName"/>
+ <module name="StaticVariableName"/>
+ <module name="TypeName">
+ <property name="format" value="^_?[A-Z][a-zA-Z0-9]*$"/>
+ </module>
+
+ <!-- Checks for imports -->
+ <!-- See http://checkstyle.sf.net/config_import.html -->
+ <module name="AvoidStarImport">
+ <property name="excludes" value="java.io,java.net,java.util,jakarta.enterprise.inject.spi,jakarta.enterprise.context"/>
+ </module>
+ <module name="IllegalImport"/>
+ <module name="RedundantImport"/>
+ <module name="UnusedImports"/>
+
+
+ <module name="LineLength">
+ <property name="max" value="180" />
+ <property name="ignorePattern" value="@version|@see"/>
+ </module>
+ <module name="MethodLength">
+ <property name="max" value="250" />
+ </module>
+ <module name="ParameterNumber">
+ <property name="max" value="10" />
+ </module>
+
+
+ <!-- Modifier Checks -->
+ <!-- See http://checkstyle.sf.net/config_modifiers.html -->
+ <!-- module name="ModifierOrder"/ -->
+ <!-- module name="RedundantModifier"/ -->
+
+ <!-- Checks for blocks. You know, those {}'s -->
+ <!-- See http://checkstyle.sf.net/config_blocks.html -->
+ <!-- module name="EmptyBlock"/ -->
+ <module name="NeedBraces"/>
+ <module name="LeftCurly">
+ <property name="option" value="nl"/>
+ </module>
+ <module name="RightCurly">
+ <property name="option" value="alone"/>
+ </module>
+
+ <!-- Checks for common coding problems -->
+ <!-- See http://checkstyle.sf.net/config_coding.html -->
+ <module name="EmptyStatement"/>
+ <module name="EqualsHashCode"/>
+ <module name="InnerAssignment"/>
+ <module name="DefaultComesLast"/>
+ <module name="MissingSwitchDefault"/>
+ <module name="FallThrough"/>
+ <module name="MultipleVariableDeclarations"/>
+
+ <!-- Checks for class design -->
+ <!-- See http://checkstyle.sf.net/config_design.html -->
+ <!-- module name="DesignForExtension"/ -->
+ <module name="com.puppycrawl.tools.checkstyle.checks.design.DesignForExtensionCheck">
+ <property name="severity" value="ignore"/>
+ </module>
+
+ <!-- module name="FinalClass"/ -->
+ <!-- module name="HideUtilityClassConstructor"/ -->
+ <!-- module name="InterfaceIsType"/ -->
+ <!-- module name="VisibilityModifier"/ -->
+ <module name="com.puppycrawl.tools.checkstyle.checks.design.VisibilityModifierCheck">
+ <property name="packageAllowed" value="false"/>
+ <property name="protectedAllowed" value="true"/>
+ <property name="publicMemberPattern" value="^serialVersionUID"/>
+ <property name="severity" value="warning"/>
+ </module>
+
+
+ <!-- Miscellaneous other checks. -->
+ <!-- See http://checkstyle.sf.net/config_misc.html -->
+ <!-- module name="ArrayTypeStyle"/ -->
+ <!-- module name="FinalParameters"/ -->
+ <!-- Line with Trailing Spaces (disabled as it's to noisy)
+ <module name="GenericIllegalRegexp">
+ <property name="format" value="\s+$"/>
+ <property name="message" value="Line has trailing spaces."/>
+ </module>
+ -->
+ <module name="UpperEll"/>
+
+ </module>
+
+ </module>
+
+ </checkstyleRules>
+ </configuration>
+ </execution>
</executions>
<configuration>
+<!--
<configLocation>openwebbeans/owb-checks-default.xml</configLocation>
<headerLocation>openwebbeans/owb-header.txt</headerLocation>
+-->
<consoleOutput>true</consoleOutput>
<excludes>**/Unsafe*</excludes> <!-- we abuse of switch and checkstyle is broken for it -->
</configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.openwebbeans.build-tools</groupId>
- <artifactId>checkstyle-rules</artifactId>
- <version>4.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
+ <!--
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openwebbeans.build-tools</groupId>
+ <artifactId>checkstyle-rules</artifactId>
+ <version>4.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ -->
</plugin>
<plugin>
[openwebbeans] 01/02: OWB-1417 enable owb-gradle and owb-junit5
Posted by st...@apache.org.
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
commit e9884e2925b6fbe449de9d7c7c9db1c8dda4b8a1
Author: Mark Struberg <st...@apache.org>
AuthorDate: Tue Jan 24 15:22:16 2023 +0100
OWB-1417 enable owb-gradle and owb-junit5
---
pom.xml | 5 ++---
.../java/org/apache/openwebbeans/junit5/internal/CdiExtension.java | 2 +-
....inject.spi.Extension => jakarta.enterprise.inject.spi.Extension} | 0
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6f57cb693..4c23da20b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -584,9 +584,10 @@
<module>webbeans-tomcat</module>
<module>webbeans-arquillian</module>
<module>webbeans-slf4j</module>
+ <module>webbeans-gradle</module>
+ <module>webbeans-junit5</module>
<!--X TODO re-enable
<module>webbeans-ee-common</module>
- <module>webbeans-ejb</module>
<module>webbeans-ee</module>
<module>webbeans-jetty9</module>
<module>webbeans-jms</module>
@@ -599,8 +600,6 @@
<module>webbeans-tck</module>
<module>webbeans-tck-jakarta</module>
<module>distribution</module>
- <module>webbeans-gradle</module>
- <module>webbeans-junit5</module>
<module>bom</module>
-->
</modules>
diff --git a/webbeans-junit5/src/main/java/org/apache/openwebbeans/junit5/internal/CdiExtension.java b/webbeans-junit5/src/main/java/org/apache/openwebbeans/junit5/internal/CdiExtension.java
index ea47c0611..6f68cd2e3 100644
--- a/webbeans-junit5/src/main/java/org/apache/openwebbeans/junit5/internal/CdiExtension.java
+++ b/webbeans-junit5/src/main/java/org/apache/openwebbeans/junit5/internal/CdiExtension.java
@@ -138,7 +138,7 @@ public class CdiExtension extends CdiParametersResolverExtension implements Befo
{
final BeanManager manager = container.getBeanManager();
final AnnotatedType<?> annotatedType = manager.createAnnotatedType(instance.getClass());
- final InjectionTarget injectionTarget = manager.createInjectionTarget(annotatedType);
+ final InjectionTarget injectionTarget = manager.getInjectionTargetFactory(annotatedType).createInjectionTarget(null);
final CreationalContext<Object> creationalContext = manager.createCreationalContext(null);
creationalContexts.add(creationalContext);
injectionTarget.inject(instance, creationalContext);
diff --git a/webbeans-junit5/src/test/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/webbeans-junit5/src/test/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
similarity index 100%
rename from webbeans-junit5/src/test/resources/META-INF/services/javax.enterprise.inject.spi.Extension
rename to webbeans-junit5/src/test/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension