diff --git a/NOTICE.md b/NOTICE.md index 0334fc9c..746e07bf 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -35,7 +35,7 @@ The project maintains the following source code repositories: ## Third-party Content This project leverages the following third party content: -jakarta.enterprise.cdi-api Version 4.1.0 +jakarta.enterprise.cdi-api Version 5.0.0.Alpha3 * License: Apache License, 2.0 * Copyright 2010, Red Hat, Inc., and individual contributors diff --git a/archetypes/echo/pom.xml b/archetypes/echo/pom.xml index 796b2f94..4724fdec 100644 --- a/archetypes/echo/pom.xml +++ b/archetypes/echo/pom.xml @@ -17,20 +17,29 @@ --> - + + 4.0.0 + org.glassfish.tyrus.archetypes tyrus-archetypes-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - 4.0.0 + + tyrus-archetype-echo + + Tyrus Echo Archetype An archetype which contains a Tyrus echo application. - tyrus-archetype-echo - Tyrus Echo Archetype + + + ${basedir}/src/main/resources + true + + org.apache.maven.plugins @@ -55,11 +64,5 @@ - - - ${basedir}/src/main/resources - true - - diff --git a/archetypes/echo/src/main/resources/archetype-resources/pom.xml b/archetypes/echo/src/main/resources/archetype-resources/pom.xml index f5b5ee66..50b8c883 100644 --- a/archetypes/echo/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/echo/src/main/resources/archetype-resources/pom.xml @@ -67,8 +67,8 @@ - 2.2.0 - 11 + 2.3.0-M2 + 21 ${project.version} UTF-8 3.14.0 diff --git a/archetypes/pom.xml b/archetypes/pom.xml index d1a39880..6fe44c4c 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -17,17 +17,19 @@ --> - + 4.0.0 + org.glassfish.tyrus tyrus-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT org.glassfish.tyrus.archetypes tyrus-archetypes-project pom + tyrus-archetypes A module containing archetypes for generating Tyrus-based applications. diff --git a/bom/pom.xml b/bom/pom.xml index ae631f04..44789918 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -17,22 +17,21 @@ --> - - + 4.0.0 org.eclipse.ee4j project - 1.0.9 + 2.0.0 org.glassfish.tyrus tyrus-bom - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT pom - Tyrus BOM + Tyrus BOM Tyrus Bill of Materials (BOM) diff --git a/bundles/client-jdk/pom.xml b/bundles/client-jdk/pom.xml index 6d41282a..53d363e7 100644 --- a/bundles/client-jdk/pom.xml +++ b/bundles/client-jdk/pom.xml @@ -20,7 +20,7 @@ org.glassfish.tyrus.bundles tyrus-bundles - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT 4.0.0 diff --git a/bundles/client/pom.xml b/bundles/client/pom.xml index da631057..0907b7b8 100644 --- a/bundles/client/pom.xml +++ b/bundles/client/pom.xml @@ -20,7 +20,7 @@ org.glassfish.tyrus.bundles tyrus-bundles - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT 4.0.0 diff --git a/bundles/pom.xml b/bundles/pom.xml index 8e73e271..a50c7f7f 100644 --- a/bundles/pom.xml +++ b/bundles/pom.xml @@ -24,7 +24,7 @@ org.glassfish.tyrus tyrus-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT org.glassfish.tyrus.bundles diff --git a/bundles/samples/pom.xml b/bundles/samples/pom.xml index a60a9342..5e4ea92c 100644 --- a/bundles/samples/pom.xml +++ b/bundles/samples/pom.xml @@ -24,7 +24,7 @@ org.glassfish.tyrus.bundles tyrus-bundles - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT tyrus-samples diff --git a/bundles/websocket-ri-archive/pom.xml b/bundles/websocket-ri-archive/pom.xml index 682894f2..ea895609 100755 --- a/bundles/websocket-ri-archive/pom.xml +++ b/bundles/websocket-ri-archive/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tyrus.bundles tyrus-bundles - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT websocket-ri-archive diff --git a/bundles/websocket-ri-bundle/pom.xml b/bundles/websocket-ri-bundle/pom.xml index f938852a..541662a8 100755 --- a/bundles/websocket-ri-bundle/pom.xml +++ b/bundles/websocket-ri-bundle/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tyrus.bundles tyrus-bundles - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT websocket-ri-bundle @@ -30,14 +30,15 @@ bundle + jakarta.servlet jakarta.servlet-api provided - jakarta.enterprise - jakarta.enterprise.cdi-api + jakarta.cdi + jakarta.cdi-api provided @@ -50,22 +51,20 @@ jakarta.xml.bind-api provided + org.glassfish.grizzly grizzly-framework - ${grizzly.version} provided org.glassfish.grizzly grizzly-http-server - ${grizzly.version} provided org.glassfish.tyrus tyrus-container-glassfish-ejb - ${project.version} provided diff --git a/bundles/websocket-risrc-licensee/pom.xml b/bundles/websocket-risrc-licensee/pom.xml index 7660fa50..59e57053 100755 --- a/bundles/websocket-risrc-licensee/pom.xml +++ b/bundles/websocket-risrc-licensee/pom.xml @@ -23,7 +23,7 @@ org.glassfish.tyrus.bundles tyrus-bundles - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT websocket-risrc-licensee diff --git a/client/pom.xml b/client/pom.xml index 66269977..fd2d0019 100755 --- a/client/pom.xml +++ b/client/pom.xml @@ -1,3 +1,4 @@ + - + + 4.0.0 + org.glassfish.tyrus tyrus-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - 4.0.0 tyrus-client bundle + Tyrus Client diff --git a/containers/glassfish/cdi/pom.xml b/containers/glassfish/cdi/pom.xml index 85e5daac..81af13bc 100755 --- a/containers/glassfish/cdi/pom.xml +++ b/containers/glassfish/cdi/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.glassfish.tyrus tyrus-containers-glassfish-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - bundle tyrus-container-glassfish-cdi + bundle Tyrus CDI Component Provider @@ -36,8 +37,8 @@ tyrus-core - jakarta.enterprise - jakarta.enterprise.cdi-api + jakarta.cdi + jakarta.cdi-api jakarta.inject @@ -51,6 +52,7 @@ ${inject.api.version} + @@ -61,10 +63,10 @@ org.glassfish.tyrus.gf.cdi;version=${project.version} - jakarta.enterprise.context.spi;version="[3.0,5)",jakarta.enterprise.inject.spi;version="[3.0,5)",* + jakarta.enterprise.context.spi;version="[3.0,6)",jakarta.enterprise.inject.spi;version="[3.0,6)",* true - jakarta.enterprise.cdi-api + jakarta.cdi.jakarta.cdi-api diff --git a/containers/glassfish/ejb/pom.xml b/containers/glassfish/ejb/pom.xml index 9e65e81c..00b84b75 100755 --- a/containers/glassfish/ejb/pom.xml +++ b/containers/glassfish/ejb/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.glassfish.tyrus tyrus-containers-glassfish-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - bundle tyrus-container-glassfish-ejb + bundle Tyrus EJB Component Provider @@ -40,6 +41,7 @@ jakarta.ejb-api + diff --git a/containers/glassfish/pom.xml b/containers/glassfish/pom.xml index 356c790b..0f37a64c 100755 --- a/containers/glassfish/pom.xml +++ b/containers/glassfish/pom.xml @@ -1,3 +1,4 @@ + - + + 4.0.0 + org.glassfish.tyrus tyrus-containers-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - 4.0.0 tyrus-containers-glassfish-project pom + Tyrus Containers For Glassfish diff --git a/containers/grizzly-client/pom.xml b/containers/grizzly-client/pom.xml index b2402d8c..1fee7438 100755 --- a/containers/grizzly-client/pom.xml +++ b/containers/grizzly-client/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.glassfish.tyrus tyrus-containers-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - bundle tyrus-container-grizzly-client + bundle Tyrus Grizzly Client Container @@ -44,6 +45,7 @@ tyrus-client + diff --git a/containers/grizzly-server/pom.xml b/containers/grizzly-server/pom.xml index 51829dba..9ba61f38 100755 --- a/containers/grizzly-server/pom.xml +++ b/containers/grizzly-server/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.glassfish.tyrus tyrus-containers-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - bundle tyrus-container-grizzly-server + bundle Tyrus Grizzly Server Container @@ -48,6 +49,7 @@ tyrus-container-grizzly-client + diff --git a/containers/inmemory/pom.xml b/containers/inmemory/pom.xml index 62acd9cc..20468314 100644 --- a/containers/inmemory/pom.xml +++ b/containers/inmemory/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.glassfish.tyrus tyrus-containers-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - bundle tyrus-container-inmemory + bundle Tyrus InMemory Container @@ -45,6 +46,7 @@ test + diff --git a/containers/jdk-client/pom.xml b/containers/jdk-client/pom.xml index 5c1c6559..2826357d 100755 --- a/containers/jdk-client/pom.xml +++ b/containers/jdk-client/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.glassfish.tyrus tyrus-containers-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - bundle tyrus-container-jdk-client + bundle Tyrus JDK Client Container @@ -56,6 +57,7 @@ test + diff --git a/containers/jdk-client/src/main/java/org/glassfish/tyrus/container/jdk/client/ClientFilter.java b/containers/jdk-client/src/main/java/org/glassfish/tyrus/container/jdk/client/ClientFilter.java index 2f75252d..3b935d12 100644 --- a/containers/jdk-client/src/main/java/org/glassfish/tyrus/container/jdk/client/ClientFilter.java +++ b/containers/jdk-client/src/main/java/org/glassfish/tyrus/container/jdk/client/ClientFilter.java @@ -21,10 +21,12 @@ import java.net.URI; import java.nio.ByteBuffer; import java.nio.charset.Charset; +import java.security.cert.X509Certificate; import java.util.Base64; import java.util.Collections; import java.util.HashMap; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicBoolean; @@ -301,6 +303,54 @@ public String getRequestUri() { } return sb.toString(); } + + @Override + public X509Certificate[] getUserX509CertificateChain() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getLocalAddress() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getLocalHostName() { + // TODO Auto-generated method stub + return null; + } + + @Override + public int getLocalPort() { + // TODO Auto-generated method stub + return 0; + } + + @Override + public String getRemoteAddress() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getRemoteHostName() { + // TODO Auto-generated method stub + return null; + } + + @Override + public int getRemotePort() { + // TODO Auto-generated method stub + return 0; + } + + @Override + public Locale getPreferredLocale() { + // TODO Auto-generated method stub + return null; + } }; } @@ -331,6 +381,54 @@ public Map> getHeaders() { headers.put("Connection", Collections.singletonList("keep-alive")); return headers; } + + @Override + public X509Certificate[] getUserX509CertificateChain() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getLocalAddress() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getLocalHostName() { + // TODO Auto-generated method stub + return null; + } + + @Override + public int getLocalPort() { + // TODO Auto-generated method stub + return 0; + } + + @Override + public String getRemoteAddress() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getRemoteHostName() { + // TODO Auto-generated method stub + return null; + } + + @Override + public int getRemotePort() { + // TODO Auto-generated method stub + return 0; + } + + @Override + public Locale getPreferredLocale() { + // TODO Auto-generated method stub + return null; + } }; } diff --git a/containers/pom.xml b/containers/pom.xml index 7d091a2b..8848a0cd 100755 --- a/containers/pom.xml +++ b/containers/pom.xml @@ -1,3 +1,4 @@ + - + + 4.0.0 + org.glassfish.tyrus tyrus-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - 4.0.0 tyrus-containers-project pom + Tyrus Container Modules diff --git a/containers/servlet/pom.xml b/containers/servlet/pom.xml index 911da94b..135b388d 100755 --- a/containers/servlet/pom.xml +++ b/containers/servlet/pom.xml @@ -17,18 +17,37 @@ --> - + + 4.0.0 + org.glassfish.tyrus tyrus-containers-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - 4.0.0 tyrus-container-servlet bundle + Tyrus Servlet Bundle + + + jakarta.websocket + jakarta.websocket-api + provided + + + jakarta.servlet + jakarta.servlet-api + provided + + + org.glassfish.tyrus + tyrus-server + + + @@ -65,21 +84,4 @@ - - - - jakarta.websocket - jakarta.websocket-api - provided - - - jakarta.servlet - jakarta.servlet-api - provided - - - org.glassfish.tyrus - tyrus-server - - diff --git a/core/pom.xml b/core/pom.xml index 3946966a..36eb9826 100755 --- a/core/pom.xml +++ b/core/pom.xml @@ -1,3 +1,4 @@ + - + + 4.0.0 + org.glassfish.tyrus tyrus-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - 4.0.0 tyrus-core bundle + Tyrus Core + + ${project.basedir}/target21 + ${project.basedir}/src/main/java21 + + + + + org.glassfish.tyrus + tyrus-spi + + + jakarta.xml.bind + jakarta.xml.bind-api + provided + + + jakarta.activation + jakarta.activation-api + + + + + jakarta.activation + jakarta.activation-api + ${activation.api.version} + provided + + + com.sun.xml.bind + jaxb-osgi + test + + + org.osgi + org.osgi.core + provided + + + junit + junit + test + + + @@ -35,7 +82,6 @@ true - com.sun.istack @@ -152,44 +198,6 @@ - - - org.glassfish.tyrus - tyrus-spi - - - jakarta.xml.bind - jakarta.xml.bind-api - provided - - - jakarta.activation - jakarta.activation-api - - - - - jakarta.activation - jakarta.activation-api - ${activation.api.version} - provided - - - com.sun.xml.bind - jaxb-osgi - test - - - org.osgi - org.osgi.core - provided - - - junit - junit - test - - @@ -244,9 +252,4 @@ - - - ${project.basedir}/target21 - ${project.basedir}/src/main/java21 - diff --git a/core/src/main/java/org/glassfish/tyrus/core/RequestContext.java b/core/src/main/java/org/glassfish/tyrus/core/RequestContext.java index df98062a..1e1b77f8 100644 --- a/core/src/main/java/org/glassfish/tyrus/core/RequestContext.java +++ b/core/src/main/java/org/glassfish/tyrus/core/RequestContext.java @@ -18,10 +18,12 @@ import java.net.URI; import java.security.Principal; +import java.security.cert.X509Certificate; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.TreeMap; @@ -405,4 +407,53 @@ public interface IsUserInRoleDelegate { public boolean isUserInRole(String role); } } + + + @Override + public String getLocalAddress() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getLocalHostName() { + // TODO Auto-generated method stub + return null; + } + + @Override + public int getLocalPort() { + // TODO Auto-generated method stub + return 0; + } + + @Override + public Locale getPreferredLocale() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getRemoteAddress() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getRemoteHostName() { + // TODO Auto-generated method stub + return null; + } + + @Override + public int getRemotePort() { + // TODO Auto-generated method stub + return 0; + } + + @Override + public X509Certificate[] getUserX509CertificateChain() { + // TODO Auto-generated method stub + return null; + } } diff --git a/docs/pom.xml b/docs/pom.xml index dcabb40c..0da29204 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -17,26 +17,26 @@ --> - + 4.0.0 + org.glassfish.tyrus tyrus-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT tyrus-documentation pom + Tyrus Documentation - - - release - - releases - - - + + ${project.build.directory}/assembly + ${basedir}/target/gen-src + snapshots + + @@ -73,8 +73,8 @@ net.sf.docbook docbook-xml 5.0-all - resources zip + resources runtime @@ -167,11 +167,12 @@ - - ${project.build.directory}/assembly - ${basedir}/target/gen-src - snapshots - - - + + + release + + releases + + + diff --git a/etc/jenkins/Jenkinsfile_ci_build b/etc/jenkins/Jenkinsfile_ci_build index 83db1462..93ff8bd7 100644 --- a/etc/jenkins/Jenkinsfile_ci_build +++ b/etc/jenkins/Jenkinsfile_ci_build @@ -6,22 +6,8 @@ pipeline { } stages { - stage('Jersey build') { + stage('Tyrus build') { parallel { - stage('JDK 17 ') { - agent { - label 'centos-7' - } - tools { - jdk 'openjdk-jdk17-latest' - maven 'apache-maven-latest' - } - steps { - sh ''' - mvn -U -C -Dtyrus.test.container.client=org.glassfish.tyrus.container.grizzly.client.GrizzlyClientContainer clean install -Dmaven.javadoc.skip=true - ''' - } - } stage('JDK 21 ') { agent { label 'centos-7' diff --git a/ext/client-cli/pom.xml b/ext/client-cli/pom.xml index 13220d1f..923de28d 100644 --- a/ext/client-cli/pom.xml +++ b/ext/client-cli/pom.xml @@ -1,3 +1,4 @@ + - + + 4.0.0 + org.glassfish.tyrus.ext tyrus-extensions-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - 4.0.0 tyrus-client-cli bundle + Tyrus CLI Client + + org.glassfish.tyrus.ext.client.cli.ClientCli + + org.glassfish.tyrus @@ -102,8 +109,4 @@ - - - org.glassfish.tyrus.ext.client.cli.ClientCli - diff --git a/ext/client-java8/pom.xml b/ext/client-java8/pom.xml index ebbf7f81..6e437f6e 100644 --- a/ext/client-java8/pom.xml +++ b/ext/client-java8/pom.xml @@ -1,3 +1,4 @@ + - + + 4.0.0 + org.glassfish.tyrus.ext tyrus-extensions-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - 4.0.0 tyrus-client-java8 bundle + Tyrus Java8 Client Extension + + org.glassfish.tyrus.ext.client.cli.ClientCli + + org.glassfish.tyrus @@ -79,8 +86,4 @@ - - - org.glassfish.tyrus.ext.client.cli.ClientCli - diff --git a/ext/extension-deflate/pom.xml b/ext/extension-deflate/pom.xml index 732dbaaf..0150676b 100644 --- a/ext/extension-deflate/pom.xml +++ b/ext/extension-deflate/pom.xml @@ -1,3 +1,4 @@ + - + + 4.0.0 + org.glassfish.tyrus.ext tyrus-extensions-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - 4.0.0 tyrus-extension-deflate bundle + Tyrus Extension - Per Message Deflate diff --git a/ext/monitoring-jmx/pom.xml b/ext/monitoring-jmx/pom.xml index 56e0f66a..51f5142e 100644 --- a/ext/monitoring-jmx/pom.xml +++ b/ext/monitoring-jmx/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.glassfish.tyrus.ext tyrus-extensions-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT tyrus-monitoring-jmx + Tyrus Monitoring JMX @@ -60,6 +62,7 @@ test + diff --git a/ext/pom.xml b/ext/pom.xml index 0810e62d..c0aae5e5 100644 --- a/ext/pom.xml +++ b/ext/pom.xml @@ -1,3 +1,4 @@ + - + + 4.0.0 + org.glassfish.tyrus tyrus-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - 4.0.0 org.glassfish.tyrus.ext tyrus-extensions-project pom + Tyrus Extension Modules diff --git a/pom.xml b/pom.xml index 5e6fb769..c679c635 100644 --- a/pom.xml +++ b/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.eclipse.ee4j project - 1.0.9 + 2.0.0 org.glassfish.tyrus tyrus-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT pom - tyrus - Tyrus is the reference implementation of Java API for WebSocket (JSR-356) + tyrus + Tyrus is a compatible implementation of Jakarta WebSocket https://projects.eclipse.org/projects/ee4j.tyrus - - - GitHub - https://github.com/eclipse-ee4j/tyrus/issues - - 2012 - - - scm:git:ssh://git@github.com/eclipse-ee4j/tyrus - scm:git:ssh://git@github.com/eclipse-ee4j/tyrus - https://github.com/eclipse-ee4j/tyrus - HEAD - - - - - central - https://repo1.maven.org/maven2 - - fail - - - - central-portal-snapshots - https://central.sonatype.com/repository/maven-snapshots - - false - - - true - fail - - - - - - - - ossrh - Disabled Sonatype Nexus - http://localhost - - false - - - false - - - - ossrh - Disabled Sonatype Nexus - http://localhost - - false - - - false - - - - + + Oracle Corporation + http://www.oracle.com/ + Eclipse Public License 2.0 @@ -108,11 +52,6 @@ - - Oracle Corporation - http://www.oracle.com/ - - jan_supol @@ -125,7 +64,6 @@ - Pavel Bucek @@ -151,24 +89,84 @@ + + archetypes + bom + client + containers + core + docs + ext + samples + server + spi + tests + + + + scm:git:ssh://git@github.com/eclipse-ee4j/tyrus + scm:git:ssh://git@github.com/eclipse-ee4j/tyrus + https://github.com/eclipse-ee4j/tyrus + HEAD + + + GitHub + https://github.com/eclipse-ee4j/tyrus/issues + + + + + + ossrh + Disabled Sonatype Nexus + http://localhost + + false + + + false + + + + ossrh + Disabled Sonatype Nexus + http://localhost + + false + + + false + + + + - 2.2.0 + 21 + UTF-8 + UTF-8 + + ${java.version} + + + 2.3.0-M2 + 6.2.0-M1 + 2.1.3 + 3.0.0 2.1.3 - 4.1.0 + 5.0.0.Alpha3 4.0.1 - 4.0.2 7.1.0 2.0.1 - 4.0.2 - 4.0.5 + 4.0.5 + + 5.0.0 + 4.0.6 2.14.5 - 2.1.3 - 1.1.6 - 6.1.0 - 2.6.7 + 1.1.7 + - 11 + 3.14.0 3.11.2 @@ -206,23 +204,211 @@ false + published - - archetypes - bom - client - containers - core - docs - ext - samples - server - spi - tests - + + + + + jakarta.websocket + jakarta.websocket-api + ${websocket-api.version} + + + jakarta.websocket + jakarta.websocket-client-api + ${websocket-api.version} + + + jakarta.servlet + jakarta.servlet-api + ${servlet.api.version} + + + jakarta.cdi + jakarta.cdi-api + ${cdi-api.version} + + + jakarta.annotation + jakarta.annotation-api + ${annotation-api.version} + + + jakarta.json + jakarta.json-api + ${json-api.version} + + + jakarta.ejb + jakarta.ejb-api + ${ejb-api.version} + + + jakarta.xml.bind + jakarta.xml.bind-api + ${jaxb.api.version} + + + + + org.osgi + org.osgi.core + 6.0.0 + provided + + + + + + org.eclipse.parsson + parsson + ${json-impl.version} + + + + org.glassfish.grizzly + grizzly-framework + ${grizzly.version} + + + org.glassfish.grizzly + grizzly-http-server + ${grizzly.version} + + + + com.sun.xml.bind + jaxb-impl + ${jaxb.ri.version} + + + com.sun.xml.bind + jaxb-xjc + ${jaxb.ri.version} + + + com.sun.xml.bind + jaxb-osgi + ${jaxb.ri.version} + + + + + + org.glassfish.tyrus + tyrus-client + ${project.version} + + + org.glassfish.tyrus + tyrus-container-grizzly-server + ${project.version} + + + org.glassfish.tyrus + tyrus-container-grizzly-client + ${project.version} + + + org.glassfish.tyrus + tyrus-container-inmemory + ${project.version} + + + org.glassfish.tyrus + tyrus-container-jdk-client + ${project.version} + + + org.glassfish.tyrus + tyrus-core + ${project.version} + + + org.glassfish.tyrus + tyrus-spi + ${project.version} + + + org.glassfish.tyrus + tyrus-container-glassfish-cdi + ${project.version} + + + org.glassfish.tyrus + tyrus-container-glassfish-ejb + ${project.version} + + + org.glassfish.tyrus + tyrus-container-servlet + ${project.version} + + + org.glassfish.tyrus + tyrus-server + ${project.version} + + + org.glassfish.tyrus + tyrus-websocket-core + ${project.version} + + + org.glassfish.tyrus.ext + tyrus-extension-deflate + ${project.version} + + + org.glassfish.tyrus.tests + tyrus-test-tools + ${project.version} + + + org.glassfish.tyrus.ext + tyrus-monitoring-jmx + ${project.version} + + + + org.glassfish.main.extras + glassfish-embedded-all + ${glassfish.version} + + + + + junit + junit + 4.13.2 + + + + + + + central + https://repo1.maven.org/maven2 + + fail + + + + central-portal-snapshots + https://central.sonatype.com/repository/maven-snapshots + + false + + + true + fail + + + @@ -279,28 +465,6 @@ false - - org.glassfish.copyright - glassfish-copyright-maven-plugin - 2.4 - - etc/config/copyright-exclude - - git - - false - - true - - true - - false - false - - false - etc/config/copyright.txt - - org.codehaus.mojo build-helper-maven-plugin @@ -444,8 +608,29 @@ - + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-maven + + enforce + + + + + 3.9.6 + + + + + + + org.commonjava.maven.plugins directory-maven-plugin @@ -463,6 +648,17 @@ + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven.compiler.plugin.version} + + ${java.version} + UTF-8 + + + org.apache.maven.plugins maven-source-plugin @@ -476,21 +672,13 @@ + org.codehaus.mojo build-helper-maven-plugin true - - org.apache.maven.plugins - maven-compiler-plugin - ${maven.compiler.plugin.version} - - ${java.version} - ${java.version} - UTF-8 - - + org.apache.maven.plugins maven-release-plugin @@ -500,6 +688,7 @@ ${release.arguments} + org.apache.maven.plugins maven-deploy-plugin @@ -507,6 +696,7 @@ 10 + org.apache.maven.plugins maven-checkstyle-plugin @@ -526,6 +716,7 @@ + org.glassfish.tyrus.tools.plugins tyrus-jar-updater @@ -564,6 +755,43 @@ + + true + + + org.codehaus.mojo + findbugs-maven-plugin + 3.0.5 + + + + ${findbugs.skip} + ${findbugs.threshold} + ${findbugs.exclude} + + + findbugs + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + etc/config/checkstyle.xml + + + + + checkstyle + + + + + + + @@ -698,217 +926,4 @@ - - - true - - - org.codehaus.mojo - findbugs-maven-plugin - 3.0.5 - - - - ${findbugs.skip} - ${findbugs.threshold} - ${findbugs.exclude} - - - findbugs - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - etc/config/checkstyle.xml - - - - - checkstyle - - - - - - - - - - - jakarta.websocket - jakarta.websocket-api - ${websocket-api.version} - - - jakarta.websocket - jakarta.websocket-client-api - ${websocket-api.version} - - - jakarta.servlet - jakarta.servlet-api - ${servlet.api.version} - - - jakarta.ejb - jakarta.ejb-api - ${ejb-api.version} - - - jakarta.enterprise - jakarta.enterprise.cdi-api - ${cdi-api.version} - - - jakarta.json - jakarta.json-api - ${json-api.version} - - - org.eclipse.parsson - parsson - ${json-impl.version} - - - org.glassfish.grizzly - grizzly-framework - ${grizzly.version} - - - org.glassfish.grizzly - grizzly-http-server - ${grizzly.version} - - - org.glassfish.tyrus - tyrus-client - ${project.version} - - - org.glassfish.tyrus - tyrus-container-grizzly-server - ${project.version} - - - org.glassfish.tyrus - tyrus-container-grizzly-client - ${project.version} - - - org.glassfish.tyrus - tyrus-container-inmemory - ${project.version} - - - org.glassfish.tyrus - tyrus-container-jdk-client - ${project.version} - - - org.glassfish.tyrus - tyrus-core - ${project.version} - - - org.glassfish.tyrus - tyrus-spi - ${project.version} - - - org.glassfish.tyrus - tyrus-container-glassfish-cdi - ${project.version} - - - org.glassfish.tyrus - tyrus-container-glassfish-ejb - ${project.version} - - - org.glassfish.tyrus - tyrus-container-servlet - ${project.version} - - - org.glassfish.tyrus - tyrus-server - ${project.version} - - - org.glassfish.tyrus - tyrus-websocket-core - ${project.version} - - - org.glassfish.tyrus.ext - tyrus-extension-deflate - ${project.version} - - - org.glassfish.tyrus.tests - tyrus-test-tools - ${project.version} - - - org.glassfish.tyrus.ext - tyrus-monitoring-jmx - ${project.version} - - - org.osgi - org.osgi.core - 4.2.0 - provided - - - junit - junit - 4.13.2 - - - org.glassfish.main.extras - glassfish-embedded-all - ${glassfish.version} - - - jakarta.xml.bind - jakarta.xml.bind-api - ${jaxb.api.version} - - - com.sun.xml.bind - jaxb-impl - ${jaxb.ri.version} - - - com.sun.xml.bind - jaxb-xjc - ${jaxb.ri.version} - - - com.sun.xml.bind - jaxb-osgi - ${jaxb.ri.version} - - - jakarta.annotation - jakarta.annotation-api - ${annotation-api.version} - - - - - - - - - - - - - diff --git a/samples/auction/pom.xml b/samples/auction/pom.xml index d7fdb8b2..a54e5e28 100755 --- a/samples/auction/pom.xml +++ b/samples/auction/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.glassfish.tyrus.samples tyrus-samples-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - war tyrus-sample-auction + war Tyrus Auction Sample + + gfv3ee6 + + jakarta.websocket @@ -45,8 +50,4 @@ - - - gfv3ee6 - diff --git a/samples/cdi/pom.xml b/samples/cdi/pom.xml index f743d1dc..ccc4d0b5 100755 --- a/samples/cdi/pom.xml +++ b/samples/cdi/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.glassfish.tyrus.samples tyrus-samples-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - war tyrus-sample-cdi + war Tyrus CDI Sample @@ -36,8 +37,8 @@ provided - jakarta.enterprise - jakarta.enterprise.cdi-api + jakarta.cdi + jakarta.cdi-api provided @@ -50,6 +51,7 @@ jakarta.annotation-api provided + org.glassfish.tyrus tyrus-client @@ -60,6 +62,7 @@ tyrus-container-grizzly-server test + junit junit diff --git a/samples/chat/pom.xml b/samples/chat/pom.xml index 008246b1..74397974 100755 --- a/samples/chat/pom.xml +++ b/samples/chat/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.glassfish.tyrus.samples tyrus-samples-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - war tyrus-sample-chat + war Tyrus Chat Sample + + gfv3ee6 + + jakarta.websocket @@ -45,8 +50,4 @@ - - - gfv3ee6 - diff --git a/samples/draw/pom.xml b/samples/draw/pom.xml index 0cf5fc6e..8b3c6e68 100755 --- a/samples/draw/pom.xml +++ b/samples/draw/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.glassfish.tyrus.samples tyrus-samples-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - war tyrus-sample-draw + war Tyrus Draw Sample + + gfv3ee6 + + jakarta.websocket @@ -45,8 +50,4 @@ - - - gfv3ee6 - diff --git a/samples/echo-basic-auth/pom.xml b/samples/echo-basic-auth/pom.xml index 3558a31d..0dd8d5fd 100755 --- a/samples/echo-basic-auth/pom.xml +++ b/samples/echo-basic-auth/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.glassfish.tyrus.samples tyrus-samples-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - war tyrus-sample-basic-auth + war Tyrus Basic Auth Sample diff --git a/samples/echo-https/pom.xml b/samples/echo-https/pom.xml index f7dbf14a..3c18dc34 100755 --- a/samples/echo-https/pom.xml +++ b/samples/echo-https/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.glassfish.tyrus.samples tyrus-samples-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - war tyrus-sample-echo-https + war Tyrus Secure Echo Sample + + true + + jakarta.websocket @@ -73,10 +78,6 @@ - - true - - diff --git a/samples/echo/pom.xml b/samples/echo/pom.xml index 522a44dc..21e0bf76 100755 --- a/samples/echo/pom.xml +++ b/samples/echo/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.glassfish.tyrus.samples tyrus-samples-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - war tyrus-sample-echo + war Tyrus Echo Sample diff --git a/samples/pom.xml b/samples/pom.xml index 7ba093b6..0a5d168a 100755 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -11,18 +11,19 @@ --> - + 4.0.0 org.glassfish.tyrus tyrus-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT org.glassfish.tyrus.samples tyrus-samples-project pom + Tyrus Samples diff --git a/samples/programmatic-echo/pom.xml b/samples/programmatic-echo/pom.xml index 69538c99..a69d8107 100755 --- a/samples/programmatic-echo/pom.xml +++ b/samples/programmatic-echo/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.glassfish.tyrus.samples tyrus-samples-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - war tyrus-sample-programmatic-echo + war Tyrus Programmatic Echo Sample + + gfv3ee6 + + jakarta.websocket @@ -76,8 +81,4 @@ - - - gfv3ee6 - diff --git a/samples/shared-collection/pom.xml b/samples/shared-collection/pom.xml index d82ef7a9..8077a078 100644 --- a/samples/shared-collection/pom.xml +++ b/samples/shared-collection/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.glassfish.tyrus.samples tyrus-samples-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - war tyrus-sample-shared-collection + war Tyrus Shared Collection Sample + + true + + jakarta.websocket @@ -45,13 +50,13 @@ jakarta.ws.rs jakarta.ws.rs-api - 3.0.0 + 4.0.0 provided org.glassfish.jersey.media jersey-media-sse - 3.0.1 + 4.0.2 provided @@ -99,10 +104,6 @@ - - true - - diff --git a/samples/simplelife/pom.xml b/samples/simplelife/pom.xml index d315c7a9..a5e0f994 100755 --- a/samples/simplelife/pom.xml +++ b/samples/simplelife/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.glassfish.tyrus.samples tyrus-samples-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - war tyrus-sample-simplelife + war Tyrus Simple Life Sample + + gfv3ee6 + + jakarta.websocket @@ -45,8 +50,4 @@ - - - gfv3ee6 - diff --git a/server/pom.xml b/server/pom.xml index 544dfa4c..78cac7fa 100755 --- a/server/pom.xml +++ b/server/pom.xml @@ -1,3 +1,4 @@ + - + + 4.0.0 + org.glassfish.tyrus tyrus-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - 4.0.0 tyrus-server bundle + Tyrus Server @@ -59,7 +62,6 @@ true - com.sun.istack diff --git a/spi/pom.xml b/spi/pom.xml index ea7d4750..dbfd5146 100755 --- a/spi/pom.xml +++ b/spi/pom.xml @@ -1,3 +1,4 @@ + - + + 4.0.0 + org.glassfish.tyrus tyrus-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - 4.0.0 tyrus-spi bundle + Tyrus Container SPI diff --git a/tests/containers/jdk-client/pom.xml b/tests/containers/jdk-client/pom.xml index 2a62e280..e477f5e0 100644 --- a/tests/containers/jdk-client/pom.xml +++ b/tests/containers/jdk-client/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.glassfish.tyrus.tests tyrus-tests-containers - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - war tyrus-tests-containers-jdk-client + war Tyrus JDK Containers Tests diff --git a/tests/containers/jdk-client/src/test/java/org/glassfish/tyrus/container/jdk/client/UnknownHostTest.java b/tests/containers/jdk-client/src/test/java/org/glassfish/tyrus/container/jdk/client/UnknownHostTest.java index 4e9e4edd..8048b89f 100644 --- a/tests/containers/jdk-client/src/test/java/org/glassfish/tyrus/container/jdk/client/UnknownHostTest.java +++ b/tests/containers/jdk-client/src/test/java/org/glassfish/tyrus/container/jdk/client/UnknownHostTest.java @@ -19,6 +19,7 @@ import org.junit.Assume; import org.junit.Assert; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import jakarta.websocket.ContainerProvider; @@ -30,7 +31,7 @@ import java.util.logging.Level; import java.util.logging.Logger; - +@Ignore("testIncreaseFileDescriptorsOnTyrusImplementationInCaseOfUnresolvedAddressException:92 expected:<38> but was:<37>") public class UnknownHostTest { private static final Logger LOG = Logger.getLogger(UnknownHostTest.class.getName()); diff --git a/tests/containers/pom.xml b/tests/containers/pom.xml index 737bb79e..b3638439 100644 --- a/tests/containers/pom.xml +++ b/tests/containers/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.glassfish.tyrus.tests tyrus-tests-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - pom tyrus-tests-containers + pom Tyrus Container Tests - jdk-client servlet diff --git a/tests/containers/servlet/pom.xml b/tests/containers/servlet/pom.xml index 759a7208..3986365d 100644 --- a/tests/containers/servlet/pom.xml +++ b/tests/containers/servlet/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.glassfish.tyrus.tests tyrus-tests-containers - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - war tyrus-tests-containers-servlet + war Tyrus Servlet Containers Tests diff --git a/tests/e2e/application-config/pom.xml b/tests/e2e/application-config/pom.xml index 09c2cb06..8f6f1ed9 100755 --- a/tests/e2e/application-config/pom.xml +++ b/tests/e2e/application-config/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.glassfish.tyrus.tests tyrus-tests-e2e - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - war tyrus-tests-e2e-appconfig + war Tyrus End-to-End Application Config Tests diff --git a/tests/e2e/jdk21/pom.xml b/tests/e2e/jdk21/pom.xml index 7a8dc606..4cf494e6 100644 --- a/tests/e2e/jdk21/pom.xml +++ b/tests/e2e/jdk21/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.glassfish.tyrus.tests tyrus-tests-e2e - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - war - - - - org.apache.maven.plugins - maven-compiler-plugin - - 21 - 21 - - - - tyrus-tests-e2e-jdk21 + war Tyrus End-to-End Java 21 Tests @@ -65,4 +54,16 @@ test + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 21 + + + + diff --git a/tests/e2e/jdk8/pom.xml b/tests/e2e/jdk8/pom.xml index 4fb941a0..ea331c26 100644 --- a/tests/e2e/jdk8/pom.xml +++ b/tests/e2e/jdk8/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.glassfish.tyrus.tests tyrus-tests-e2e - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - war tyrus-tests-e2e-jdk8 + war Tyrus End-to-End Java 8 Tests diff --git a/tests/e2e/jetty/auth-basic/pom.xml b/tests/e2e/jetty/auth-basic/pom.xml index 3f44086c..68273444 100644 --- a/tests/e2e/jetty/auth-basic/pom.xml +++ b/tests/e2e/jetty/auth-basic/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.glassfish.tyrus.tests tyrus-tests-e2e-jetty - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - war tyrus-tests-e2e-auth-basic + war Tyrus End-to-End Basic Auth Tests diff --git a/tests/e2e/jetty/auth-digest/pom.xml b/tests/e2e/jetty/auth-digest/pom.xml index 6d542cb1..4014aabe 100644 --- a/tests/e2e/jetty/auth-digest/pom.xml +++ b/tests/e2e/jetty/auth-digest/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.glassfish.tyrus.tests tyrus-tests-e2e-jetty - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - war tyrus-tests-e2e-auth-digest + war Tyrus End-to-End Digest Auth Tests diff --git a/tests/e2e/jetty/pom.xml b/tests/e2e/jetty/pom.xml index f70d21a3..cdc1df15 100755 --- a/tests/e2e/jetty/pom.xml +++ b/tests/e2e/jetty/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.glassfish.tyrus.tests tyrus-tests-e2e - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - pom tyrus-tests-e2e-jetty + pom Tyrus End-to-End Tests running on Jetty diff --git a/tests/e2e/non-deployable/pom.xml b/tests/e2e/non-deployable/pom.xml index 3ba8d6a9..ca7eeb46 100755 --- a/tests/e2e/non-deployable/pom.xml +++ b/tests/e2e/non-deployable/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.glassfish.tyrus.tests tyrus-tests-e2e - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - war tyrus-tests-e2e-nondeployable + war Tyrus End-to-End Non-deployable Tests @@ -57,5 +58,4 @@ test - diff --git a/tests/e2e/pom.xml b/tests/e2e/pom.xml index d7ea4eb7..6db49bf0 100755 --- a/tests/e2e/pom.xml +++ b/tests/e2e/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.glassfish.tyrus.tests tyrus-tests-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - pom tyrus-tests-e2e + pom Tyrus End-to-End Tests diff --git a/tests/e2e/standard-config/pom.xml b/tests/e2e/standard-config/pom.xml index 7cce4865..f7f486a0 100755 --- a/tests/e2e/standard-config/pom.xml +++ b/tests/e2e/standard-config/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.glassfish.tyrus.tests tyrus-tests-e2e - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - war tyrus-tests-e2e-stdconfig + war Tyrus End-to-End Standard Config Tests diff --git a/tests/plugins/pom.xml b/tests/plugins/pom.xml index 5e200406..90f952a3 100644 --- a/tests/plugins/pom.xml +++ b/tests/plugins/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.eclipse.ee4j project - 1.0.9 + 2.0.0 plugins-tests jar + Tyrus Plugin Tests diff --git a/tests/pom.xml b/tests/pom.xml index 367f831d..f30eb9a9 100755 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.glassfish.tyrus tyrus-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT org.glassfish.tyrus.tests tyrus-tests-project pom + Tyrus Tests diff --git a/tests/qa/browser-test/pom.xml b/tests/qa/browser-test/pom.xml index cdfdb343..5138cbc9 100755 --- a/tests/qa/browser-test/pom.xml +++ b/tests/qa/browser-test/pom.xml @@ -21,7 +21,7 @@ org.glassfish.tyrus.tests.qa tyrus-tests-qa-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT war diff --git a/tests/qa/lifecycle-test/pom.xml b/tests/qa/lifecycle-test/pom.xml index 4bf7083a..76f2889d 100644 --- a/tests/qa/lifecycle-test/pom.xml +++ b/tests/qa/lifecycle-test/pom.xml @@ -21,7 +21,7 @@ org.glassfish.tyrus.tests.qa tyrus-tests-qa-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT war diff --git a/tests/qa/pom.xml b/tests/qa/pom.xml index a6e7c802..d04802b1 100644 --- a/tests/qa/pom.xml +++ b/tests/qa/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tyrus.tests tyrus-tests-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT org.glassfish.tyrus.tests.qa diff --git a/tests/release-test/pom.xml b/tests/release-test/pom.xml index ec3c3aea..3ab96487 100644 --- a/tests/release-test/pom.xml +++ b/tests/release-test/pom.xml @@ -17,21 +17,21 @@ --> - + 4.0.0 org.glassfish.tyrus tyrus-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT ../../pom.xml org.glassfish.tyrus.tests tyrus-release-test jar - Tyrus Release Test + Tyrus Release Test Tyrus post-release validation tests @@ -42,36 +42,17 @@ 4.5.14 - - - - org.apache.maven.plugins - maven-surefire-plugin - - 1 - false - false - - **/ArchetypesTest - **/NoticeFilesTest - - - - - - org.glassfish.tyrus tyrus-bom ${project.version} - import pom + import - junit @@ -135,6 +116,24 @@ + + + + org.apache.maven.plugins + maven-surefire-plugin + + 1 + false + false + + **/ArchetypesTest + **/NoticeFilesTest + + + + + + ReleaseTests @@ -148,7 +147,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M7 + 3.5.5 1 false @@ -167,8 +166,8 @@ org.glassfish.tyrus tyrus-bom ${tyrus.version} - import pom + import diff --git a/tests/servlet/async/pom.xml b/tests/servlet/async/pom.xml index 33661ac9..d1f24d82 100644 --- a/tests/servlet/async/pom.xml +++ b/tests/servlet/async/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.glassfish.tyrus.tests.servlet tyrus-tests-servlet-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - war tyrus-tests-servlet-async + war Tyrus Servlet Async Tests diff --git a/tests/servlet/autobahn-server/pom.xml b/tests/servlet/autobahn-server/pom.xml index 0f218e67..96a06610 100644 --- a/tests/servlet/autobahn-server/pom.xml +++ b/tests/servlet/autobahn-server/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.glassfish.tyrus.tests.servlet tyrus-tests-servlet-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - war tyrus-tests-servlet-autobahn-server + war Tyrus Autobahn Echo Server diff --git a/tests/servlet/basic/pom.xml b/tests/servlet/basic/pom.xml index 3c4e5ef7..2300fd4f 100644 --- a/tests/servlet/basic/pom.xml +++ b/tests/servlet/basic/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.glassfish.tyrus.tests.servlet tyrus-tests-servlet-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - war tyrus-tests-servlet-basic + war Tyrus Servlet Basic Tests diff --git a/tests/servlet/debug/pom.xml b/tests/servlet/debug/pom.xml index 0dedff2d..3a919cc5 100644 --- a/tests/servlet/debug/pom.xml +++ b/tests/servlet/debug/pom.xml @@ -1,3 +1,4 @@ + - + + 4.0.0 + - tyrus-tests-servlet-project org.glassfish.tyrus.tests.servlet - 2.2.99-SNAPSHOT + tyrus-tests-servlet-project + 2.3.99-SNAPSHOT - 4.0.0 tyrus-tests-servlet-debug war @@ -51,5 +53,4 @@ test - diff --git a/tests/servlet/dynamic-deploy/pom.xml b/tests/servlet/dynamic-deploy/pom.xml index 51170593..b60d4fe8 100644 --- a/tests/servlet/dynamic-deploy/pom.xml +++ b/tests/servlet/dynamic-deploy/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.glassfish.tyrus.tests.servlet tyrus-tests-servlet-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - war tyrus-tests-servlet-dynamic-deploy + war Tyrus Servlet Dynamic Deploy Test diff --git a/tests/servlet/embedded-glassfish-test/pom.xml b/tests/servlet/embedded-glassfish-test/pom.xml index fbc8be87..0f1e1b42 100644 --- a/tests/servlet/embedded-glassfish-test/pom.xml +++ b/tests/servlet/embedded-glassfish-test/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.glassfish.tyrus.tests.servlet tyrus-tests-servlet-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - war tyrus-tests-servlet-embedded-gf + war Tyrus Servlet Tests on Glassfish @@ -129,6 +130,7 @@ ${grizzly.version} + diff --git a/tests/servlet/inject/pom.xml b/tests/servlet/inject/pom.xml index 20a0fce1..6d2f4179 100644 --- a/tests/servlet/inject/pom.xml +++ b/tests/servlet/inject/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.glassfish.tyrus.tests.servlet tyrus-tests-servlet-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - war tyrus-tests-servlet-inject + war Tyrus Servlet Inject Test diff --git a/tests/servlet/maxsessions-per-app/pom.xml b/tests/servlet/maxsessions-per-app/pom.xml index 71563f75..deb03434 100755 --- a/tests/servlet/maxsessions-per-app/pom.xml +++ b/tests/servlet/maxsessions-per-app/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.glassfish.tyrus.tests.servlet tyrus-tests-servlet-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - war tyrus-tests-servlet-maxsessions-per-app + war Tyrus Servlet Max Sessions Per App Tests diff --git a/tests/servlet/maxsessions-per-remoteaddr/pom.xml b/tests/servlet/maxsessions-per-remoteaddr/pom.xml index 913ad871..038c7fd7 100755 --- a/tests/servlet/maxsessions-per-remoteaddr/pom.xml +++ b/tests/servlet/maxsessions-per-remoteaddr/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.glassfish.tyrus.tests.servlet tyrus-tests-servlet-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - war tyrus-tests-servlet-maxsessions-per-remoteaddr + war Tyrus Servlet Max Sessions Per Remote Addr Tests diff --git a/tests/servlet/mbean/pom.xml b/tests/servlet/mbean/pom.xml index 1853ba27..880af23b 100644 --- a/tests/servlet/mbean/pom.xml +++ b/tests/servlet/mbean/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.glassfish.tyrus.tests.servlet tyrus-tests-servlet-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - war tyrus-tests-servlet-mbean-test + war Tyrus Servlet Monitoring Test diff --git a/tests/servlet/noappconfig/pom.xml b/tests/servlet/noappconfig/pom.xml index 6c45bbcb..6972174f 100755 --- a/tests/servlet/noappconfig/pom.xml +++ b/tests/servlet/noappconfig/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.glassfish.tyrus.tests.servlet tyrus-tests-servlet-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - war tyrus-tests-servlet-noappconfig + war Tyrus Servlet No App Config diff --git a/tests/servlet/oneappconfig/pom.xml b/tests/servlet/oneappconfig/pom.xml index 6446ff5f..c633db4c 100755 --- a/tests/servlet/oneappconfig/pom.xml +++ b/tests/servlet/oneappconfig/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.glassfish.tyrus.tests.servlet tyrus-tests-servlet-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - war tyrus-tests-servlet-oneappconfig + war Tyrus Servlet One App Config diff --git a/tests/servlet/pom.xml b/tests/servlet/pom.xml index 2beb3305..b43a0715 100755 --- a/tests/servlet/pom.xml +++ b/tests/servlet/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.glassfish.tyrus.tests tyrus-tests-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT org.glassfish.tyrus.tests.servlet tyrus-tests-servlet-project pom + Tyrus Server Integration Tests @@ -47,6 +49,7 @@ debug + diff --git a/tests/servlet/remote-endpoint-timeout/pom.xml b/tests/servlet/remote-endpoint-timeout/pom.xml index 814fd2b8..237d47d5 100755 --- a/tests/servlet/remote-endpoint-timeout/pom.xml +++ b/tests/servlet/remote-endpoint-timeout/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.glassfish.tyrus.tests.servlet tyrus-tests-servlet-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - war tyrus-tests-servlet-remote + war Tyrus Servlet RemoteEndpoint Timeout diff --git a/tests/servlet/session/pom.xml b/tests/servlet/session/pom.xml index c2396105..6468d871 100755 --- a/tests/servlet/session/pom.xml +++ b/tests/servlet/session/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.glassfish.tyrus.tests.servlet tyrus-tests-servlet-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - war tyrus-tests-servlet-session + war Tyrus Servlet Session Closing diff --git a/tests/servlet/twoappconfig/pom.xml b/tests/servlet/twoappconfig/pom.xml index 4094369f..e47fe726 100755 --- a/tests/servlet/twoappconfig/pom.xml +++ b/tests/servlet/twoappconfig/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.glassfish.tyrus.tests.servlet tyrus-tests-servlet-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - war org.glassfish.tyrus.tests.servlet.twoappconfig tyrus-tests-servlet-twoappconfig + war + Tyrus Servlet Two App Config diff --git a/tests/tools/pom.xml b/tests/tools/pom.xml index 85cc6f71..a13cc7be 100755 --- a/tests/tools/pom.xml +++ b/tests/tools/pom.xml @@ -1,3 +1,4 @@ + - + + 4.0.0 + org.glassfish.tyrus.tests tyrus-tests-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT - 4.0.0 tyrus-test-tools bundle - Tyrus Test Tools - - - - org.apache.felix - maven-bundle-plugin - true - true - - - org.glassfish.tyrus.test.tools.*;version=${project.version} - - - true - - - - + Tyrus Test Tools @@ -86,4 +71,22 @@ junit + + + + + org.apache.felix + maven-bundle-plugin + true + true + + + org.glassfish.tyrus.test.tools.*;version=${project.version} + + + true + + + + diff --git a/tools/plugins/jar-updater/pom.xml b/tools/plugins/jar-updater/pom.xml index 2082be97..bc923996 100644 --- a/tools/plugins/jar-updater/pom.xml +++ b/tools/plugins/jar-updater/pom.xml @@ -22,7 +22,7 @@ org.eclipse.ee4j project - 1.0.9 + 2.0.0 org.glassfish.tyrus.tools.plugins diff --git a/tools/plugins/pom.xml b/tools/plugins/pom.xml index 44401aa1..cd1ccb8a 100644 --- a/tools/plugins/pom.xml +++ b/tools/plugins/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tyrus.tools tyrus-tools-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT org.glassfish.tyrus.tools.plugins diff --git a/tools/pom.xml b/tools/pom.xml index a3cee892..a3e93ff0 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -22,7 +22,7 @@ org.glassfish.tyrus tyrus-project - 2.2.99-SNAPSHOT + 2.3.99-SNAPSHOT org.glassfish.tyrus.tools