Skip to content

Commit

Permalink
Replace jboss-annotations-api_1.2_spec with jakarta.annotation-api (o…
Browse files Browse the repository at this point in the history
…pensearch-project#7836)

Signed-off-by: Andriy Redko <[email protected]>
  • Loading branch information
reta authored May 31, 2023
1 parent 3741539 commit a9b53e6
Show file tree
Hide file tree
Showing 10 changed files with 681 additions and 218 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
### Dependencies

### Changed
- Replace jboss-annotations-api_1.2_spec with jakarta.annotation-api ([#7836](https://github.com/opensearch-project/OpenSearch/pull/7836))

### Deprecated

Expand Down
2 changes: 1 addition & 1 deletion buildSrc/version.properties
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ kotlin = 1.7.10
antlr4 = 4.11.1
guava = 31.1-jre
protobuf = 3.22.3
jboss_annotation = 1.0.2.Final
jakarta_annotation = 1.3.5

# when updating the JNA version, also update the version in buildSrc/build.gradle
jna = 5.5.0
Expand Down
4 changes: 2 additions & 2 deletions qa/wildfly/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ testFixtures.useFixture()

dependencies {
providedCompile 'javax.enterprise:cdi-api:2.0'
providedCompile 'org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec:1.0.2.Final'
providedCompile 'org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.0_spec:1.0.1.Final'
providedCompile "jakarta.annotation:jakarta.annotation-api:${versions.jakarta_annotation}"
providedCompile 'jakarta.ws.rs:jakarta.ws.rs-api:2.1.3'
api('org.jboss.resteasy:resteasy-jackson2-provider:3.0.26.Final') {
exclude module: 'jackson-annotations'
exclude module: 'jackson-core'
Expand Down
2 changes: 1 addition & 1 deletion server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ dependencies {

// protobuf
api "com.google.protobuf:protobuf-java:${versions.protobuf}"
implementation "org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec:${versions.jboss_annotation}"
api "jakarta.annotation:jakarta.annotation-api:${versions.jakarta_annotation}"

testImplementation(project(":test:framework")) {
// tests use the locally compiled version of server
Expand Down
1 change: 1 addition & 0 deletions server/licenses/jakarta.annotation-api-1.3.5.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
59eb84ee0d616332ff44aba065f3888cf002cd2d
637 changes: 637 additions & 0 deletions server/licenses/jakarta.annotation-api-LICENSE.txt

Large diffs are not rendered by default.

38 changes: 38 additions & 0 deletions server/licenses/jakarta.annotation-api-NOTICE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# Notices for Jakarta Annotations

This content is produced and maintained by the Jakarta Annotations project.

* Project home: https://projects.eclipse.org/projects/ee4j.ca

## Trademarks

Jakarta Annotations is a trademark of the Eclipse Foundation.

## Declared Project Licenses

This program and the accompanying materials are made available under the terms
of the Eclipse Public License v. 2.0 which is available at
http://www.eclipse.org/legal/epl-2.0. This Source Code may also be made
available under the following Secondary Licenses when the conditions for such
availability set forth in the Eclipse Public License v. 2.0 are satisfied: GNU
General Public License, version 2 with the GNU Classpath Exception which is
available at https://www.gnu.org/software/classpath/license.html.

SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0

## Source Code

The project maintains the following source code repositories:

* https://github.com/eclipse-ee4j/common-annotations-api

## Third-party Content

## Cryptography

Content may contain encryption software. The country in which you are currently
may have restrictions on the import, possession, and use, and/or re-export to
another country, of encryption software. BEFORE using any encryption software,
please check the country's laws, regulations and policies concerning the import,
possession, or use, and re-export of encryption software, to see if this is
permitted.

This file was deleted.

201 changes: 0 additions & 201 deletions server/licenses/jboss-annotations-api_1.2_spec-LICENSE.txt

This file was deleted.

12 changes: 0 additions & 12 deletions server/licenses/jboss-annotations-api_1.2_spec-NOTICE.txt

This file was deleted.

0 comments on commit a9b53e6

Please sign in to comment.