Merge pull request #800 from jansupol/20x.merge

Merge with 2.0.x
eclipse-ee4j · Jul 20, 2022 · 6ab3be0 · 6ab3be0
2 parents e3f022e + 4c2cad3
commit 6ab3be0
Show file tree

Hide file tree

Showing 76 changed files with 114 additions and 112 deletions.
diff --git a/archetypes/echo/pom.xml b/archetypes/echo/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
- Copyright (c) 2014, 2017 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2014, 2022 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
@@ -21,7 +21,7 @@
  <parent>
  <groupId>org.glassfish.tyrus.archetypes</groupId>
  <artifactId>tyrus-archetypes-project</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.1.99-SNAPSHOT</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <description>

diff --git a/archetypes/pom.xml b/archetypes/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
- Copyright (c) 2014, 2017 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2014, 2022 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
@@ -22,7 +22,7 @@
  <parent>
  <groupId>org.glassfish.tyrus</groupId>
  <artifactId>tyrus-project</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.1.99-SNAPSHOT</version>
  </parent>
 
  <groupId>org.glassfish.tyrus.archetypes</groupId>

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
- Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2013, 2022 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
@@ -29,7 +29,7 @@
 
  <groupId>org.glassfish.tyrus</groupId>
  <artifactId>tyrus-bom</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.1.99-SNAPSHOT</version>
  <packaging>pom</packaging>
  <name>Tyrus BOM</name>
 

diff --git a/bundles/client-jdk/pom.xml b/bundles/client-jdk/pom.xml
@@ -20,7 +20,7 @@
  <parent>
  <groupId>org.glassfish.tyrus.bundles</groupId>
  <artifactId>tyrus-bundles</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.1.99-SNAPSHOT</version>
  </parent>
 
  <modelVersion>4.0.0</modelVersion>

diff --git a/bundles/client/pom.xml b/bundles/client/pom.xml
@@ -20,7 +20,7 @@
  <parent>
  <groupId>org.glassfish.tyrus.bundles</groupId>
  <artifactId>tyrus-bundles</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.1.99-SNAPSHOT</version>
  </parent>
 
  <modelVersion>4.0.0</modelVersion>

diff --git a/bundles/pom.xml b/bundles/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
- Copyright (c) 2013, 2017 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2013, 2022 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
@@ -24,7 +24,7 @@
  <parent>
  <groupId>org.glassfish.tyrus</groupId>
  <artifactId>tyrus-project</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.1.99-SNAPSHOT</version>
  </parent>
 
  <groupId>org.glassfish.tyrus.bundles</groupId>

diff --git a/bundles/samples/pom.xml b/bundles/samples/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
- Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2013, 2022 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
@@ -24,7 +24,7 @@
  <parent>
  <groupId>org.glassfish.tyrus.bundles</groupId>
  <artifactId>tyrus-bundles</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.1.99-SNAPSHOT</version>
  </parent>
 
  <artifactId>tyrus-samples</artifactId>

diff --git a/bundles/websocket-ri-archive/pom.xml b/bundles/websocket-ri-archive/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
- Copyright (c) 2013, 2021 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2013, 2022 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
@@ -22,7 +22,7 @@
  <parent>
  <groupId>org.glassfish.tyrus.bundles</groupId>
  <artifactId>tyrus-bundles</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.1.99-SNAPSHOT</version>
  </parent>
 
  <artifactId>websocket-ri-archive</artifactId>

diff --git a/bundles/websocket-ri-bundle/pom.xml b/bundles/websocket-ri-bundle/pom.xml
@@ -22,7 +22,7 @@
  <parent>
  <groupId>org.glassfish.tyrus.bundles</groupId>
  <artifactId>tyrus-bundles</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.1.99-SNAPSHOT</version>
  </parent>
 
  <artifactId>websocket-ri-bundle</artifactId>

diff --git a/client/pom.xml b/client/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
- Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2011, 2022 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
@@ -20,7 +20,7 @@
  <parent>
  <groupId>org.glassfish.tyrus</groupId>
  <artifactId>tyrus-project</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.1.99-SNAPSHOT</version>
  </parent>
 
  <modelVersion>4.0.0</modelVersion>

diff --git a/containers/glassfish/cdi/pom.xml b/containers/glassfish/cdi/pom.xml
@@ -22,7 +22,7 @@
  <parent>
  <groupId>org.glassfish.tyrus</groupId>
  <artifactId>tyrus-containers-glassfish-project</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.1.99-SNAPSHOT</version>
  </parent>
 
  <packaging>bundle</packaging>

diff --git a/containers/glassfish/ejb/pom.xml b/containers/glassfish/ejb/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
- Copyright (c) 2013, 2017 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2013, 2022 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
@@ -22,7 +22,7 @@
  <parent>
  <groupId>org.glassfish.tyrus</groupId>
  <artifactId>tyrus-containers-glassfish-project</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.1.99-SNAPSHOT</version>
  </parent>
 
  <packaging>bundle</packaging>

diff --git a/containers/glassfish/pom.xml b/containers/glassfish/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
- Copyright (c) 2012, 2017 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2012, 2022 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
@@ -20,7 +20,7 @@
  <parent>
  <groupId>org.glassfish.tyrus</groupId>
  <artifactId>tyrus-containers-project</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.1.99-SNAPSHOT</version>
  </parent>
 
  <modelVersion>4.0.0</modelVersion>

