Skip to content
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.

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

4.x: Removes Jedis integration to reduce technical debt #7654

Merged
merged 1 commit into from
Sep 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 0 additions & 5 deletions bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -758,11 +758,6 @@
<artifactId>helidon-integrations-cdi-hibernate</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
<groupId>io.helidon.integrations.cdi</groupId>
<artifactId>helidon-integrations-cdi-jedis</artifactId>
<version>${helidon.version}</version>
</dependency>
<dependency>
<groupId>io.helidon.integrations.cdi</groupId>
<artifactId>helidon-integrations-cdi-jpa</artifactId>
Expand Down
6 changes: 0 additions & 6 deletions dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@
<version.lib.jboss.transaction-spi>7.6.1.Final</version.lib.jboss.transaction-spi>
<!-- Force upgrade version used by maven-jaxb2-plugin. Needed to support Java 16 -->
<version.lib.jaxb-runtime>4.0.3</version.lib.jaxb-runtime>
<version.lib.jedis>3.6.3</version.lib.jedis>
<version.lib.jersey>3.1.3</version.lib.jersey>
<version.lib.jgit>6.7.0.202309050840-r</version.lib.jgit>
<version.lib.junit>5.9.3</version.lib.junit>
Expand Down Expand Up @@ -824,11 +823,6 @@
<artifactId>metrics-core</artifactId>
<version>${version.lib.dropwizard.metrics}</version>
</dependency>
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
<version>${version.lib.jedis}</version>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.jpa</artifactId>
Expand Down
2 changes: 0 additions & 2 deletions docs/includes/attributes.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ endif::[]

// 3rd party
:version-lib-jaeger: 1.22
:version-lib-jedis: 3.6.3
:version-lib-hikaricp: 5.0.1
:version-lib-eclipselink: 4.0.2
:version-lib-hibernate: 6.1.7.Final
Expand Down Expand Up @@ -237,7 +236,6 @@ endif::[]
:hibernate-doc-jboss-url: https://docs.jboss.org/hibernate/orm/{version-lib-hibernate}
:hibernate-javadoc-base-url: {hibernate-doc-jboss-url}/javadocs
:jib-base-url: https://github.com/GoogleContainerTools/jib/blob/v{version-plugin-jib}-maven/jib-maven-plugin
:jedis-base-url: {javadoc-io-base-url}/static/redis.clients/jedis/{version-lib-jedis}/redis/clients
:kafka-client-base-url: https://kafka.apache.org/28/documentation.html
:openapi-version: 3.0.0
:openapi-spec-base-url: https://github.com/OAI/OpenAPI-Specification/blob/master/versions
Expand Down
182 changes: 0 additions & 182 deletions docs/mp/integrations/jedis.adoc

This file was deleted.

1 change: 0 additions & 1 deletion docs/sitegen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,6 @@ backend:
sources:
- "oci.adoc"
- "hcv.adoc"
- "jedis.adoc"
- "neo4j.adoc"
- type: "MENU"
title: "JAX-RS/Jersey"
Expand Down
81 changes: 0 additions & 81 deletions etc/HELIDON_THIRD_PARTY_LICENSES.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1913,7 +1913,6 @@ Fourth Party Dependencies
<consumer>helidon-integrations-cdi-delegates</consumer>
<consumer>helidon-integrations-cdi-eclipselink</consumer>
<consumer>helidon-integrations-cdi-hibernate</consumer>
<consumer>helidon-integrations-cdi-jedis</consumer>
<consumer>helidon-integrations-cdi-jpa</consumer>
<consumer>helidon-integrations-cdi-jta</consumer>
<consumer>helidon-integrations-cdi-jta-weld</consumer>
Expand Down Expand Up @@ -2388,84 +2387,6 @@ Fourth Party Dependencies

SPDX-License-Identifier: BSD-3-Clause
--------------------------------------------
</attribution>
</dependency>
<dependency>
<id>106820</id>
<name>Jedis</name>
<version>3.6.3</version>
<licensor>Jonathan Leibiusky</licensor>
<licenseName>MIT</licenseName>
<consumers>
<consumer>helidon-integrations-cdi-jedis</consumer>
</consumers>
<attribution>Copyright (c) 2010 Jonathan Leibiusky

Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
files (the "Software"), to deal in the Software without
restriction, including without limitation the rights to use,
copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following
conditions:

The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.

############### 4th Party Dependencies ###############


slf4j-api-1.7.30 (MIT)

Copyright (c) 2004-2017 QOS.ch
All rights reserved.

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:

The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

###################################################
commons-pool2-2.9.0 (Apache 2.0)
See full text at the bottom of this document for license: Apache-2.0
APACHE COMMONS POOL DERIVATIVE WORKS:

The LinkedBlockingDeque implementation is based on an implementation written by
Doug Lea with assistance from members of JCP JSR-166 Expert Group and released
to the public domain, as explained at
http://creativecommons.org/licenses/publicdomain


-- Notice file content
Apache Commons Pool
Copyright 2001-2021 The Apache Software Foundation

This product includes software developed at
The Apache Software Foundation (https://www.apache.org/).
</attribution>
</dependency>
<dependency>
Expand All @@ -2482,7 +2403,6 @@ The Apache Software Foundation (https://www.apache.org/).
<consumer>helidon-integrations-cdi-datasource</consumer>
<consumer>helidon-integrations-cdi-datasource-hikaricp</consumer>
<consumer>helidon-integrations-cdi-datasource-ucp</consumer>
<consumer>helidon-integrations-cdi-jedis</consumer>
<consumer>helidon-integrations-micronaut-cdi</consumer>
<consumer>helidon-integrations-vault-cdi</consumer>
<consumer>helidon-messaging-mock</consumer>
Expand Down Expand Up @@ -5086,7 +5006,6 @@ limitations under the License.
<consumer>helidon-integrations-cdi-delegates</consumer>
<consumer>helidon-integrations-cdi-eclipselink</consumer>
<consumer>helidon-integrations-cdi-hibernate</consumer>
<consumer>helidon-integrations-cdi-jedis</consumer>
<consumer>helidon-integrations-cdi-jpa</consumer>
<consumer>helidon-integrations-cdi-jta</consumer>
<consumer>helidon-integrations-cdi-reference-counted-context</consumer>
Expand Down
5 changes: 0 additions & 5 deletions examples/integrations/cdi/datasource-hikaricp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,6 @@
<artifactId>jakarta.ws.rs-api</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.microprofile.config</groupId>
<artifactId>microprofile-config-api</artifactId>
Expand Down
1 change: 0 additions & 1 deletion examples/integrations/cdi/jedis/.dockerignore

This file was deleted.

Loading