This is an automated email from the ASF dual-hosted git repository.
yasith pushed a commit to branch fat-airavata-api
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 6967468335218d5f47e60af3cec806a0df113551
Author: yasithdev <yasit...@icloud.com>
AuthorDate: Wed Jun 25 00:01:56 2025 -0500
merge modules/security into airavata-api
---
airavata-api/pom.xml | 35 ++++----
.../airavata/security/AbstractAuthenticator.java | 0
.../security/AbstractDatabaseAuthenticator.java | 0
.../security/AiravataSecurityException.java | 0
.../airavata/security/AuthenticationException.java | 0
.../apache/airavata/security/Authenticator.java | 0
.../org/apache/airavata/security/Authoriser.java | 0
.../org/apache/airavata/security/UserStore.java | 0
.../airavata/security/UserStoreException.java | 0
.../AbstractConfigurationReader.java | 0
.../AuthenticatorConfigurationReader.java | 0
.../security/userstore/AbstractJDBCUserStore.java | 0
.../airavata/security/userstore/JDBCUserStore.java | 0
.../airavata/security/userstore/LDAPUserStore.java | 0
.../security/userstore/SessionDBUserStore.java | 0
.../airavata/security/util/PasswordDigester.java | 0
.../airavata/security/util/TrustStoreManager.java | 0
.../SharingRegistryServiceClientFactory.java | 0
.../AuthenticatorConfigurationReaderTest.java | 0
.../configurations/TestDBAuthenticator1.java | 0
.../configurations/TestDBAuthenticator2.java | 0
.../configurations/TestDBAuthenticator3.java | 0
.../security/configurations/TestUserStore.java | 0
.../security/userstore/JDBCUserStoreTest.java | 0
.../security/userstore/LDAPUserStoreTest.java | 0
.../security/userstore/SessionDBUserStoreTest.java | 0
.../src/test/resources/authenticators.xml | 0
.../src/test/resources/disabled-authenticator.xml | 0
.../src/test/resources/jdbc-authenticator.xml | 0
.../src/test/resources/ldap-authenticator.xml | 0
.../src/test/resources/session-authenticator.xml | 1 -
.../profile-service/profile-service-server/pom.xml | 5 --
examples/java-client-samples/pom.xml | 5 --
.../src/main/assembly/participant-bin-assembly.xml | 2 -
.../src/main/assembly/post-wm-bin-assembly.xml | 2 -
.../src/main/assembly/pre-wm-bin-assembly.xml | 2 -
.../registry-server/registry-api-service/pom.xml | 5 --
modules/security/pom.xml | 50 -----------
modules/sharing-registry/pom.xml | 1 -
.../sharing-registry-distribution/pom.xml | 5 --
.../sharing-registry-server/pom.xml | 7 +-
.../sharing-registry-stubs/pom.xml | 98 ----------------------
pom.xml | 1 -
43 files changed, 21 insertions(+), 198 deletions(-)
diff --git a/airavata-api/pom.xml b/airavata-api/pom.xml
index b55dc8ed12..bf386f9da0 100644
--- a/airavata-api/pom.xml
+++ b/airavata-api/pom.xml
@@ -22,16 +22,6 @@
<dependencies>
<!-- Airavata clients & stubs -->
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-security</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-sharing-registry-stubs</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>compute-account-provisioning</artifactId>
@@ -42,11 +32,6 @@
<artifactId>profile-service-stubs</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-server-configuration</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>platform-monitoring</artifactId>
@@ -59,6 +44,11 @@
<artifactId>airavata-client-configuration</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-server-configuration</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
@@ -286,6 +276,12 @@
<artifactId>amqp-client</artifactId>
<version>${amqp.client.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-core</artifactId>
+ <version>1.13.0</version>
+ </dependency>
</dependencies>
<build>
@@ -340,6 +336,15 @@
<arg
value="${project.basedir}/../thrift-interface-descriptions/service-cpis/orchestrator-cpi.thrift"
/>
</exec>
+ <exec executable="thrift">
+ <arg value="-r" />
+ <arg value="--gen" />
+ <arg value="java:beans,generated_annotations=undated" />
+ <arg value="-out" />
+ <arg
value="${project.build.directory}/generated-sources/thrift" />
+ <arg
+
value="${project.basedir}/../thrift-interface-descriptions/service-cpis/sharing_cpi.thrift"
/>
+ </exec>
</tasks>
</configuration>
</execution>
diff --git
a/modules/security/src/main/java/org/apache/airavata/security/AbstractAuthenticator.java
b/airavata-api/src/main/java/org/apache/airavata/security/AbstractAuthenticator.java
similarity index 100%
rename from
modules/security/src/main/java/org/apache/airavata/security/AbstractAuthenticator.java
rename to
airavata-api/src/main/java/org/apache/airavata/security/AbstractAuthenticator.java
diff --git
a/modules/security/src/main/java/org/apache/airavata/security/AbstractDatabaseAuthenticator.java
b/airavata-api/src/main/java/org/apache/airavata/security/AbstractDatabaseAuthenticator.java
similarity index 100%
rename from
modules/security/src/main/java/org/apache/airavata/security/AbstractDatabaseAuthenticator.java
rename to
airavata-api/src/main/java/org/apache/airavata/security/AbstractDatabaseAuthenticator.java
diff --git
a/modules/security/src/main/java/org/apache/airavata/security/AiravataSecurityException.java
b/airavata-api/src/main/java/org/apache/airavata/security/AiravataSecurityException.java
similarity index 100%
rename from
modules/security/src/main/java/org/apache/airavata/security/AiravataSecurityException.java
rename to
airavata-api/src/main/java/org/apache/airavata/security/AiravataSecurityException.java
diff --git
a/modules/security/src/main/java/org/apache/airavata/security/AuthenticationException.java
b/airavata-api/src/main/java/org/apache/airavata/security/AuthenticationException.java
similarity index 100%
rename from
modules/security/src/main/java/org/apache/airavata/security/AuthenticationException.java
rename to
airavata-api/src/main/java/org/apache/airavata/security/AuthenticationException.java
diff --git
a/modules/security/src/main/java/org/apache/airavata/security/Authenticator.java
b/airavata-api/src/main/java/org/apache/airavata/security/Authenticator.java
similarity index 100%
rename from
modules/security/src/main/java/org/apache/airavata/security/Authenticator.java
rename to
airavata-api/src/main/java/org/apache/airavata/security/Authenticator.java
diff --git
a/modules/security/src/main/java/org/apache/airavata/security/Authoriser.java
b/airavata-api/src/main/java/org/apache/airavata/security/Authoriser.java
similarity index 100%
rename from
modules/security/src/main/java/org/apache/airavata/security/Authoriser.java
rename to
airavata-api/src/main/java/org/apache/airavata/security/Authoriser.java
diff --git
a/modules/security/src/main/java/org/apache/airavata/security/UserStore.java
b/airavata-api/src/main/java/org/apache/airavata/security/UserStore.java
similarity index 100%
rename from
modules/security/src/main/java/org/apache/airavata/security/UserStore.java
rename to airavata-api/src/main/java/org/apache/airavata/security/UserStore.java
diff --git
a/modules/security/src/main/java/org/apache/airavata/security/UserStoreException.java
b/airavata-api/src/main/java/org/apache/airavata/security/UserStoreException.java
similarity index 100%
rename from
modules/security/src/main/java/org/apache/airavata/security/UserStoreException.java
rename to
airavata-api/src/main/java/org/apache/airavata/security/UserStoreException.java
diff --git
a/modules/security/src/main/java/org/apache/airavata/security/configurations/AbstractConfigurationReader.java
b/airavata-api/src/main/java/org/apache/airavata/security/configurations/AbstractConfigurationReader.java
similarity index 100%
rename from
modules/security/src/main/java/org/apache/airavata/security/configurations/AbstractConfigurationReader.java
rename to
airavata-api/src/main/java/org/apache/airavata/security/configurations/AbstractConfigurationReader.java
diff --git
a/modules/security/src/main/java/org/apache/airavata/security/configurations/AuthenticatorConfigurationReader.java
b/airavata-api/src/main/java/org/apache/airavata/security/configurations/AuthenticatorConfigurationReader.java
similarity index 100%
rename from
modules/security/src/main/java/org/apache/airavata/security/configurations/AuthenticatorConfigurationReader.java
rename to
airavata-api/src/main/java/org/apache/airavata/security/configurations/AuthenticatorConfigurationReader.java
diff --git
a/modules/security/src/main/java/org/apache/airavata/security/userstore/AbstractJDBCUserStore.java
b/airavata-api/src/main/java/org/apache/airavata/security/userstore/AbstractJDBCUserStore.java
similarity index 100%
rename from
modules/security/src/main/java/org/apache/airavata/security/userstore/AbstractJDBCUserStore.java
rename to
airavata-api/src/main/java/org/apache/airavata/security/userstore/AbstractJDBCUserStore.java
diff --git
a/modules/security/src/main/java/org/apache/airavata/security/userstore/JDBCUserStore.java
b/airavata-api/src/main/java/org/apache/airavata/security/userstore/JDBCUserStore.java
similarity index 100%
rename from
modules/security/src/main/java/org/apache/airavata/security/userstore/JDBCUserStore.java
rename to
airavata-api/src/main/java/org/apache/airavata/security/userstore/JDBCUserStore.java
diff --git
a/modules/security/src/main/java/org/apache/airavata/security/userstore/LDAPUserStore.java
b/airavata-api/src/main/java/org/apache/airavata/security/userstore/LDAPUserStore.java
similarity index 100%
rename from
modules/security/src/main/java/org/apache/airavata/security/userstore/LDAPUserStore.java
rename to
airavata-api/src/main/java/org/apache/airavata/security/userstore/LDAPUserStore.java
diff --git
a/modules/security/src/main/java/org/apache/airavata/security/userstore/SessionDBUserStore.java
b/airavata-api/src/main/java/org/apache/airavata/security/userstore/SessionDBUserStore.java
similarity index 100%
rename from
modules/security/src/main/java/org/apache/airavata/security/userstore/SessionDBUserStore.java
rename to
airavata-api/src/main/java/org/apache/airavata/security/userstore/SessionDBUserStore.java
diff --git
a/modules/security/src/main/java/org/apache/airavata/security/util/PasswordDigester.java
b/airavata-api/src/main/java/org/apache/airavata/security/util/PasswordDigester.java
similarity index 100%
rename from
modules/security/src/main/java/org/apache/airavata/security/util/PasswordDigester.java
rename to
airavata-api/src/main/java/org/apache/airavata/security/util/PasswordDigester.java
diff --git
a/modules/security/src/main/java/org/apache/airavata/security/util/TrustStoreManager.java
b/airavata-api/src/main/java/org/apache/airavata/security/util/TrustStoreManager.java
similarity index 100%
rename from
modules/security/src/main/java/org/apache/airavata/security/util/TrustStoreManager.java
rename to
airavata-api/src/main/java/org/apache/airavata/security/util/TrustStoreManager.java
diff --git
a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/client/SharingRegistryServiceClientFactory.java
b/airavata-api/src/main/java/org/apache/airavata/sharing/registry/client/SharingRegistryServiceClientFactory.java
similarity index 100%
rename from
modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/client/SharingRegistryServiceClientFactory.java
rename to
airavata-api/src/main/java/org/apache/airavata/sharing/registry/client/SharingRegistryServiceClientFactory.java
diff --git
a/modules/security/src/test/java/org/apache/airavata/security/configurations/AuthenticatorConfigurationReaderTest.java
b/airavata-api/src/test/java/org/apache/airavata/security/configurations/AuthenticatorConfigurationReaderTest.java
similarity index 100%
rename from
modules/security/src/test/java/org/apache/airavata/security/configurations/AuthenticatorConfigurationReaderTest.java
rename to
airavata-api/src/test/java/org/apache/airavata/security/configurations/AuthenticatorConfigurationReaderTest.java
diff --git
a/modules/security/src/test/java/org/apache/airavata/security/configurations/TestDBAuthenticator1.java
b/airavata-api/src/test/java/org/apache/airavata/security/configurations/TestDBAuthenticator1.java
similarity index 100%
rename from
modules/security/src/test/java/org/apache/airavata/security/configurations/TestDBAuthenticator1.java
rename to
airavata-api/src/test/java/org/apache/airavata/security/configurations/TestDBAuthenticator1.java
diff --git
a/modules/security/src/test/java/org/apache/airavata/security/configurations/TestDBAuthenticator2.java
b/airavata-api/src/test/java/org/apache/airavata/security/configurations/TestDBAuthenticator2.java
similarity index 100%
rename from
modules/security/src/test/java/org/apache/airavata/security/configurations/TestDBAuthenticator2.java
rename to
airavata-api/src/test/java/org/apache/airavata/security/configurations/TestDBAuthenticator2.java
diff --git
a/modules/security/src/test/java/org/apache/airavata/security/configurations/TestDBAuthenticator3.java
b/airavata-api/src/test/java/org/apache/airavata/security/configurations/TestDBAuthenticator3.java
similarity index 100%
rename from
modules/security/src/test/java/org/apache/airavata/security/configurations/TestDBAuthenticator3.java
rename to
airavata-api/src/test/java/org/apache/airavata/security/configurations/TestDBAuthenticator3.java
diff --git
a/modules/security/src/test/java/org/apache/airavata/security/configurations/TestUserStore.java
b/airavata-api/src/test/java/org/apache/airavata/security/configurations/TestUserStore.java
similarity index 100%
rename from
modules/security/src/test/java/org/apache/airavata/security/configurations/TestUserStore.java
rename to
airavata-api/src/test/java/org/apache/airavata/security/configurations/TestUserStore.java
diff --git
a/modules/security/src/test/java/org/apache/airavata/security/userstore/JDBCUserStoreTest.java
b/airavata-api/src/test/java/org/apache/airavata/security/userstore/JDBCUserStoreTest.java
similarity index 100%
rename from
modules/security/src/test/java/org/apache/airavata/security/userstore/JDBCUserStoreTest.java
rename to
airavata-api/src/test/java/org/apache/airavata/security/userstore/JDBCUserStoreTest.java
diff --git
a/modules/security/src/test/java/org/apache/airavata/security/userstore/LDAPUserStoreTest.java
b/airavata-api/src/test/java/org/apache/airavata/security/userstore/LDAPUserStoreTest.java
similarity index 100%
rename from
modules/security/src/test/java/org/apache/airavata/security/userstore/LDAPUserStoreTest.java
rename to
airavata-api/src/test/java/org/apache/airavata/security/userstore/LDAPUserStoreTest.java
diff --git
a/modules/security/src/test/java/org/apache/airavata/security/userstore/SessionDBUserStoreTest.java
b/airavata-api/src/test/java/org/apache/airavata/security/userstore/SessionDBUserStoreTest.java
similarity index 100%
rename from
modules/security/src/test/java/org/apache/airavata/security/userstore/SessionDBUserStoreTest.java
rename to
airavata-api/src/test/java/org/apache/airavata/security/userstore/SessionDBUserStoreTest.java
diff --git a/modules/security/src/test/resources/authenticators.xml
b/airavata-api/src/test/resources/authenticators.xml
similarity index 100%
rename from modules/security/src/test/resources/authenticators.xml
rename to airavata-api/src/test/resources/authenticators.xml
diff --git a/modules/security/src/test/resources/disabled-authenticator.xml
b/airavata-api/src/test/resources/disabled-authenticator.xml
similarity index 100%
rename from modules/security/src/test/resources/disabled-authenticator.xml
rename to airavata-api/src/test/resources/disabled-authenticator.xml
diff --git a/modules/security/src/test/resources/jdbc-authenticator.xml
b/airavata-api/src/test/resources/jdbc-authenticator.xml
similarity index 100%
rename from modules/security/src/test/resources/jdbc-authenticator.xml
rename to airavata-api/src/test/resources/jdbc-authenticator.xml
diff --git a/modules/security/src/test/resources/ldap-authenticator.xml
b/airavata-api/src/test/resources/ldap-authenticator.xml
similarity index 100%
rename from modules/security/src/test/resources/ldap-authenticator.xml
rename to airavata-api/src/test/resources/ldap-authenticator.xml
diff --git a/modules/security/src/test/resources/session-authenticator.xml
b/airavata-api/src/test/resources/session-authenticator.xml
similarity index 99%
rename from modules/security/src/test/resources/session-authenticator.xml
rename to airavata-api/src/test/resources/session-authenticator.xml
index 2c3fd2e8ff..31de2df407 100644
--- a/modules/security/src/test/resources/session-authenticator.xml
+++ b/airavata-api/src/test/resources/session-authenticator.xml
@@ -42,4 +42,3 @@
</specificConfigurations>
</authenticator>
</authenticators>
-
diff --git a/airavata-services/profile-service/profile-service-server/pom.xml
b/airavata-services/profile-service/profile-service-server/pom.xml
index e4a86a5dbc..282ebc6d94 100644
--- a/airavata-services/profile-service/profile-service-server/pom.xml
+++ b/airavata-services/profile-service/profile-service-server/pom.xml
@@ -55,11 +55,6 @@ under the License.
<artifactId>iam-admin-services-core</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-sharing-registry-stubs</artifactId>
- <version>${project.version}</version>
- </dependency>
</dependencies>
</project>
diff --git a/examples/java-client-samples/pom.xml
b/examples/java-client-samples/pom.xml
index 9fd3eb4e62..f1ee866d31 100644
--- a/examples/java-client-samples/pom.xml
+++ b/examples/java-client-samples/pom.xml
@@ -41,11 +41,6 @@ under the License.
<artifactId>airavata-client-configuration</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-security</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
diff --git
a/modules/distribution/src/main/assembly/participant-bin-assembly.xml
b/modules/distribution/src/main/assembly/participant-bin-assembly.xml
index 0f75092b5c..7d38cfff2b 100644
--- a/modules/distribution/src/main/assembly/participant-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/participant-bin-assembly.xml
@@ -159,8 +159,6 @@
<include>org.apache.zookeeper:zookeeper-jute:jar</include>
<include>io.netty:netty-handler:jar</include>
<include>org.apache.logging.log4j:log4j-slf4j2-impl:jar</include>
-
<include>org.apache.airavata:airavata-sharing-registry-stubs:jar</include>
- <include>org.apache.airavata:airavata-security:jar</include>
<!-- Docker Java dependencies -->
diff --git a/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml
b/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml
index d7450b4c46..62fecfc8d1 100644
--- a/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml
@@ -145,7 +145,6 @@
<include>org.xerial.snappy:snappy-java:jar</include>
<include>org.apache.airavata:ssh-agent:jar</include>
<include>org.apache.airavata:profile-service-stubs:jar</include>
-
<include>org.apache.airavata:airavata-sharing-registry-stubs:jar</include>
<include>com.hierynomus:sshj:jar</include>
<include>org.apache.airavata:sshj-agent:jar</include>
<include>org.apache.airavata:task-api:jar</include>
@@ -160,7 +159,6 @@
<include>org.apache.zookeeper:zookeeper-jute:jar</include>
<include>io.netty:netty-handler:jar</include>
<include>org.apache.logging.log4j:log4j-slf4j2-impl:jar</include>
- <include>org.apache.airavata:airavata-security:jar</include>
<include>org.apache.commons:commons-pool2:jar</include>
<include>org.json:json:jar</include>
diff --git a/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml
b/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml
index 041c75f83a..fe2a970313 100644
--- a/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml
@@ -159,8 +159,6 @@
<include>io.netty:netty-handler:jar</include>
<include>org.apache.logging.log4j:log4j-slf4j2-impl:jar</include>
<include>org.apache.airavata:profile-service-stubs:jar</include>
-
<include>org.apache.airavata:airavata-sharing-registry-stubs:jar</include>
- <include>org.apache.airavata:airavata-security:jar</include>
<include>org.apache.commons:commons-pool2:jar</include>
<include>org.json:json:jar</include>
<include>org.apache.airavata:platform-monitoring:jar</include>
diff --git a/modules/registry/registry-server/registry-api-service/pom.xml
b/modules/registry/registry-server/registry-api-service/pom.xml
index c3ec6477c5..c5e2ab55f8 100644
--- a/modules/registry/registry-server/registry-api-service/pom.xml
+++ b/modules/registry/registry-server/registry-api-service/pom.xml
@@ -49,10 +49,5 @@ under the License.
<artifactId>airavata-registry-core</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-sharing-registry-stubs</artifactId>
- <version>${project.version}</version>
- </dependency>
</dependencies>
</project>
diff --git a/modules/security/pom.xml b/modules/security/pom.xml
deleted file mode 100644
index d58cec0057..0000000000
--- a/modules/security/pom.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<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>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata</artifactId>
- <version>0.21-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>airavata-security</artifactId>
- <name>Airavata Security Implementation</name>
- <description>Module for managing security features in
Airavata</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-core</artifactId>
- <version>1.13.0</version>
- </dependency>
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>1.4</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.7</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/modules/sharing-registry/pom.xml b/modules/sharing-registry/pom.xml
index 2937cd729f..b24e12fc6d 100644
--- a/modules/sharing-registry/pom.xml
+++ b/modules/sharing-registry/pom.xml
@@ -32,7 +32,6 @@ under the License.
<url>http://airavata.apache.org/</url>
<modules>
- <module>sharing-registry-stubs</module>
<module>sharing-registry-server</module>
<module>sharing-data-migrator</module>
<module>sharing-registry-distribution</module>
diff --git a/modules/sharing-registry/sharing-registry-distribution/pom.xml
b/modules/sharing-registry/sharing-registry-distribution/pom.xml
index 6b41f492e4..be9977e915 100644
--- a/modules/sharing-registry/sharing-registry-distribution/pom.xml
+++ b/modules/sharing-registry/sharing-registry-distribution/pom.xml
@@ -61,11 +61,6 @@ under the License.
<artifactId>airavata-sharing-registry-server</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-sharing-registry-stubs</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
diff --git a/modules/sharing-registry/sharing-registry-server/pom.xml
b/modules/sharing-registry/sharing-registry-server/pom.xml
index 159909bdab..7b451347b5 100644
--- a/modules/sharing-registry/sharing-registry-server/pom.xml
+++ b/modules/sharing-registry/sharing-registry-server/pom.xml
@@ -33,7 +33,7 @@ under the License.
<dependencies>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-sharing-registry-stubs</artifactId>
+ <artifactId>airavata-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
@@ -41,11 +41,6 @@ under the License.
<artifactId>airavata-server-configuration</artifactId>
<version>${project.parent.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-api</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
<dependency>
<groupId>net.sf.dozer</groupId>
<artifactId>dozer</artifactId>
diff --git a/modules/sharing-registry/sharing-registry-stubs/pom.xml
b/modules/sharing-registry/sharing-registry-stubs/pom.xml
deleted file mode 100644
index fe1a6a992e..0000000000
--- a/modules/sharing-registry/sharing-registry-stubs/pom.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<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>airavata-sharing-registry</artifactId>
- <groupId>org.apache.airavata</groupId>
- <relativePath>../pom.xml</relativePath>
- <version>0.21-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>airavata-sharing-registry-stubs</artifactId>
- <packaging>jar</packaging>
- <name>Sharing Registry Stubs</name>
- <url>http://airavata.apache.org/</url>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- <version>${thrift.version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>${maven.compiler.plugin.version}</version>
- <configuration>
- <release>17</release>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.8</version>
- <executions>
- <execution>
- <id>generate-thrift-sources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <mkdir
dir="${project.build.directory}/generated-sources/thrift"/>
- <exec executable="thrift">
- <arg value="-r"/>
- <arg value="--gen"/>
- <arg
value="java:beans,generated_annotations=undated"/>
- <arg value="-out"/>
- <arg
value="${project.build.directory}/generated-sources/thrift"/>
- <arg
value="${project.basedir}/../../../thrift-interface-descriptions/service-cpis/sharing_cpi.thrift"/>
- </exec>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>3.2.0</version>
- <executions>
- <execution>
- <id>add-thrift-generated-sources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
-
<source>${project.build.directory}/generated-sources/thrift</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/pom.xml b/pom.xml
index e1a8883bd6..58ece29939 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,6 @@ under the License.
<module>airavata-services</module>
<module>modules/configuration</module>
<module>modules/registry</module>
- <module>modules/security</module>
<module>modules/orchestrator</module>
<module>modules/server</module>
<module>modules/sharing-registry</module>
