diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/com.google.zxing,core,3.2.1,Apache Software License 2.0.txt b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/com.google.zxing,core,3.4.0,Apache Software License 2.0.txt similarity index 85% rename from distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/com.google.zxing,core,3.2.1,Apache Software License 2.0.txt rename to distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/com.google.zxing,core,3.4.0,Apache Software License 2.0.txt index 261eeb9e9f..510991edab 100644 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/com.google.zxing,core,3.2.1,Apache Software License 2.0.txt +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/com.google.zxing,core,3.4.0,Apache Software License 2.0.txt @@ -199,3 +199,47 @@ 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. + +======================================================================== +jai-imageio +======================================================================== + +Copyright (c) 2005 Sun Microsystems, Inc. +Copyright © 2010-2014 University of Manchester +Copyright © 2010-2015 Stian Soiland-Reyes +Copyright © 2015 Peter Hull +All Rights Reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +- Redistribution of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +- Redistribution in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + +Neither the name of Sun Microsystems, Inc. or the names of +contributors may be used to endorse or promote products derived +from this software without specific prior written permission. + +This software is provided "AS IS," without a warranty of any +kind. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND +WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY +EXCLUDED. SUN MIDROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL +NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF +USING, MODIFYING OR DISTRIBUTING THIS SOFTWARE OR ITS +DERIVATIVES. IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR +ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, +CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND +REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR +INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + +You acknowledge that this software is not designed or intended for +use in the design, construction, operation or maintenance of any +nuclear facility. \ No newline at end of file diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/com.google.zxing,javase,3.2.1,Apache Software License 2.0.txt b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/com.google.zxing,javase,3.4.0,Apache Software License 2.0.txt similarity index 85% rename from distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/com.google.zxing,javase,3.2.1,Apache Software License 2.0.txt rename to distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/com.google.zxing,javase,3.4.0,Apache Software License 2.0.txt index 261eeb9e9f..510991edab 100644 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/com.google.zxing,javase,3.2.1,Apache Software License 2.0.txt +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/com.google.zxing,javase,3.4.0,Apache Software License 2.0.txt @@ -199,3 +199,47 @@ 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. + +======================================================================== +jai-imageio +======================================================================== + +Copyright (c) 2005 Sun Microsystems, Inc. +Copyright © 2010-2014 University of Manchester +Copyright © 2010-2015 Stian Soiland-Reyes +Copyright © 2015 Peter Hull +All Rights Reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +- Redistribution of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +- Redistribution in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + +Neither the name of Sun Microsystems, Inc. or the names of +contributors may be used to endorse or promote products derived +from this software without specific prior written permission. + +This software is provided "AS IS," without a warranty of any +kind. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND +WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY +EXCLUDED. SUN MIDROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL +NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF +USING, MODIFYING OR DISTRIBUTING THIS SOFTWARE OR ITS +DERIVATIVES. IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR +ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, +CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND +REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR +INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + +You acknowledge that this software is not designed or intended for +use in the design, construction, operation or maintenance of any +nuclear facility. \ No newline at end of file diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/licenses.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/licenses.xml index 7655374202..a9ac7b6148 100644 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/licenses.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/keycloak/licenses.xml @@ -26,22 +26,22 @@ com.google.zxing core - 3.2.1 + 3.4.0 Apache Software License 2.0 - https://raw.githubusercontent.com/zxing/zxing/zxing-3.2.1/COPYING + https://raw.githubusercontent.com/zxing/zxing/zxing-3.4.0/LICENSE com.google.zxing javase - 3.2.1 + 3.4.0 Apache Software License 2.0 - https://raw.githubusercontent.com/zxing/zxing/zxing-3.2.1/COPYING + https://raw.githubusercontent.com/zxing/zxing/zxing-3.4.0/LICENSE diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/com.google.zxing,core,3.2.1.redhat-4,Apache Software License 2.0.txt b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/com.google.zxing,core,3.4.0.redhat-00001,Apache Software License 2.0.txt similarity index 85% rename from distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/com.google.zxing,core,3.2.1.redhat-4,Apache Software License 2.0.txt rename to distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/com.google.zxing,core,3.4.0.redhat-00001,Apache Software License 2.0.txt index 261eeb9e9f..510991edab 100644 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/com.google.zxing,core,3.2.1.redhat-4,Apache Software License 2.0.txt +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/com.google.zxing,core,3.4.0.redhat-00001,Apache Software License 2.0.txt @@ -199,3 +199,47 @@ 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. + +======================================================================== +jai-imageio +======================================================================== + +Copyright (c) 2005 Sun Microsystems, Inc. +Copyright © 2010-2014 University of Manchester +Copyright © 2010-2015 Stian Soiland-Reyes +Copyright © 2015 Peter Hull +All Rights Reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +- Redistribution of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +- Redistribution in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + +Neither the name of Sun Microsystems, Inc. or the names of +contributors may be used to endorse or promote products derived +from this software without specific prior written permission. + +This software is provided "AS IS," without a warranty of any +kind. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND +WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY +EXCLUDED. SUN MIDROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL +NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF +USING, MODIFYING OR DISTRIBUTING THIS SOFTWARE OR ITS +DERIVATIVES. IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR +ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, +CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND +REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR +INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + +You acknowledge that this software is not designed or intended for +use in the design, construction, operation or maintenance of any +nuclear facility. \ No newline at end of file diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/com.google.zxing,javase,3.2.1.redhat-4,Apache Software License 2.0.txt b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/com.google.zxing,javase,3.4.0.redhat-00001,Apache Software License 2.0.txt similarity index 85% rename from distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/com.google.zxing,javase,3.2.1.redhat-4,Apache Software License 2.0.txt rename to distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/com.google.zxing,javase,3.4.0.redhat-00001,Apache Software License 2.0.txt index 261eeb9e9f..510991edab 100644 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/com.google.zxing,javase,3.2.1.redhat-4,Apache Software License 2.0.txt +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/com.google.zxing,javase,3.4.0.redhat-00001,Apache Software License 2.0.txt @@ -199,3 +199,47 @@ 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. + +======================================================================== +jai-imageio +======================================================================== + +Copyright (c) 2005 Sun Microsystems, Inc. +Copyright © 2010-2014 University of Manchester +Copyright © 2010-2015 Stian Soiland-Reyes +Copyright © 2015 Peter Hull +All Rights Reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +- Redistribution of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +- Redistribution in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + +Neither the name of Sun Microsystems, Inc. or the names of +contributors may be used to endorse or promote products derived +from this software without specific prior written permission. + +This software is provided "AS IS," without a warranty of any +kind. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND +WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY +EXCLUDED. SUN MIDROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL +NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF +USING, MODIFYING OR DISTRIBUTING THIS SOFTWARE OR ITS +DERIVATIVES. IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR +ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, +CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND +REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR +INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + +You acknowledge that this software is not designed or intended for +use in the design, construction, operation or maintenance of any +nuclear facility. \ No newline at end of file diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/licenses.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/licenses.xml index 515b10a906..015b44567b 100644 --- a/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/licenses.xml +++ b/distribution/feature-packs/server-feature-pack/src/main/resources/licenses/rh-sso/licenses.xml @@ -26,22 +26,22 @@ com.google.zxing core - 3.2.1.redhat-4 + 3.4.0.redhat-00001 Apache Software License 2.0 - https://raw.githubusercontent.com/zxing/zxing/zxing-3.2.1/COPYING + https://raw.githubusercontent.com/zxing/zxing/zxing-3.4.0/LICENSE com.google.zxing javase - 3.2.1.redhat-4 + 3.4.0.redhat-00001 Apache Software License 2.0 - https://raw.githubusercontent.com/zxing/zxing/zxing-3.2.1/COPYING + https://raw.githubusercontent.com/zxing/zxing/zxing-3.4.0/LICENSE diff --git a/pom.xml b/pom.xml index 97879e67f0..0cefe1702f 100755 --- a/pom.xml +++ b/pom.xml @@ -113,7 +113,7 @@ 3.9 2.0.0-M21 1.0.0-M33 - 3.2.1 + 3.4.0 2.3.29 ${jetty92.version}