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

Moved to consolidated hub server #37

Merged
merged 7 commits into from
Jun 14, 2024
Merged

Moved to consolidated hub server #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0bf359d
merge zk and http server bundles to one and made one hetrogeneous bundle
chaitanyachavali Aug 17, 2023
cc1aa52
Merge branch 'main' into ft_hub_server
santanusinha May 24, 2024
b6573ba
Working server with deduplication
santanusinha May 28, 2024
bc21c77
Merge branch 'main' into ft_hub_server
santanusinha May 29, 2024
d4aaae4
Updated sonatype plugin version
santanusinha Jun 4, 2024
dc3b31b
Fixes for comments
santanusinha Jun 12, 2024
395b134
Merge branch 'main' into ft_hub_server
santanusinha Jun 14, 2024
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
9 changes: 3 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,9 @@
<module>ranger-http-client</module>
<module>ranger-server-common</module>
<module>ranger-server-bundle</module>
<module>ranger-zk-server</module>
<module>ranger-http-server</module>
<module>ranger-http-model</module>
<module>ranger-http-server-bundle</module>
<module>ranger-zk-server-bundle</module>
<module>ranger-discovery-bundle</module>
<module>ranger-hub-server-bundle</module>
<module>ranger-server</module>
</modules>

<distributionManagement>
Expand Down Expand Up @@ -241,7 +238,7 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.13</version>
<version>1.7.0</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
Expand Down
2 changes: 1 addition & 1 deletion .../perf/results/io.appform.ranger.discovery.bundle.id.IdGeneratorPerfTest.testGenerate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
"iterations" : 4,
"threads" : 1,
"forks" : 3,
"mean_ops" : 773920.400092714
"mean_ops" : 763105.9286163104
}
2 changes: 1 addition & 1 deletion ...results/io.appform.ranger.discovery.bundle.id.IdGeneratorPerfTest.testGenerateBase36.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
"iterations" : 4,
"threads" : 1,
"forks" : 3,
"mean_ops" : 600324.2457100645
"mean_ops" : 608727.2211847006
}
2 changes: 1 addition & 1 deletion ...overy-bundle/src/main/java/io/appform/ranger/discovery/bundle/ServiceDiscoveryBundle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ private RangerClient<ShardInfo, MapBasedServiceRegistry<ShardInfo>> buildDiscove
.readValue(data, new TypeReference<ServiceNode<ShardInfo>>() {
});
} catch (IOException e) {
log.warn("Error parsing node data with value {}", new String(data));
log.warn("Error parsing node data with value {} for service: {}", new String(data), serviceName);
}
return null;
})
Expand Down
41 changes: 0 additions & 41 deletions ranger-http-server-bundle/pom.xml
View file
Open in desktop

This file was deleted.

68 changes: 0 additions & 68 deletions ...tp-server-bundle/src/main/java/io/appform/ranger/http/server/bundle/HttpServerBundle.java
View file
Open in desktop

This file was deleted.

42 changes: 0 additions & 42 deletions ...le/src/main/java/io/appform/ranger/http/server/bundle/config/RangerHttpConfiguration.java
View file
Open in desktop

This file was deleted.

37 changes: 0 additions & 37 deletions ranger-http-server/config/local.yml
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions ranger-http-server/pom.xml
View file
Open in desktop

This file was deleted.

44 changes: 0 additions & 44 deletions ranger-http-server/src/main/java/io/appform/ranger/http/server/App.java
View file
Open in desktop

This file was deleted.

59 changes: 59 additions & 0 deletions ranger-hub-server-bundle/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
<?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">
<parent>
<artifactId>ranger</artifactId>
<groupId>io.appform.ranger</groupId>
<version>1.0-RC18</version>
</parent>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>9</source>
<target>9</target>
</configuration>
</plugin>
</plugins>
</build>
<modelVersion>4.0.0</modelVersion>

<artifactId>ranger-hub-server-bundle</artifactId>

<properties>
<dropwizard.version>2.0.23</dropwizard.version>
</properties>

<dependencies>
<dependency>
<groupId>io.appform.ranger</groupId>
<artifactId>ranger-http-client</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-server-bundle</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.dropwizard</groupId>
<artifactId>dropwizard-core</artifactId>
<version>${dropwizard.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>

</project>
Loading
Loading