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.

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

Draft: Apache http+ranger bom #31

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Draft: Apache http+ranger bom #31

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
7eba4d6
a) Initial set of changes for movement from OkHttpClient to Apache ht…
koushikr Dec 4, 2023
5948743
Using project.version instead of the actual version to keep changes t…
koushikr Dec 20, 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
2 changes: 0 additions & 2 deletions .github/workflows/build-check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ on:

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- name: Set up JDK 17
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Changelog
All notable changes to this project will be documented in this file.

## [1.0-RC16]

- Migrated from OkHttpClient to Apache http client (fluent interface)
- Added bill of materials for ranger, for clients who intend to use ranger.

## [1.0-RC15]
- Moved discovery bundle from https://github.com/appform-io/dropwizard-service-discovery.
- Updated to dropwizard version 2.1.10 : BOM update.
Expand Down
15 changes: 14 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,20 @@ Ranger provides two types of discovery out of the box:
- Sharded service discovery with service provider node healthchecks
We'll take these up, one by one.

###Build instructions
### Bill of materials
You could use the ranger-bom using the following in your dependency management.

```
<dependency>
<groupId>io.appform.ranger</groupId>
<artifactId>ranger-bom</artifactId>
<version>${ranger.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
```

### Build instructions
- Clone the source:

git clone github.com/appform-io/ranger
Expand Down
125 changes: 17 additions & 108 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,17 @@
<groupId>io.appform.ranger</groupId>
<artifactId>ranger</artifactId>
<packaging>pom</packaging>
<version>1.0-RC15</version>
<version>1.0-RC16</version>

<name>Ranger</name>
<url>https://github.com/appform-io/ranger</url>
<description>Service Discovery for Java</description>
<description>Service Discovery for Java including dropwizard backed bundles and lightweight hub servers</description>
<inceptionYear>2015</inceptionYear>

<modules>
<module>ranger-bom</module>
<module>ranger-parent</module>

<module>ranger-core</module>
<module>ranger-zookeeper</module>
<module>ranger-http</module>
Expand Down Expand Up @@ -82,95 +86,17 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<guava.version>31.0.1-jre</guava.version>
<curator.version>5.5.0</curator.version>
<slf4j.version>1.7.32</slf4j.version>

<maven.compiler.version>3.8.0</maven.compiler.version>
<java.version>17</java.version>
<java.release.version>11</java.release.version>
<lombok.version>1.18.22</lombok.version>
<annotations.version>3.0.1u2</annotations.version>

<junit.jupiter.version>5.8.2</junit.jupiter.version>
<awaitility.version>4.1.1</awaitility.version>
<guava-retrying.version>2.0.0</guava-retrying.version>

<http.client.version>4.9.3</http.client.version>
<wiremock.version>3.3.1</wiremock.version>
<mockito.version>4.2.0</mockito.version>

<dropwizard.version>2.1.10</dropwizard.version>
<maven.compiler.version>3.8.0</maven.compiler.version>
<maven.surefire.plugin.version>3.0.0-M5</maven.surefire.plugin.version>
<jacoco.version>0.8.8</jacoco.version>
<maven.source.plugin.version>3.2.0</maven.source.plugin.version>
<maven.javadoc.plugin.version>3.6.3</maven.javadoc.plugin.version>
<nexus.staging.plguin.version>1.6.13</nexus.staging.plguin.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>${junit.jupiter.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-bom</artifactId>
<type>pom</type>
<scope>import</scope>
<version>${dropwizard.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>annotations</artifactId>
<version>${annotations.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-jackson</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.rholder</groupId>
<artifactId>guava-retrying</artifactId>
<version>${guava-retrying.version}</version>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<version>${awaitility.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
Expand All @@ -186,12 +112,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version>
<version>${maven.surefire.plugin.version}</version>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<version>${jacoco.version}</version>
<executions>
<execution>
<goals>
Expand All @@ -206,13 +132,11 @@
</goals>
</execution>
</executions>
<configuration>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.0</version>
<version>${maven.source.plugin.version}</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -225,7 +149,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.6.3</version>
<version>${maven.javadoc.plugin.version}</version>
<configuration>
<doclint>all,-missing</doclint>
</configuration>
Expand All @@ -241,7 +165,7 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.13</version>
<version>${nexus.staging.plguin.version}</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
Expand Down Expand Up @@ -287,20 +211,5 @@
</plugins>
</build>
</profile>
<!-- The following are required for dns cache manipulator.
Ref: https://github.com/alibaba/java-dns-cache-manipulator#jvm-settings-for-java-16 -->
<profile>
<id>add-java-open-options-for-jdk16+</id>
<activation>
<jdk>[16,)</jdk>
</activation>
<properties>
<argLine>
--add-opens java.base/java.net=ALL-UNNAMED
--add-opens java.base/sun.net=ALL-UNNAMED
</argLine>
</properties>
</profile>
</profiles>

</project>
94 changes: 94 additions & 0 deletions ranger-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>
<parent>
<groupId>io.appform.ranger</groupId>
<artifactId>ranger</artifactId>
<version>1.0-RC16</version>
</parent>

<artifactId>ranger-bom</artifactId>
<packaging>pom</packaging>
<name>Ranger BOM</name>
<description>
Bill of materials to make sure a consistent set of versions is used for Ranger modules.
</description>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.appform.ranger</groupId>
<artifactId>ranger-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.appform.ranger</groupId>
<artifactId>ranger-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.appform.ranger</groupId>
<artifactId>ranger-discovery-bundle</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.appform.ranger</groupId>
<artifactId>ranger-zookeeper</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.appform.ranger</groupId>
<artifactId>ranger-zk-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.appform.ranger</groupId>
<artifactId>ranger-zk-server-bundle</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.appform.ranger</groupId>
<artifactId>ranger-zk-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.appform.ranger</groupId>
<artifactId>ranger-http-model</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.appform.ranger</groupId>
<artifactId>ranger-http</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.appform.ranger</groupId>
<artifactId>ranger-http-server-bundle</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.appform.ranger</groupId>
<artifactId>ranger-http-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.appform.ranger</groupId>
<artifactId>ranger-http-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.appform.ranger</groupId>
<artifactId>ranger-server-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.appform.ranger</groupId>
<artifactId>ranger-server-bundle</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

</project>
7 changes: 3 additions & 4 deletions ranger-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
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">
<parent>
<artifactId>ranger</artifactId>
<artifactId>ranger-parent</artifactId>
<groupId>io.appform.ranger</groupId>
<version>1.0-RC15</version>
<version>1.0-RC16</version>
<relativePath>../ranger-parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -15,12 +16,10 @@
<dependency>
<groupId>io.appform.ranger</groupId>
<artifactId>ranger-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.appform.ranger</groupId>
<artifactId>ranger-core</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
</dependencies>
Expand Down
11 changes: 6 additions & 5 deletions ranger-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
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">
<parent>
<artifactId>ranger</artifactId>
<artifactId>ranger-parent</artifactId>
<groupId>io.appform.ranger</groupId>
<version>1.0-RC15</version>
<version>1.0-RC16</version>
<relativePath>../ranger-parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -17,9 +18,9 @@

<dependencies>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${httpclient.version}</version>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5-fluent</artifactId>
<version>${http.client.version}</version>
</dependency>
</dependencies>

Expand Down
Loading