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

Cleanup of dependencies, legal files, added pre-release checks #868

Merged
merged 1 commit into from
Nov 21, 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
46 changes: 11 additions & 35 deletions NOTICE.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,53 +33,29 @@ The project maintains the following source code repositories:
* https://github.com/eclipse-ee4j/tyrus

## Third-party Content
This project leverages the following third party content:

This project leverages the following third party content.

atinject (Package jakarta.inject) (1.0)

* License: Apache License, 2.0

cdi-api (2.0.2)
jakarta.activation 1.2.2
* License: BSD-3-Clause
* Copyright (c) 2018 Oracle and/or its affiliates

jakarta.enterprise.cdi-api Version 2.0.2
* License: Apache License, 2.0
* Copyright 2010, Red Hat, Inc., and individual contributors

Google Guava (18.0)

jakarta.inject Version 1.0
* License: Apache License, 2.0
* Copyright (C) 2009 The JSR-330 Expert Group

hamcrest-core (1.1)

jakarta.xml.bind-api Version 2.3.3
* License: BSD-3-Clause
* Project: http://hamcrest.org/JavaHamcrest/
* Source:
https://github.com/hamcrest/JavaHamcrest/releases/tag/hamcrest-java-1.1

javassist (3.18)

* License: (MPL-1.1 OR LGPL-2.1-or-later OR Apache-2.0)
* Project: http://jboss-javassist.github.io/javassist/
* Source:
https://github.com/jboss-javassist/javassist/releases/tag/rel_3_18_1_ga


javax.validation:validation-api:jar:1.1.0.Final (1.1.0)

* License: Apache-2.0

jline (2.14.5)
* Copyright (c) 2017, 2018 Oracle and/or its affiliates

jline Version: 2.14.5
* License: BSD-3-Clause
* Project: https://github.com/jline/jline2
* Source: https://github.com/jline/jline2

junit (4.13.2)

* License: Common Public License 1.0

org.osgi.core (4.2.0)

* License: Apache-2.0

## Cryptography

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.4.0</version>
<version>${maven.war.plugin.version}</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.9.0</version>
<version>${maven.compiler.plugin}</version>
<inherited>true</inherited>
<configuration>
<source>${java.version}</source>
Expand Down Expand Up @@ -65,5 +65,7 @@
<java.version>1.8</java.version>
<tyrus.version>${project.version}</tyrus.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.plugin>3.11.0</maven.compiler.plugin>
<maven.war.plugin.version>3.4.0</maven.war.plugin.version>
</properties>
</project>
4 changes: 2 additions & 2 deletions bom/pom.xml
Original file line number Diff line number Diff line change
@@ -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, 2023 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
Expand All @@ -24,7 +24,7 @@
<parent>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.7</version>
<version>1.0.9</version>
</parent>

<groupId>org.glassfish.tyrus</groupId>
Expand Down
11 changes: 11 additions & 0 deletions containers/glassfish/cdi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,17 @@
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<exclusions>
<exclusion>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
<version>${inject.api.version}</version>
</dependency>
</dependencies>
<build>
Expand Down
13 changes: 12 additions & 1 deletion core/pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--

Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2011, 2023 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
Expand Down Expand Up @@ -117,6 +117,17 @@
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<exclusions>
<exclusion>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<version>${activation.api.version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
Expand Down
4 changes: 2 additions & 2 deletions ext/client-cli/pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--

Copyright (c) 2013, 2017 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2013, 2023 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
Expand Down Expand Up @@ -45,7 +45,7 @@
<dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
<version>2.14.5</version>
<version>${jline.version}</version>
</dependency>
</dependencies>

Expand Down
Loading