Skip to content

Commit

Permalink
Create Elide Bill Of Materials (6.x) (#2885)
Browse files Browse the repository at this point in the history 
* Elide bom

* jetty, jersey, junit, rest-assured
  • Loading branch information
@wcekan
wcekan committed Feb 11, 2023
1 parent 2523315 commit 1aca2c1
Show file tree
Hide file tree
Showing 11 changed files with 159 additions and 178 deletions.
1 change: 0 additions & 1 deletion elide-async/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId>
<version>${version.jersey}</version>
<scope>test</scope>
</dependency>
<!-- JUnit -->
Expand Down
125 changes: 125 additions & 0 deletions elide-bom/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
<!--
~ Copyright 2023, Yahoo Inc.
~ Licensed under the Apache License, Version 2.0
~ See LICENSE file in project root for terms.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>elide-bom</artifactId>
<packaging>pom</packaging>
<name>Elide: BOM</name>
<description>Elide Bill of Materials</description>
<url>https://github.com/yahoo/elide</url>
<parent>
<groupId>com.yahoo.elide</groupId>
<artifactId>elide-parent-pom</artifactId>
<version>6.1.11-SNAPSHOT</version>
</parent>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<organization>
<name>Yahoo! Inc.</name>
<url>http://www.yahoo.com</url>
</organization>
<developers>
<developer>
<name>Yahoo Inc.</name>
<url>https://github.com/yahoo</url>
</developer>
</developers>
<scm>
<developerConnection>scm:git:ssh://git@github.com/yahoo/elide.git</developerConnection>
<url>https://github.com/yahoo/elide.git</url>
<tag>HEAD</tag>
</scm>
<dependencyManagement>
<dependencies>
<!-- modules -->
<dependency>
<groupId>com.yahoo.elide</groupId>
<artifactId>elide-async</artifactId>
<version>6.1.11-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.yahoo.elide</groupId>
<artifactId>elide-core</artifactId>
<version>6.1.11-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.yahoo.elide</groupId>
<artifactId>elide-datastore-aggregation</artifactId>
<version>6.1.11-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.yahoo.elide</groupId>
<artifactId>elide-datastore-hibernate</artifactId>
<version>6.1.11-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.yahoo.elide</groupId>
<artifactId>elide-datastore-inmemorydb</artifactId>
<version>6.1.11-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.yahoo.elide</groupId>
<artifactId>elide-datastore-jms</artifactId>
<version>6.1.11-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.yahoo.elide</groupId>
<artifactId>elide-datastore-jpa</artifactId>
<version>6.1.11-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.yahoo.elide</groupId>
<artifactId>elide-datastore-multiplex</artifactId>
<version>6.1.11-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.yahoo.elide</groupId>
<artifactId>elide-datastore-noop</artifactId>
<version>6.1.11-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.yahoo.elide</groupId>
<artifactId>elide-datastore-search</artifactId>
<version>6.1.11-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.yahoo.elide</groupId>
<artifactId>elide-graphql</artifactId>
<version>6.1.11-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.yahoo.elide</groupId>
<artifactId>elide-model-config</artifactId>
<version>6.1.11-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.yahoo.elide</groupId>
<artifactId>elide-spring-boot-autoconfigure</artifactId>
<version>6.1.11-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.yahoo.elide</groupId>
<artifactId>elide-spring-boot-starter</artifactId>
<version>6.1.11-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.yahoo.elide</groupId>
<artifactId>elide-standalone</artifactId>
<version>6.1.11-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.yahoo.elide</groupId>
<artifactId>elide-swagger</artifactId>
<version>6.1.11-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
</project>
1 change: 0 additions & 1 deletion elide-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,6 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<version>${version.jetty}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
4 changes: 0 additions & 4 deletions elide-datastore/elide-datastore-jms/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,28 +132,24 @@
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-jetty-server</artifactId>
<version>${version.jetty}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-jetty-client</artifactId>
<version>${version.jetty}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-servlet</artifactId>
<version>${version.jetty}</version>
<scope>test</scope>
</dependency>
<!-- dependencies for javax.websocket (JSR-356) websocket -->
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-javax-server</artifactId>
<version>${version.jetty}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
1 change: 0 additions & 1 deletion elide-integration-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>${version.junit}</version>
</dependency>

<dependency>
Expand Down
4 changes: 1 addition & 3 deletions elide-model-config/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<description>Elide Dynamic Model Config</description>
<url>https://github.com/yahoo/elide</url>
<parent>
<artifactId>elide-parent-pom</artifactId>
<groupId>com.yahoo.elide</groupId>
<artifactId>elide-parent-pom</artifactId>
<version>6.1.11-SNAPSHOT</version>
</parent>

Expand Down Expand Up @@ -61,7 +61,6 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${version.jackson}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down Expand Up @@ -141,7 +140,6 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>${version.junit}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
33 changes: 1 addition & 32 deletions elide-spring/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<description>Parent pom for spring packages</description>
<url>https://github.com/yahoo/elide</url>
<parent>
<artifactId>elide-parent-pom</artifactId>
<groupId>com.yahoo.elide</groupId>
<artifactId>elide-parent-pom</artifactId>
<version>6.1.11-SNAPSHOT</version>
</parent>

Expand Down Expand Up @@ -41,7 +41,6 @@
<properties>
<parent.pom.dir>${project.basedir}/../..</parent.pom.dir>
<spring.boot.version>2.7.5</spring.boot.version>
<groovy.version>3.0.13</groovy.version>
<tomcat.version>9.0.58</tomcat.version>
</properties>

Expand Down Expand Up @@ -81,36 +80,6 @@
<artifactId>spring-boot-starter-actuator</artifactId>
<version>${spring.boot.version}</version>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
<version>${version.restassured}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>json-path</artifactId>
<version>${version.restassured}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>xml-path</artifactId>
<version>${version.restassured}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
<version>${groovy.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-xml</artifactId>
<version>${groovy.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
Expand Down
40 changes: 11 additions & 29 deletions elide-standalone/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,17 @@
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-bom</artifactId>
<version>${metrics.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<!-- Elide dependency -->
<dependency>
Expand Down Expand Up @@ -115,13 +126,6 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<scope>compile</scope>
<exclusions>
<exclusion>
<!-- CVE-2017-7658(9.8), CVE-2017-7657(9.8), CVE-2017-7656(7.5), CVE-2017-9735(7.5), CVE-2020-27216(7.0), CVE-2009-5045(7.5) -->
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
Expand Down Expand Up @@ -162,19 +166,16 @@
<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
<version>${metrics.version}</version>
</dependency>

<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-servlets</artifactId>
<version>${metrics.version}</version>
</dependency>

<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-servlet</artifactId>
<version>${metrics.version}</version>
</dependency>

<!-- Various Utility Libraries -->
Expand All @@ -188,33 +189,16 @@
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-jetty-server</artifactId>
<version>${version.jetty}</version>
<exclusions>
<exclusion>
<!-- CVE-2017-7658(9.8), CVE-2017-7657(9.8), CVE-2017-7656(7.5), CVE-2017-9735(7.5), CVE-2020-27216(7.0), CVE-2009-5045(7.5) -->
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-servlet</artifactId>
<version>${version.jetty}</version>
</dependency>
<!-- dependencies for javax.websocket (JSR-356) websocket -->
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-javax-server</artifactId>
<version>${version.jetty}</version>
<exclusions>
<exclusion>
<!-- CVE-2017-7658(9.8), CVE-2017-7657(9.8), CVE-2017-7656(7.5), CVE-2017-9735(7.5), CVE-2020-27216(7.0), CVE-2009-5045(7.5) -->
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-javax-websocket-api</artifactId>
</exclusion>
</exclusions>
</dependency>


Expand Down Expand Up @@ -275,15 +259,13 @@
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-jetty-client</artifactId>
<version>${version.jetty}</version>
<scope>test</scope>
</dependency>


<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${version.jackson}</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion elide-swagger/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<description>Swagger Support for Elide</description>
<url>https://github.com/yahoo/elide</url>
<parent>
<artifactId>elide-parent-pom</artifactId>
<groupId>com.yahoo.elide</groupId>
<artifactId>elide-parent-pom</artifactId>
<version>6.1.11-SNAPSHOT</version>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion elide-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<description>Test Helpers for Elide</description>
<url>https://github.com/yahoo/elide</url>
<parent>
<artifactId>elide-parent-pom</artifactId>
<groupId>com.yahoo.elide</groupId>
<artifactId>elide-parent-pom</artifactId>
<version>6.1.11-SNAPSHOT</version>
</parent>

Expand Down

0 comments on commit 1aca2c1

Please sign in to comment.