diff --git a/NOTICE.md b/NOTICE.md index 2c86b6a965..9e0b85084d 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -47,6 +47,11 @@ Bean Validation API 2.0.2 * Copyright: 2009, Red Hat, Inc. and/or its affiliates, and individual contributors * by the @authors tag. +Hibernate Validator CDI, 6.1.2.Final +* License: Apache License, 2.0 +* Project: https://beanvalidation.org/ +* Repackaged in org.glassfish.jersey.server.validation.internal.hibernate + Bootstrap v3.3.7 * License: MIT license (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Project: http://getbootstrap.com @@ -65,7 +70,7 @@ Javassist Version 3.25.0-GA * Project: http://www.javassist.org/ * Copyright (C) 1999- Shigeru Chiba. All Rights Reserved. -Jackson JAX-RS Providers Version 2.9.9 +Jackson JAX-RS Providers Version 2.10.1 * License: Apache License, 2.0 * Project: https://github.com/FasterXML/jackson-jaxrs-providers * Copyright: (c) 2009-2011 FasterXML, LLC. All rights reserved unless otherwise indicated. @@ -90,7 +95,7 @@ KineticJS, v4.7.1 * Project: http://www.kineticjs.com, https://github.com/ericdrowell/KineticJS * Copyright: Eric Rowell -org.objectweb.asm Version 7.2 +org.objectweb.asm Version 8.0 * License: Modified BSD (http://asm.objectweb.org/license.html) * Copyright (c) 2000-2011 INRIA, France Telecom. All rights reserved. diff --git a/core-server/src/main/resources/META-INF/NOTICE.markdown b/core-server/src/main/resources/META-INF/NOTICE.markdown index 2e97c390af..4dfbd7f80f 100644 --- a/core-server/src/main/resources/META-INF/NOTICE.markdown +++ b/core-server/src/main/resources/META-INF/NOTICE.markdown @@ -36,7 +36,7 @@ org.glassfish.jersey.server.internal.monitoring.core * Copyright (c) 2015-2018 Oracle and/or its affiliates. All rights reserved. * Copyright 2010-2013 Coda Hale and Yammer, Inc. -org.objectweb.asm Version 7.2 +org.objectweb.asm Version 8.0 * License: Modified BSD (http://asm.objectweb.org/license.html) * Copyright: (c) 2000-2011 INRIA, France Telecom. All rights reserved. diff --git a/ext/bean-validation/src/main/java/org/glassfish/jersey/server/validation/internal/CompositeInjectingConstraintValidatorFactory.java b/ext/bean-validation/src/main/java/org/glassfish/jersey/server/validation/internal/CompositeInjectingConstraintValidatorFactory.java index 271015dbd9..8db4543ad3 100644 --- a/ext/bean-validation/src/main/java/org/glassfish/jersey/server/validation/internal/CompositeInjectingConstraintValidatorFactory.java +++ b/ext/bean-validation/src/main/java/org/glassfish/jersey/server/validation/internal/CompositeInjectingConstraintValidatorFactory.java @@ -1,5 +1,6 @@ /* * Copyright (c) 2018 Payara Foundation and/or its affiliates. All rights reserved. + * Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -15,6 +16,8 @@ */ package org.glassfish.jersey.server.validation.internal; +import org.glassfish.jersey.server.validation.internal.hibernate.HibernateInjectingConstraintValidatorFactory; + import javax.annotation.PostConstruct; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorFactory; diff --git a/ext/bean-validation/src/main/java/org/glassfish/jersey/server/validation/internal/DestructibleBeanInstance.java b/ext/bean-validation/src/main/java/org/glassfish/jersey/server/validation/internal/hibernate/DestructibleBeanInstance.java similarity index 97% rename from ext/bean-validation/src/main/java/org/glassfish/jersey/server/validation/internal/DestructibleBeanInstance.java rename to ext/bean-validation/src/main/java/org/glassfish/jersey/server/validation/internal/hibernate/DestructibleBeanInstance.java index 136a007609..cf9ba299a2 100644 --- a/ext/bean-validation/src/main/java/org/glassfish/jersey/server/validation/internal/DestructibleBeanInstance.java +++ b/ext/bean-validation/src/main/java/org/glassfish/jersey/server/validation/internal/hibernate/DestructibleBeanInstance.java @@ -6,7 +6,7 @@ */ // Portions Copyright [2018] [Payara Foundation and/or its affiliates] -package org.glassfish.jersey.server.validation.internal; +package org.glassfish.jersey.server.validation.internal.hibernate; import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.spi.AnnotatedType; diff --git a/ext/bean-validation/src/main/java/org/glassfish/jersey/server/validation/internal/HibernateInjectingConstraintValidatorFactory.java b/ext/bean-validation/src/main/java/org/glassfish/jersey/server/validation/internal/hibernate/HibernateInjectingConstraintValidatorFactory.java similarity index 96% rename from ext/bean-validation/src/main/java/org/glassfish/jersey/server/validation/internal/HibernateInjectingConstraintValidatorFactory.java rename to ext/bean-validation/src/main/java/org/glassfish/jersey/server/validation/internal/hibernate/HibernateInjectingConstraintValidatorFactory.java index d0ad811a95..e6118803f7 100644 --- a/ext/bean-validation/src/main/java/org/glassfish/jersey/server/validation/internal/HibernateInjectingConstraintValidatorFactory.java +++ b/ext/bean-validation/src/main/java/org/glassfish/jersey/server/validation/internal/hibernate/HibernateInjectingConstraintValidatorFactory.java @@ -6,7 +6,7 @@ */ // Portions Copyright [2018] [Payara Foundation and/or its affiliates] -package org.glassfish.jersey.server.validation.internal; +package org.glassfish.jersey.server.validation.internal.hibernate; import org.glassfish.jersey.ext.cdi1x.internal.CdiUtil; diff --git a/ext/bean-validation/src/main/resources/META-INF/NOTICE.markdown b/ext/bean-validation/src/main/resources/META-INF/NOTICE.markdown new file mode 100644 index 0000000000..501db20b72 --- /dev/null +++ b/ext/bean-validation/src/main/resources/META-INF/NOTICE.markdown @@ -0,0 +1,37 @@ +# Notice for Jersey Bean Validation module +This content is produced and maintained by the Eclipse Jersey project. + +* https://projects.eclipse.org/projects/ee4j.jersey + +## Trademarks +Eclipse Jersey is a trademark of the Eclipse Foundation. + +## Copyright + +All content is the property of the respective authors or their employers. For +more information regarding authorship of content, please consult the listed +source code repository logs. + +## Declared Project Licenses + +This program and the accompanying materials are made available under the terms +of the Eclipse Public License v. 2.0 which is available at +http://www.eclipse.org/legal/epl-2.0. This Source Code may also be made +available under the following Secondary Licenses when the conditions for such +availability set forth in the Eclipse Public License v. 2.0 are satisfied: GNU +General Public License, version 2 with the GNU Classpath Exception which is +available at https://www.gnu.org/software/classpath/license.html. + +SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 + +## Source Code +The project maintains the following source code repositories: + +* https://github.com/eclipse-ee4j/jersey + +## Third-party Content + +Hibernate Validator CDI, 6.1.2.Final +* License: Apache License, 2.0 +* Project: https://beanvalidation.org/ +* Repackaged in org.glassfish.jersey.server.validation.internal.hibernate \ No newline at end of file diff --git a/media/json-jackson/src/main/resources/META-INF/NOTICE.markdown b/media/json-jackson/src/main/resources/META-INF/NOTICE.markdown index f2dc0940c0..1db99624f7 100644 --- a/media/json-jackson/src/main/resources/META-INF/NOTICE.markdown +++ b/media/json-jackson/src/main/resources/META-INF/NOTICE.markdown @@ -31,7 +31,7 @@ The project maintains the following source code repositories: ## Third-party Content -Jackson JAX-RS Providers version 2.9.9 +Jackson JAX-RS Providers version 2.10.1 * License: Apache License, 2.0 * Project: https://github.com/FasterXML/jackson-jaxrs-providers * Copyright: (c) 2009-2011 FasterXML, LLC. All rights reserved unless otherwise indicated. \ No newline at end of file diff --git a/pom.xml b/pom.xml index e0ed6b5624..b31e31879b 100644 --- a/pom.xml +++ b/pom.xml @@ -170,7 +170,8 @@ http://www.apache.org/licenses/LICENSE-2.0.html repo Google Guava @ org.glassfish.jersey.internal.guava, - Dropwizard Monitoring inspired classes @ org.glassfish.jersey.server.internal.monitoring.core and + Dropwizard Monitoring inspired classes @ org.glassfish.jersey.server.internal.monitoring.core, + Hibernate Validation classes @ org.glassfish.jersey.server.validation.internal.hibernate, and Jackson JAX-RS Providers @ org.glassfish.jersey.jackson.internal.jackson.jaxrs