diff --git a/containers/grizzly-client/pom.xml b/containers/grizzly-client/pom.xml
@@ -22,7 +22,7 @@
  <parent>
  <groupId>org.glassfish.tyrus</groupId>
  <artifactId>tyrus-containers-project</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.1.99-SNAPSHOT</version>
  </parent>
 
  <packaging>bundle</packaging>

diff --git a/containers/grizzly-server/pom.xml b/containers/grizzly-server/pom.xml
@@ -22,7 +22,7 @@
  <parent>
  <groupId>org.glassfish.tyrus</groupId>
  <artifactId>tyrus-containers-project</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.1.99-SNAPSHOT</version>
  </parent>
 
  <packaging>bundle</packaging>

diff --git a/containers/inmemory/pom.xml b/containers/inmemory/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
- Copyright (c) 2013, 2017 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2013, 2022 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
@@ -22,7 +22,7 @@
  <parent>
  <groupId>org.glassfish.tyrus</groupId>
  <artifactId>tyrus-containers-project</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.1.99-SNAPSHOT</version>
  </parent>
 
  <packaging>bundle</packaging>

diff --git a/containers/jdk-client/pom.xml b/containers/jdk-client/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
- Copyright (c) 2014, 2017 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2014, 2022 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
@@ -22,7 +22,7 @@
  <parent>
  <groupId>org.glassfish.tyrus</groupId>
  <artifactId>tyrus-containers-project</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.1.99-SNAPSHOT</version>
  </parent>
 
  <packaging>bundle</packaging>

diff --git a/containers/pom.xml b/containers/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
- Copyright (c) 2011, 2017 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2011, 2022 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
@@ -20,7 +20,7 @@
  <parent>
  <groupId>org.glassfish.tyrus</groupId>
  <artifactId>tyrus-project</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.1.99-SNAPSHOT</version>
  </parent>
 
  <modelVersion>4.0.0</modelVersion>

diff --git a/containers/servlet/pom.xml b/containers/servlet/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
- Copyright (c) 2011, 2021 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2011, 2022 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
@@ -21,7 +21,7 @@
  <parent>
  <groupId>org.glassfish.tyrus</groupId>
  <artifactId>tyrus-containers-project</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.1.99-SNAPSHOT</version>
  </parent>
 
  <modelVersion>4.0.0</modelVersion>

diff --git a/core/pom.xml b/core/pom.xml
@@ -20,7 +20,7 @@
  <parent>
  <groupId>org.glassfish.tyrus</groupId>
  <artifactId>tyrus-project</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.1.99-SNAPSHOT</version>
  </parent>
 
  <modelVersion>4.0.0</modelVersion>

diff --git a/docs/pom.xml b/docs/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
- Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2013, 2022 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
@@ -22,7 +22,7 @@
  <parent>
  <groupId>org.glassfish.tyrus</groupId>
  <artifactId>tyrus-project</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.1.99-SNAPSHOT</version>
  </parent>
 
  <artifactId>tyrus-documentation</artifactId>

diff --git a/ext/client-cli/pom.xml b/ext/client-cli/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
- Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2013, 2022 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
@@ -20,7 +20,7 @@
  <parent>
  <groupId>org.glassfish.tyrus.ext</groupId>
  <artifactId>tyrus-extensions-project</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.1.99-SNAPSHOT</version>
  </parent>
 
  <modelVersion>4.0.0</modelVersion>

diff --git a/ext/client-java8/pom.xml b/ext/client-java8/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
- Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2015, 2022 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
@@ -20,7 +20,7 @@
  <parent>
  <groupId>org.glassfish.tyrus.ext</groupId>
  <artifactId>tyrus-extensions-project</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.1.99-SNAPSHOT</version>
  </parent>
 
  <modelVersion>4.0.0</modelVersion>

diff --git a/ext/extension-deflate/pom.xml b/ext/extension-deflate/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
- Copyright (c) 2014, 2017 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2014, 2022 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
@@ -20,7 +20,7 @@
  <parent>
  <groupId>org.glassfish.tyrus.ext</groupId>
  <artifactId>tyrus-extensions-project</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.1.99-SNAPSHOT</version>
  </parent>
 
  <modelVersion>4.0.0</modelVersion>

diff --git a/ext/monitoring-jmx/pom.xml b/ext/monitoring-jmx/pom.xml
@@ -22,7 +22,7 @@
  <parent>
  <groupId>org.glassfish.tyrus.ext</groupId>
  <artifactId>tyrus-extensions-project</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.1.99-SNAPSHOT</version>
  </parent>
 
  <artifactId>tyrus-monitoring-jmx</artifactId>

diff --git a/ext/pom.xml b/ext/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
- Copyright (c) 2013, 2017 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2013, 2022 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
@@ -20,7 +20,7 @@
  <parent>
  <groupId>org.glassfish.tyrus</groupId>
  <artifactId>tyrus-project</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.1.99-SNAPSHOT</version>
  </parent>
 
  <modelVersion>4.0.0</modelVersion>

diff --git a/pom.xml b/pom.xml
@@ -27,7 +27,7 @@
 
  <groupId>org.glassfish.tyrus</groupId>
  <artifactId>tyrus-project</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.1.99-SNAPSHOT</version>
  <packaging>pom</packaging>
  <name>tyrus</name>
  <description>Tyrus is the reference implementation of Java API for WebSocket (JSR-356)</description>