[bval] branch master updated: Make jsr module tests passing
This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bval.git
The following commit(s) were added to refs/heads/master by this push:
new 195f4e2 Make jsr module tests passing
195f4e2 is described below
commit 195f4e2748607920cf5cf022b3602e37ae9a0990
Author: Romain Manni-Bucau
AuthorDate: Wed Feb 8 16:53:51 2023 +0100
Make jsr module tests passing
---
bval-jsr/pom.xml | 4 ++--
.../main/java/org/apache/bval/jsr/xml/ValidationMappingParser.java| 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/bval-jsr/pom.xml b/bval-jsr/pom.xml
index 6eaf0f2..fd320fa 100644
--- a/bval-jsr/pom.xml
+++ b/bval-jsr/pom.xml
@@ -243,7 +243,7 @@
org.codehaus.mojo
jaxb2-maven-plugin
-2.5.0
+3.1.0
xjc
@@ -280,7 +280,7 @@
com.sun.xml.bind
jaxb-impl
-3.0.0
+4.0.1
diff --git
a/bval-jsr/src/main/java/org/apache/bval/jsr/xml/ValidationMappingParser.java
b/bval-jsr/src/main/java/org/apache/bval/jsr/xml/ValidationMappingParser.java
index dbeaaac..b9763f4 100644
---
a/bval-jsr/src/main/java/org/apache/bval/jsr/xml/ValidationMappingParser.java
+++
b/bval-jsr/src/main/java/org/apache/bval/jsr/xml/ValidationMappingParser.java
@@ -57,10 +57,10 @@ public class ValidationMappingParser implements
MetadataSource {
"META-INF/validation-mapping-1.0.xsd")
.add(XmlBuilder.Version.v11.getId(),
"http://jboss.org/xml/ns/javax/validation/mapping;,
"META-INF/validation-mapping-1.1.xsd")
+.add(XmlBuilder.Version.v20.getId(),
"http://xmlns.jcp.org/xml/ns/validation/mapping;,
+"META-INF/validation-mapping-2.0.xsd")
.add(XmlBuilder.Version.v30.getId(),
"https://jakarta.ee/xml/ns/validation/mapping;,
"META-INF/validation-mapping-3.0.xsd")
-.add(XmlBuilder.Version.v20.getId(),
"http://xmlns.jcp.org/xml/ns/validation/mapping;,
-"META-INF/validation-mapping-2.0.xsd")
.build();
private ApacheValidatorFactory validatorFactory;
[bval] branch master updated: same name as directory
This is an automated email from the ASF dual-hosted git repository. tandraschko pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/bval.git The following commit(s) were added to refs/heads/master by this push: new 2df4494 same name as directory 2df4494 is described below commit 2df4494b3772f2983672658e0f28a604bf684cf5 Author: Thomas Andraschko AuthorDate: Wed Feb 8 16:30:59 2023 +0100 same name as directory --- bval-tck/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bval-tck/pom.xml b/bval-tck/pom.xml index f246271..efef7d2 100644 --- a/bval-tck/pom.xml +++ b/bval-tck/pom.xml @@ -26,7 +26,7 @@ under the License. 3.0.0-SNAPSHOT -bval-tck-runner +bval-tck Apache BVal :: TCK Runner Aggregates dependencies and runs the JSR-380 TCK
[bval] branch master updated: duplicate EL API
This is an automated email from the ASF dual-hosted git repository. tandraschko pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/bval.git The following commit(s) were added to refs/heads/master by this push: new 627cadf duplicate EL API 627cadf is described below commit 627cadf4b976192fbf68033349490fba97ac502c Author: Thomas Andraschko AuthorDate: Wed Feb 8 16:28:28 2023 +0100 duplicate EL API --- bval-jsr/pom.xml | 22 ++ 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/bval-jsr/pom.xml b/bval-jsr/pom.xml index 756e98a..6eaf0f2 100644 --- a/bval-jsr/pom.xml +++ b/bval-jsr/pom.xml @@ -217,27 +217,17 @@ expressly 5.0.0 test + + +jakarta.el +jakarta.el-api + + - - install - src/main/resources
[bval] branch master updated: added github workflow
This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bval.git
The following commit(s) were added to refs/heads/master by this push:
new ce1eb74 added github workflow
ce1eb74 is described below
commit ce1eb743f71b78cf720b3fa5f98f170ba9b7ca6c
Author: Thomas Andraschko
AuthorDate: Wed Feb 8 16:13:07 2023 +0100
added github workflow
---
.github/workflows/bval-ci.yml | 70 +++
1 file changed, 70 insertions(+)
diff --git a/.github/workflows/bval-ci.yml b/.github/workflows/bval-ci.yml
new file mode 100644
index 000..21188dc
--- /dev/null
+++ b/.github/workflows/bval-ci.yml
@@ -0,0 +1,70 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+# NOTE https://infra.apache.org/github-actions-secrets.html
+
+name: BVal CI
+
+on:
+ push:
+branches:
+ - master
+ - main
+ - bval-1.1.x
+ - bval-2.x
+paths-ignore:
+ - '**.md'
+ - '.travis.yml'
+ - 'Jenkinsfile'
+ pull_request:
+branches:
+ - master
+ - main
+ - bval-1.1.x
+ - bval-2.x
+paths-ignore:
+ - '**.md'
+ - '.travis.yml'
+ - 'Jenkinsfile'
+ workflow_dispatch:
+
+permissions:
+ contents: read
+
+jobs:
+ build:
+
+runs-on: ubuntu-latest
+
+steps:
+ - uses: actions/checkout@v3
+with:
+ persist-credentials: false
+ - name: Set up JDK 11
+uses: actions/setup-java@v3
+with:
+ distribution: 'temurin'
+ java-version: 11
+ - name: Cache Maven packages
+uses: actions/cache@v3
+with:
+ path: ~/.m2
+ key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+ restore-keys: ${{ runner.os }}-m2
+ - name: Build with Maven
+run: mvn clean install
\ No newline at end of file
[bval] branch master updated: fixed tests the right way
This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bval.git
The following commit(s) were added to refs/heads/master by this push:
new b89a633 fixed tests the right way
b89a633 is described below
commit b89a6331baffce920c87269f1b4e4b1f10a6a55a
Author: Thomas Andraschko
AuthorDate: Wed Feb 8 15:59:55 2023 +0100
fixed tests the right way
---
.../bval/jsr/DefaultMessageInterpolatorTest.java | 9 ++-
.../apache/bval/jsr/DelegateExpressionFactory.java | 93 ++
.../META-INF/services/jakarta.el.ExpressionFactory | 17
3 files changed, 115 insertions(+), 4 deletions(-)
diff --git
a/bval-jsr/src/test/java/org/apache/bval/jsr/DefaultMessageInterpolatorTest.java
b/bval-jsr/src/test/java/org/apache/bval/jsr/DefaultMessageInterpolatorTest.java
index 5ad3929..bd8e744 100644
---
a/bval-jsr/src/test/java/org/apache/bval/jsr/DefaultMessageInterpolatorTest.java
+++
b/bval-jsr/src/test/java/org/apache/bval/jsr/DefaultMessageInterpolatorTest.java
@@ -93,15 +93,16 @@ public class DefaultMessageInterpolatorTest {
Thread.currentThread().setContextClassLoader(new URLClassLoader(new
URL[] {}, originalClassLoader));
try {
-Class elFactoryClass;
if (elFactory == null) {
-elFactoryClass = ExpressionFactory.class;
System.clearProperty(ExpressionFactory.class.getName());
} else {
-elFactoryClass = Class.forName(elFactory);
+Class elFactoryClass = Class.forName(elFactory);
System.setProperty(ExpressionFactory.class.getName(),
elFactory);
+
+Class usedImpl =
+((DelegateExpressionFactory)
ExpressionFactory.newInstance()).getWrapped().getClass();
+assertTrue(elFactoryClass == usedImpl);
}
-
assertTrue(elFactoryClass.isInstance(ExpressionFactory.newInstance()));
elAvailable = true;
} catch (Exception e) {
elAvailable = false;
diff --git
a/bval-jsr/src/test/java/org/apache/bval/jsr/DelegateExpressionFactory.java
b/bval-jsr/src/test/java/org/apache/bval/jsr/DelegateExpressionFactory.java
new file mode 100644
index 000..24742c3
--- /dev/null
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/DelegateExpressionFactory.java
@@ -0,0 +1,93 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
under
+ * the License.
+ */
+package org.apache.bval.jsr;
+
+import jakarta.el.*;
+
+import java.lang.reflect.Method;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.ServiceLoader;
+
+/**
+ * EL5.0 ExpressionFactory lookups the ServiceLoader before the system property
+ * In our tests we have at least 2 EL impls and DefaultMessageInterpolatorTest
needs a replaceable ExpressionFactory
+ * So this a wrapper, which checks the system property first and then asking
the ServiceLoader
+ */
+public class DelegateExpressionFactory extends ExpressionFactory {
+
+public DelegateExpressionFactory() {
+
+}
+
+@Override
+public ValueExpression createValueExpression(ELContext context, String
expression, Class expectedType) {
+return getWrapped().createValueExpression(context, expression,
expectedType);
+}
+
+@Override
+public ValueExpression createValueExpression(Object instance, Class
expectedType) {
+return getWrapped().createValueExpression(instance, expectedType);
+}
+
+@Override
+public MethodExpression createMethodExpression(ELContext context, String
expression, Class expectedReturnType, Class[] expectedParamTypes) {
+return getWrapped().createMethodExpression(context, expression,
expectedReturnType, expectedParamTypes);
+}
+
+@Override
+public T coerceToType(Object obj, Class targetType) {
+return getWrapped().coerceToType(obj, targetType);
+}
+
+@Override
+public ELResolver getStreamELResolver() {
+return getWrapped().getStreamELResolver();
+}
+
+@Override
+public Map getInitFunctionMap() {
+return getWrapped().getInitFunctionMap();
+}
+
+public ExpressionFactory
[bval] branch master updated: put back old code + remove duplicate EL API
This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bval.git
The following commit(s) were added to refs/heads/master by this push:
new c07ee17 put back old code + remove duplicate EL API
c07ee17 is described below
commit c07ee17a4c3e2547073eec209a9a6f72aacc20ad
Author: Thomas Andraschko
AuthorDate: Wed Feb 8 15:40:33 2023 +0100
put back old code
+ remove duplicate EL API
---
bval-jsr/pom.xml | 6 ++
.../org/apache/bval/jsr/DefaultMessageInterpolatorTest.java| 10 --
bval-perf/pom.xml | 2 +-
3 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/bval-jsr/pom.xml b/bval-jsr/pom.xml
index ce62dda..756e98a 100644
--- a/bval-jsr/pom.xml
+++ b/bval-jsr/pom.xml
@@ -163,6 +163,12 @@
4.0.1
provided
true
+
+
+jakarta.el
+jakarta.el-api
+
+
org.apache.tomcat
diff --git
a/bval-jsr/src/test/java/org/apache/bval/jsr/DefaultMessageInterpolatorTest.java
b/bval-jsr/src/test/java/org/apache/bval/jsr/DefaultMessageInterpolatorTest.java
index fa471a8..5ad3929 100644
---
a/bval-jsr/src/test/java/org/apache/bval/jsr/DefaultMessageInterpolatorTest.java
+++
b/bval-jsr/src/test/java/org/apache/bval/jsr/DefaultMessageInterpolatorTest.java
@@ -29,10 +29,7 @@ import static org.mockito.Mockito.when;
import java.lang.annotation.Annotation;
import java.net.URL;
import java.net.URLClassLoader;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
-import java.util.Objects;
+import java.util.*;
import java.util.function.Predicate;
import java.util.function.Supplier;
@@ -94,7 +91,7 @@ public class DefaultMessageInterpolatorTest {
// store and replace CCL to sidestep EL factory caching
originalClassLoader = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader(new URLClassLoader(new
URL[] {}, originalClassLoader));
-
+
try {
Class elFactoryClass;
if (elFactory == null) {
@@ -104,7 +101,8 @@ public class DefaultMessageInterpolatorTest {
elFactoryClass = Class.forName(elFactory);
System.setProperty(ExpressionFactory.class.getName(),
elFactory);
}
-elAvailable =
ExpressionFactory.class.isAssignableFrom(elFactoryClass);
+
assertTrue(elFactoryClass.isInstance(ExpressionFactory.newInstance()));
+elAvailable = true;
} catch (Exception e) {
elAvailable = false;
}
diff --git a/bval-perf/pom.xml b/bval-perf/pom.xml
index 816ba77..d6b5d41 100644
--- a/bval-perf/pom.xml
+++ b/bval-perf/pom.xml
@@ -53,7 +53,7 @@
org.apache.tomcat
tomcat-el-api
-test
+ test
org.apache.tomcat
[bval] branch master updated: Some more fixes so we can run the TCK
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bval.git
The following commit(s) were added to refs/heads/master by this push:
new 3965a9b Some more fixes so we can run the TCK
3965a9b is described below
commit 3965a9b6887d6a3e9f74ea9a6ae627ad240af7e0
Author: Jean-Louis Monteiro
AuthorDate: Wed Feb 8 15:37:18 2023 +0100
Some more fixes so we can run the TCK
---
.../bval/jsr/DefaultMessageInterpolatorTest.java | 2 +-
bval-tck/pom.xml | 36 +++---
2 files changed, 32 insertions(+), 6 deletions(-)
diff --git
a/bval-jsr/src/test/java/org/apache/bval/jsr/DefaultMessageInterpolatorTest.java
b/bval-jsr/src/test/java/org/apache/bval/jsr/DefaultMessageInterpolatorTest.java
index 20ecb37..fa471a8 100644
---
a/bval-jsr/src/test/java/org/apache/bval/jsr/DefaultMessageInterpolatorTest.java
+++
b/bval-jsr/src/test/java/org/apache/bval/jsr/DefaultMessageInterpolatorTest.java
@@ -264,7 +264,7 @@ public class DefaultMessageInterpolatorTest {
@Test
public void testELEscapingRI() {
assumeTrue(elAvailable);
-assumeThat(elImpl, equalTo("ri"));
+assumeThat(elImpl, equalTo("ri"));
ApacheMessageContext context = context("12345678",
() ->
validator.getConstraintsForClass(Person.class).getConstraintsForProperty("idNumber")
diff --git a/bval-tck/pom.xml b/bval-tck/pom.xml
index 4d8bee0..f246271 100644
--- a/bval-tck/pom.xml
+++ b/bval-tck/pom.xml
@@ -180,14 +180,39 @@ under the License.
true
-
+
+org.apache.maven.plugins
+maven-dependency-plugin
+2.10
+
+
+copy-tck-test-suite-file
+generate-test-sources
+
+copy
+
+
+true
+
+
+
jakarta.validation
+
beanvalidation-tck-tests
+xml
+suite
+false
+
+
+
+
+
+
org.apache.maven.plugins
maven-surefire-plugin
-Duser.language=en
-
${basedir}/src/test/beanvalidation-tck-tests-suite.xml
+
${project.build.directory}/dependency/beanvalidation-tck-tests-suite.xml
@@ -203,8 +228,9 @@ under the License.
${project.basedir}/src/test/resources/logging.properties
-methods
-4
+classes
+1
+false
@@ -251,7 +277,7 @@ under the License.
jakarta.validation
beanvalidation-tck-tests
-
${bval-tck.version}
+${tck.version}
jar
false
[bval] branch master updated: Fix TCK setup and use a jakarta compatible version
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bval.git
The following commit(s) were added to refs/heads/master by this push:
new 14e6d21 Fix TCK setup and use a jakarta compatible version
14e6d21 is described below
commit 14e6d219b5055d454c133e2d392af096adf3499c
Author: Jean-Louis Monteiro
AuthorDate: Wed Feb 8 14:51:54 2023 +0100
Fix TCK setup and use a jakarta compatible version
---
bval-perf/pom.xml | 6 +++---
bval-tck/pom.xml | 54 --
2 files changed, 27 insertions(+), 33 deletions(-)
diff --git a/bval-perf/pom.xml b/bval-perf/pom.xml
index bfe1886..816ba77 100644
--- a/bval-perf/pom.xml
+++ b/bval-perf/pom.xml
@@ -71,20 +71,20 @@
org.hibernate
hibernate-validator
- 6.1.5.Final
+ 7.0.5.Final
test
org.openjdk.jmh
jmh-core
- 1.25.2
+ 1.35
test
org.openjdk.jmh
jmh-generator-annprocess
- 1.25.2
+ 1.35
test
diff --git a/bval-tck/pom.xml b/bval-tck/pom.xml
index 78c3147..4d8bee0 100644
--- a/bval-tck/pom.xml
+++ b/bval-tck/pom.xml
@@ -31,9 +31,9 @@ under the License.
Aggregates dependencies and runs the JSR-380 TCK
-2.0.5
+3.0.0
4.0.0-SNAPSHOT
-1.1.11.Final
+1.7.0.Alpha14
org.apache.bval.jsr.ApacheValidationProvider
@@ -64,7 +64,7 @@ under the License.
jakarta.activation
jakarta.activation-api
-2.1.0
+2.1.1
provided
@@ -76,7 +76,7 @@ under the License.
org.glassfish.jaxb
jaxb-runtime
-4.0.0
+4.0.2
provided
@@ -136,19 +136,10 @@ under the License.
provided
-org.hibernate.beanvalidation.tck
+jakarta.validation
beanvalidation-tck-tests
${tck.version}
-
-
-jakarta.validation
-validation-api
-
-
-org.jboss.spec.jakarta.interceptor
-jboss-interceptors-api_1.2_spec
-
-
+test
org.jboss.arquillian.testng
@@ -158,7 +149,7 @@ under the License.
org.jboss.arquillian.protocol
-arquillian-protocol-servlet
+arquillian-protocol-servlet-jakarta
${arquillian.version}
test
@@ -166,7 +157,7 @@ under the License.
org.testng
testng
-6.8.21
+7.7.0
test
@@ -247,9 +238,10 @@ under the License.
org.apache.maven.plugins
maven-dependency-plugin
+3.0.0
-extract-sigsfile
+copy-tck-bv-api-signature-file
generate-test-sources
unpack
@@ -257,11 +249,14 @@ under the License.
-
org.hibernate.beanvalidation.tck
+
jakarta.validation
beanvalidation-tck-tests
-${tck.version}
+
${bval-tck.version}
+jar
+false
+
**/*.sig
${project.build.directory}/api-signature
@@ -271,22 +266,21 @@ under the License.
org.netbeans.tools
sigtest-maven-plugin
+1.0
-sigtest
-test
- check
+check
-
-
jakarta.validation,jakarta.validation.bootstrap,jakarta.validation.constraints,
-
[bval] branch master updated: some POM cosmetics
This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bval.git
The following commit(s) were added to refs/heads/master by this push:
new 4ecadb5 some POM cosmetics
4ecadb5 is described below
commit 4ecadb56f7397d6ef1e06b9006c36c9bd3efcd89
Author: Thomas Andraschko
AuthorDate: Wed Feb 8 14:25:58 2023 +0100
some POM cosmetics
---
{bundle => bval-bundle}/pom.xml | 2 +-
bval-extras/pom.xml | 2 +-
bval-jsr/pom.xml| 2 +-
bval-perf/pom.xml | 2 +-
bval-tck/pom.xml| 2 +-
pom.xml | 12 ++--
6 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/bundle/pom.xml b/bval-bundle/pom.xml
similarity index 98%
rename from bundle/pom.xml
rename to bval-bundle/pom.xml
index f546ca7..7c707db 100644
--- a/bundle/pom.xml
+++ b/bval-bundle/pom.xml
@@ -32,7 +32,7 @@
org.apache.bval.bundle
-Apache BVal :: org.apache.bval.bundle
+Apache BVal :: Bundle
bundle
diff --git a/bval-extras/pom.xml b/bval-extras/pom.xml
index 6d95483..5ebd50a 100644
--- a/bval-extras/pom.xml
+++ b/bval-extras/pom.xml
@@ -31,7 +31,7 @@
bval-extras
-Apache BVal :: bval-extras (optional)
+Apache BVal :: Extras
bundle
BVal - non-JSR380 routines and constraints
diff --git a/bval-jsr/pom.xml b/bval-jsr/pom.xml
index 15427f4..ce62dda 100644
--- a/bval-jsr/pom.xml
+++ b/bval-jsr/pom.xml
@@ -28,7 +28,7 @@
bval-jsr
-Apache BVal :: bval-jsr
+Apache BVal :: Implementation
jar
Implementation specific classes for JSR 380 Bean Validation
2.0
diff --git a/bval-perf/pom.xml b/bval-perf/pom.xml
index ebd83cc..bfe1886 100644
--- a/bval-perf/pom.xml
+++ b/bval-perf/pom.xml
@@ -28,7 +28,7 @@
bval-perf
- Apache BVal :: bval-perf
+ Apache BVal :: Performance
jar
Some small micro benchmarks
diff --git a/bval-tck/pom.xml b/bval-tck/pom.xml
index 1d8b596..78c3147 100644
--- a/bval-tck/pom.xml
+++ b/bval-tck/pom.xml
@@ -27,7 +27,7 @@ under the License.
bval-tck-runner
-Apache BVal :: bval-tck (TCK Runner)
+Apache BVal :: TCK Runner
Aggregates dependencies and runs the JSR-380 TCK
diff --git a/pom.xml b/pom.xml
index 7a6a0c0..37ca592 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
org.apache.bval
bval-parent
-Apache BVal :: bval-parent (Parent POM)
+Apache BVal
pom
3.0.0-SNAPSHOT
@@ -219,6 +219,14 @@
PMC Member
+
+tandraschko
+Thomas Andraschko
+tandrasc...@apache.org
+
+PMC Member
+
+
@@ -707,7 +715,7 @@
bval-jsr
bval-extras
bval-tck
-bundle
+bval-bundle
bval-perf
[bval] branch master updated: fixed tests
This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bval.git
The following commit(s) were added to refs/heads/master by this push:
new 606276f fixed tests
606276f is described below
commit 606276f25182094ab67b2f182e0beabb1b0bad80
Author: Thomas Andraschko
AuthorDate: Wed Feb 8 14:19:36 2023 +0100
fixed tests
---
.../java/org/apache/bval/jsr/DefaultMessageInterpolatorTest.java | 8 ++--
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git
a/bval-jsr/src/test/java/org/apache/bval/jsr/DefaultMessageInterpolatorTest.java
b/bval-jsr/src/test/java/org/apache/bval/jsr/DefaultMessageInterpolatorTest.java
index 1ce9a25..20ecb37 100644
---
a/bval-jsr/src/test/java/org/apache/bval/jsr/DefaultMessageInterpolatorTest.java
+++
b/bval-jsr/src/test/java/org/apache/bval/jsr/DefaultMessageInterpolatorTest.java
@@ -65,7 +65,6 @@ public class DefaultMessageInterpolatorTest {
return Arrays.asList(new Object[] { "default", null },
new Object[] { "ri",
"org.glassfish.expressly.ExpressionFactoryImpl" },
new Object[] { "tomcat", "org.apache.el.ExpressionFactoryImpl" },
-// new Object[] { "juel", "de.odysseus.el.ExpressionFactoryImpl" },
new Object[] { "invalid", "java.lang.String" });
}
@@ -105,10 +104,7 @@ public class DefaultMessageInterpolatorTest {
elFactoryClass = Class.forName(elFactory);
System.setProperty(ExpressionFactory.class.getName(),
elFactory);
}
-// todo clarify why we would get a different instance while the
service loader will always pick up the first
-// in the classpath. As we have 3 implementations, we will always
get the same one
-
assertTrue(elFactoryClass.isInstance(ExpressionFactory.newInstance()));
-elAvailable = true;
+elAvailable =
ExpressionFactory.class.isAssignableFrom(elFactoryClass);
} catch (Exception e) {
elAvailable = false;
}
@@ -242,7 +238,7 @@ public class DefaultMessageInterpolatorTest {
@Test
public void testELEscapingTomcatJuel() {
assumeTrue(elAvailable);
-assumeThat(elImpl, anyOf(equalTo("tomcat"), equalTo("juel")));
+assumeThat(elImpl, anyOf(equalTo("tomcat")));
// not so much a test as an illustration that the specified EL
implementations are seemingly confused by leading
// backslashes and treats the whole expression as literal. We could
skip any literal text before the first
[bval] branch master updated: Use Jakarta EE 10 compatible version for OWB
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/bval.git The following commit(s) were added to refs/heads/master by this push: new 7b71a06 Use Jakarta EE 10 compatible version for OWB 7b71a06 is described below commit 7b71a06ce424ef75367be864f0488abbe42b5a92 Author: Jean-Louis Monteiro AuthorDate: Wed Feb 8 14:10:02 2023 +0100 Use Jakarta EE 10 compatible version for OWB --- bval-tck/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bval-tck/pom.xml b/bval-tck/pom.xml index a4fb396..1d8b596 100644 --- a/bval-tck/pom.xml +++ b/bval-tck/pom.xml @@ -32,7 +32,7 @@ under the License. 2.0.5 -2.0.18 +4.0.0-SNAPSHOT 1.1.11.Final org.apache.bval.jsr.ApacheValidationProvider
[bval] branch master updated (6923ea9 -> d6d6fc6)
This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/bval.git from 6923ea9 Merge pull request #12 from apache/dependabot/maven/bval-jsr/org.apache.ant-ant-1.10.11 add 49fef5c Next major version add b61798d Move packages to jakarta and update deployment descriptors add d6d6fc6 Merge pull request #16 from apache/jakarta-namespace No new revisions were added by this update. Summary of changes: CHANGES.txt| 2 +- README.txt | 2 +- bundle/pom.xml | 8 +- bval-extras/pom.xml| 48 +-- .../extras/constraints/checkdigit/ABANumber.java | 4 +- .../bval/extras/constraints/checkdigit/CUSIP.java | 4 +- .../bval/extras/constraints/checkdigit/EAN13.java | 4 +- .../bval/extras/constraints/checkdigit/IBAN.java | 4 +- .../constraints/checkdigit/IBANValidator.java | 4 +- .../bval/extras/constraints/checkdigit/ISBN10.java | 4 +- .../bval/extras/constraints/checkdigit/Luhn.java | 4 +- .../constraints/checkdigit/ModulusValidator.java | 4 +- .../bval/extras/constraints/checkdigit/Sedol.java | 4 +- .../extras/constraints/checkdigit/Verhoeff.java| 4 +- .../constraints/checkdigit/VerhoeffValidator.java | 4 +- .../constraints/creditcard/AmericanExpress.java| 6 +- .../bval/extras/constraints/creditcard/Diners.java | 6 +- .../extras/constraints/creditcard/Discover.java| 6 +- .../extras/constraints/creditcard/Mastercard.java | 6 +- .../bval/extras/constraints/creditcard/Visa.java | 6 +- .../bval/extras/constraints/file/Directory.java| 4 +- .../constraints/file/DirectoryValidator.java | 4 +- .../bval/extras/constraints/file/NotDirectory.java | 4 +- .../constraints/file/NotDirectoryValidator.java| 4 +- .../bval/extras/constraints/file/Symlink.java | 4 +- .../extras/constraints/file/SymlinkValidator.java | 4 +- .../apache/bval/extras/constraints/net/Domain.java | 4 +- .../extras/constraints/net/DomainValidator.java| 4 +- .../bval/extras/constraints/net/InetAddress.java | 4 +- .../constraints/net/InetAddressValidator.java | 4 +- .../checkdigit/ABANumberValidatorTest.java | 2 +- .../checkdigit/AbstractCheckDigitTest.java | 2 +- .../constraints/checkdigit/CUSIPValidatorTest.java | 2 +- .../checkdigit/EAN13CheckDigitTest.java| 2 +- .../constraints/checkdigit/IBANCheckDigitTest.java | 2 +- .../checkdigit/ISBN10CheckDigitTest.java | 2 +- .../constraints/checkdigit/LuhnCheckDigitTest.java | 2 +- .../checkdigit/SedolCheckDigitTest.java| 2 +- .../checkdigit/VerhoeffCheckDigitTest.java | 2 +- .../constraints/net/DomainValidatorTest.java | 2 +- bval-jsr/pom.xml | 193 ++-- .../main/java/org/apache/bval/cdi/AnyLiteral.java | 2 +- .../org/apache/bval/cdi/BValAnnotatedType.java | 8 +- .../main/java/org/apache/bval/cdi/BValBinding.java | 2 +- .../java/org/apache/bval/cdi/BValExtension.java| 57 ++-- .../java/org/apache/bval/cdi/BValInterceptor.java | 36 +-- .../org/apache/bval/cdi/BValInterceptorBean.java | 24 +- .../java/org/apache/bval/cdi/DefaultLiteral.java | 2 +- .../apache/bval/cdi/EmptyAnnotationLiteral.java| 2 +- .../java/org/apache/bval/cdi/ValidatorBean.java| 17 +- .../org/apache/bval/cdi/ValidatorFactoryBean.java | 17 +- .../bval/constraints/AbstractPatternValidator.java | 6 +- .../bval/constraints/AssertFalseValidator.java | 6 +- .../bval/constraints/AssertTrueValidator.java | 6 +- .../bval/constraints/DecimalMaxValidator.java | 6 +- .../bval/constraints/DecimalMinValidator.java | 6 +- .../bval/constraints/DigitsValidatorForNumber.java | 6 +- .../bval/constraints/DigitsValidatorForString.java | 6 +- .../java/org/apache/bval/constraints/Email.java| 14 +- .../apache/bval/constraints/EmailValidator.java| 6 +- .../bval/constraints/FutureOrPresentValidator.java | 4 +- .../apache/bval/constraints/FutureValidator.java | 4 +- .../bval/constraints/MaxValidatorForNumber.java| 6 +- .../bval/constraints/MaxValidatorForString.java| 6 +- .../bval/constraints/MinValidatorForNumber.java| 6 +- .../bval/constraints/MinValidatorForString.java| 6 +- .../apache/bval/constraints/NotBlankValidator.java | 6 +- .../java/org/apache/bval/constraints/NotEmpty.java | 10 +- .../apache/bval/constraints/NotEmptyValidator.java | 8 +- .../NotEmptyValidatorForCharSequence.java | 6 +- .../NotEmptyValidatorForCollection.java| 6 +- .../bval/constraints/NotEmptyValidatorForMap.java | 6 +- .../apache/bval/constraints/NotNullValidator.java | 6 +-
