Skip to content

Update to Jersey 2.39 #16401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
electrum merged 2 commits into from
Mar 15, 2023
Merged

Update to Jersey 2.39 #16401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39a1644
Remove shaded JAXB and cleanup IDEA hack for Phoenix
electrum Mar 13, 2023
8087d12
Update to Jersey 2.39
electrum Mar 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions lib/trino-phoenix5-patched/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,6 @@
<shadeSourcesContent>false</shadeSourcesContent>
<dependencyReducedPomLocation>${project.build.directory}/pom.xml</dependencyReducedPomLocation>
<promoteTransitiveDependencies>false</promoteTransitiveDependencies>
<artifactSet>
<excludes>
</excludes>
</artifactSet>
<relocations>
<relocation>
<pattern>org.apache.zookeeper</pattern>
Expand All @@ -66,6 +62,10 @@
<excludes>
<exclude>org/apache/phoenix/shaded/org/apache/zookeeper/client/StaticHostProvider.class</exclude>
<exclude>org/apache/phoenix/shaded/org/apache/zookeeper/client/StaticHostProvider$*.class</exclude>
<!-- TODO: https://issues.apache.org/jira/browse/PHOENIX-6903 -->
<exclude>javax/xml/bind/**</exclude>
<exclyde>META-INF/services/javax.xml.bind.JAXBContext</exclyde>
<exclude>org/apache/phoenix/shaded/com/sun/xml/bind/**</exclude>
</excludes>
</filter>
</filters>
Expand Down
69 changes: 25 additions & 44 deletions plugin/trino-phoenix5/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,20 +158,6 @@
<scope>provided</scope>
</dependency>

<!-- ... this one is not Trino SPI -->
<dependency>
<!--
TODO(https://github.com/trinodb/trino/issues/13051): convert this back into normal dependency
The Phoenix code actually comes from trino-phoenix5-patched dependency, but IntelliJ does not support multi-module
projects with module using shading (as trino-phoenix5-patched does). See e.g. https://youtrack.jetbrains.com/issue/IDEA-266746
This dependency is here only to fool IntelliJ into compiling the project. -->
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix-client-embedded-hbase-2.2</artifactId>
<version>5.1.2</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.openjdk.jol</groupId>
<artifactId>jol-core</artifactId>
Expand Down Expand Up @@ -394,39 +380,34 @@
<groupId>com.clearspring.analytics</groupId>
<artifactId>stream</artifactId>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix-client-embedded-hbase-2.2</artifactId>
</dependency>
</ignoredDependencies>
</configuration>
</plugin>

<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
<ignoredNonTestScopedDependencies>
<!-- TODO(https://github.com/trinodb/trino/issues/13051): remove this -->
<ignoredDependency>org.apache.phoenix:phoenix-client-embedded-hbase-2.2</ignoredDependency>
</ignoredNonTestScopedDependencies>
</configuration>
</plugin>

<plugin>
<groupId>io.trino</groupId>
<artifactId>trino-maven-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<allowedProvidedDependencies>
<!-- TODO(https://github.com/trinodb/trino/issues/13051): remove this -->
<id>org.apache.phoenix:phoenix-client-embedded-hbase-2.2</id>
</allowedProvidedDependencies>
</configuration>
</plugin>
</plugins>
</build>

<!--
TODO(https://github.com/trinodb/trino/issues/13051): convert this back into normal dependency
The Phoenix code actually comes from trino-phoenix5-patched dependency, but IntelliJ does not support multi-module
projects with module using shading (as trino-phoenix5-patched does). See e.g. https://youtrack.jetbrains.com/issue/IDEA-266746
This dependency is here only to fool IntelliJ into compiling the project. -->
<profiles>
<profile>
<id>lib/tools.jar</id>
<activation>
<property>
<name>idea.maven.embedder.version</name>
</property>
</activation>
<dependencies>
<dependency>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix-client-embedded-hbase-2.2</artifactId>
<version>5.1.2</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
21 changes: 16 additions & 5 deletions plugin/trino-pinot/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,6 @@
<artifactId>zookeeper</artifactId>
<version>3.5.9</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-common</artifactId>
<version>2.35</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
Expand Down Expand Up @@ -325,6 +320,10 @@
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
</exclusion>
<exclusion>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId>
</exclusion>
</exclusions>
</dependency>

Expand Down Expand Up @@ -389,6 +388,14 @@
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-http-server</artifactId>
</exclusion>
<exclusion>
<groupId>org.glassfish.hk2</groupId>
<artifactId>hk2-locator</artifactId>
</exclusion>
<exclusion>
<groupId>org.glassfish.hk2.external</groupId>
<artifactId>jakarta.inject</artifactId>
Expand All @@ -397,6 +404,10 @@
<groupId>org.glassfish.hk2.external</groupId>
<artifactId>aopalliance-repackaged</artifactId>
</exclusion>
<exclusion>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-grizzly2-http</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-analyzers-common</artifactId>
Expand Down
14 changes: 13 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<dep.accumulo.version>1.10.2</dep.accumulo.version>
<dep.accumulo-hadoop.version>2.7.7-1</dep.accumulo-hadoop.version>
<dep.antlr.version>4.11.1</dep.antlr.version>
<dep.airlift.version>225</dep.airlift.version>
<dep.airlift.version>228</dep.airlift.version>
<dep.arrow.version>9.0.0</dep.arrow.version>
<dep.packaging.version>${dep.airlift.version}</dep.packaging.version>
<dep.aws-sdk.version>1.12.261</dep.aws-sdk.version>
Expand Down Expand Up @@ -884,6 +884,12 @@
<groupId>io.airlift</groupId>
<artifactId>jaxrs-testing</artifactId>
<version>${dep.airlift.version}</version>
<exclusions>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down Expand Up @@ -1808,6 +1814,12 @@
<version>7.15.0</version>
</dependency>

<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-common</artifactId>
<version>2.39</version>
</dependency>

<!-- force newer version to be used for dependencies -->
<dependency>
<groupId>org.javassist</groupId>
Expand Down