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 f63528a3b2390f2af9bec97c01bca0896c2a98d2 Author: yasithdev <[email protected]> AuthorDate: Tue Jun 24 23:24:00 2025 -0500 merge services-security into airavata-api --- airavata-api/pom.xml | 61 ++++++++++- .../service/security/AiravataSecurityManager.java | 0 .../service/security/GatewayGroupsInitializer.java | 0 .../airavata/service/security/IdentityContext.java | 0 .../service/security/KeyCloakSecurityManager.java | 0 .../service/security/SecurityManagerFactory.java | 0 .../apache/airavata/service/security/UserInfo.java | 0 .../service/security/authzcache/AuthzCache.java | 0 .../security/authzcache/AuthzCacheEntry.java | 0 .../security/authzcache/AuthzCacheIndex.java | 0 .../security/authzcache/AuthzCacheManager.java | 0 .../authzcache/AuthzCacheManagerFactory.java | 0 .../security/authzcache/AuthzCachedStatus.java | 0 .../authzcache/DefaultAuthzCacheManager.java | 0 .../security/interceptor/SecurityCheck.java | 0 .../security/interceptor/SecurityInterceptor.java | 0 .../security/interceptor/SecurityModule.java | 0 .../security/GatewayGroupsInitializerTest.java | 0 .../security/KeyCloakSecurityManagerTest.java | 0 airavata-services/pom.xml | 1 - .../profile-service/profile-service-server/pom.xml | 2 +- airavata-services/services-security/pom.xml | 117 --------------------- .../src/main/assembly/participant-bin-assembly.xml | 1 - .../src/main/assembly/post-wm-bin-assembly.xml | 2 - .../src/main/assembly/pre-wm-bin-assembly.xml | 2 - .../sharing-registry/sharing-data-migrator/pom.xml | 11 -- 26 files changed, 57 insertions(+), 140 deletions(-) diff --git a/airavata-api/pom.xml b/airavata-api/pom.xml index 3dc755e524..5f05c01b56 100644 --- a/airavata-api/pom.xml +++ b/airavata-api/pom.xml @@ -66,11 +66,6 @@ under the License. <artifactId>airavata-sharing-registry-stubs</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>services-security</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.apache.airavata</groupId> <artifactId>compute-account-provisioning</artifactId> @@ -352,6 +347,62 @@ under the License. <artifactId>xpp5</artifactId> <version>${xpp5.version}</version> </dependency> + <dependency> + <groupId>org.apache.airavata</groupId> + <artifactId>airavata-security</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.airavata</groupId> + <artifactId>registry-api-stubs</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.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>${httpclient.version}</version> + </dependency> + <dependency> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> + <version>4.0</version> + </dependency> + <dependency> + <groupId>aopalliance</groupId> + <artifactId>aopalliance</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>org.apache.oltu.oauth2</groupId> + <artifactId>org.apache.oltu.oauth2.client</artifactId> + <version>1.0.0</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>${fasterxml.jackson.version}</version> + </dependency> + <dependency> + <groupId>org.jmockit</groupId> + <artifactId>jmockit</artifactId> + <version>${jmockit.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + <version>20230227</version> + </dependency> + <dependency> + <groupId>org.apache.airavata</groupId> + <artifactId>platform-monitoring</artifactId> + <version>${project.version}</version> + </dependency> </dependencies> <build> diff --git a/airavata-services/services-security/src/main/java/org/apache/airavata/service/security/AiravataSecurityManager.java b/airavata-api/src/main/java/org/apache/airavata/service/security/AiravataSecurityManager.java similarity index 100% rename from airavata-services/services-security/src/main/java/org/apache/airavata/service/security/AiravataSecurityManager.java rename to airavata-api/src/main/java/org/apache/airavata/service/security/AiravataSecurityManager.java diff --git a/airavata-services/services-security/src/main/java/org/apache/airavata/service/security/GatewayGroupsInitializer.java b/airavata-api/src/main/java/org/apache/airavata/service/security/GatewayGroupsInitializer.java similarity index 100% rename from airavata-services/services-security/src/main/java/org/apache/airavata/service/security/GatewayGroupsInitializer.java rename to airavata-api/src/main/java/org/apache/airavata/service/security/GatewayGroupsInitializer.java diff --git a/airavata-services/services-security/src/main/java/org/apache/airavata/service/security/IdentityContext.java b/airavata-api/src/main/java/org/apache/airavata/service/security/IdentityContext.java similarity index 100% rename from airavata-services/services-security/src/main/java/org/apache/airavata/service/security/IdentityContext.java rename to airavata-api/src/main/java/org/apache/airavata/service/security/IdentityContext.java diff --git a/airavata-services/services-security/src/main/java/org/apache/airavata/service/security/KeyCloakSecurityManager.java b/airavata-api/src/main/java/org/apache/airavata/service/security/KeyCloakSecurityManager.java similarity index 100% rename from airavata-services/services-security/src/main/java/org/apache/airavata/service/security/KeyCloakSecurityManager.java rename to airavata-api/src/main/java/org/apache/airavata/service/security/KeyCloakSecurityManager.java diff --git a/airavata-services/services-security/src/main/java/org/apache/airavata/service/security/SecurityManagerFactory.java b/airavata-api/src/main/java/org/apache/airavata/service/security/SecurityManagerFactory.java similarity index 100% rename from airavata-services/services-security/src/main/java/org/apache/airavata/service/security/SecurityManagerFactory.java rename to airavata-api/src/main/java/org/apache/airavata/service/security/SecurityManagerFactory.java diff --git a/airavata-services/services-security/src/main/java/org/apache/airavata/service/security/UserInfo.java b/airavata-api/src/main/java/org/apache/airavata/service/security/UserInfo.java similarity index 100% rename from airavata-services/services-security/src/main/java/org/apache/airavata/service/security/UserInfo.java rename to airavata-api/src/main/java/org/apache/airavata/service/security/UserInfo.java diff --git a/airavata-services/services-security/src/main/java/org/apache/airavata/service/security/authzcache/AuthzCache.java b/airavata-api/src/main/java/org/apache/airavata/service/security/authzcache/AuthzCache.java similarity index 100% rename from airavata-services/services-security/src/main/java/org/apache/airavata/service/security/authzcache/AuthzCache.java rename to airavata-api/src/main/java/org/apache/airavata/service/security/authzcache/AuthzCache.java diff --git a/airavata-services/services-security/src/main/java/org/apache/airavata/service/security/authzcache/AuthzCacheEntry.java b/airavata-api/src/main/java/org/apache/airavata/service/security/authzcache/AuthzCacheEntry.java similarity index 100% rename from airavata-services/services-security/src/main/java/org/apache/airavata/service/security/authzcache/AuthzCacheEntry.java rename to airavata-api/src/main/java/org/apache/airavata/service/security/authzcache/AuthzCacheEntry.java diff --git a/airavata-services/services-security/src/main/java/org/apache/airavata/service/security/authzcache/AuthzCacheIndex.java b/airavata-api/src/main/java/org/apache/airavata/service/security/authzcache/AuthzCacheIndex.java similarity index 100% rename from airavata-services/services-security/src/main/java/org/apache/airavata/service/security/authzcache/AuthzCacheIndex.java rename to airavata-api/src/main/java/org/apache/airavata/service/security/authzcache/AuthzCacheIndex.java diff --git a/airavata-services/services-security/src/main/java/org/apache/airavata/service/security/authzcache/AuthzCacheManager.java b/airavata-api/src/main/java/org/apache/airavata/service/security/authzcache/AuthzCacheManager.java similarity index 100% rename from airavata-services/services-security/src/main/java/org/apache/airavata/service/security/authzcache/AuthzCacheManager.java rename to airavata-api/src/main/java/org/apache/airavata/service/security/authzcache/AuthzCacheManager.java diff --git a/airavata-services/services-security/src/main/java/org/apache/airavata/service/security/authzcache/AuthzCacheManagerFactory.java b/airavata-api/src/main/java/org/apache/airavata/service/security/authzcache/AuthzCacheManagerFactory.java similarity index 100% rename from airavata-services/services-security/src/main/java/org/apache/airavata/service/security/authzcache/AuthzCacheManagerFactory.java rename to airavata-api/src/main/java/org/apache/airavata/service/security/authzcache/AuthzCacheManagerFactory.java diff --git a/airavata-services/services-security/src/main/java/org/apache/airavata/service/security/authzcache/AuthzCachedStatus.java b/airavata-api/src/main/java/org/apache/airavata/service/security/authzcache/AuthzCachedStatus.java similarity index 100% rename from airavata-services/services-security/src/main/java/org/apache/airavata/service/security/authzcache/AuthzCachedStatus.java rename to airavata-api/src/main/java/org/apache/airavata/service/security/authzcache/AuthzCachedStatus.java diff --git a/airavata-services/services-security/src/main/java/org/apache/airavata/service/security/authzcache/DefaultAuthzCacheManager.java b/airavata-api/src/main/java/org/apache/airavata/service/security/authzcache/DefaultAuthzCacheManager.java similarity index 100% rename from airavata-services/services-security/src/main/java/org/apache/airavata/service/security/authzcache/DefaultAuthzCacheManager.java rename to airavata-api/src/main/java/org/apache/airavata/service/security/authzcache/DefaultAuthzCacheManager.java diff --git a/airavata-services/services-security/src/main/java/org/apache/airavata/service/security/interceptor/SecurityCheck.java b/airavata-api/src/main/java/org/apache/airavata/service/security/interceptor/SecurityCheck.java similarity index 100% rename from airavata-services/services-security/src/main/java/org/apache/airavata/service/security/interceptor/SecurityCheck.java rename to airavata-api/src/main/java/org/apache/airavata/service/security/interceptor/SecurityCheck.java diff --git a/airavata-services/services-security/src/main/java/org/apache/airavata/service/security/interceptor/SecurityInterceptor.java b/airavata-api/src/main/java/org/apache/airavata/service/security/interceptor/SecurityInterceptor.java similarity index 100% rename from airavata-services/services-security/src/main/java/org/apache/airavata/service/security/interceptor/SecurityInterceptor.java rename to airavata-api/src/main/java/org/apache/airavata/service/security/interceptor/SecurityInterceptor.java diff --git a/airavata-services/services-security/src/main/java/org/apache/airavata/service/security/interceptor/SecurityModule.java b/airavata-api/src/main/java/org/apache/airavata/service/security/interceptor/SecurityModule.java similarity index 100% rename from airavata-services/services-security/src/main/java/org/apache/airavata/service/security/interceptor/SecurityModule.java rename to airavata-api/src/main/java/org/apache/airavata/service/security/interceptor/SecurityModule.java diff --git a/airavata-services/services-security/src/test/java/org/apache/airavata/service/security/GatewayGroupsInitializerTest.java b/airavata-api/src/test/java/org/apache/airavata/service/security/GatewayGroupsInitializerTest.java similarity index 100% rename from airavata-services/services-security/src/test/java/org/apache/airavata/service/security/GatewayGroupsInitializerTest.java rename to airavata-api/src/test/java/org/apache/airavata/service/security/GatewayGroupsInitializerTest.java diff --git a/airavata-services/services-security/src/test/java/org/apache/airavata/service/security/KeyCloakSecurityManagerTest.java b/airavata-api/src/test/java/org/apache/airavata/service/security/KeyCloakSecurityManagerTest.java similarity index 100% rename from airavata-services/services-security/src/test/java/org/apache/airavata/service/security/KeyCloakSecurityManagerTest.java rename to airavata-api/src/test/java/org/apache/airavata/service/security/KeyCloakSecurityManagerTest.java diff --git a/airavata-services/pom.xml b/airavata-services/pom.xml index a19d0c9be1..5c3e35c99e 100644 --- a/airavata-services/pom.xml +++ b/airavata-services/pom.xml @@ -51,7 +51,6 @@ under the License. <modules> <module>profile-service</module> - <module>services-security</module> </modules> <properties> diff --git a/airavata-services/profile-service/profile-service-server/pom.xml b/airavata-services/profile-service/profile-service-server/pom.xml index 6b3f574356..afbe879f8c 100644 --- a/airavata-services/profile-service/profile-service-server/pom.xml +++ b/airavata-services/profile-service/profile-service-server/pom.xml @@ -32,7 +32,7 @@ under the License. <dependencies> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>services-security</artifactId> + <artifactId>airavata-api</artifactId> <version>${project.version}</version> </dependency> <dependency> diff --git a/airavata-services/services-security/pom.xml b/airavata-services/services-security/pom.xml deleted file mode 100644 index 7a66a5ad34..0000000000 --- a/airavata-services/services-security/pom.xml +++ /dev/null @@ -1,117 +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";> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <artifactId>airavata-services</artifactId> - <groupId>org.apache.airavata</groupId> - <version>0.21-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>services-security</artifactId> - <name>Airavata Services Security</name> - <url>http://airavata.apache.org/</url> - - <dependencies> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-api</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.airavata</groupId> - <artifactId>registry-api-stubs</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.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <version>${httpclient.version}</version> - </dependency> - <dependency> - <groupId>com.google.inject</groupId> - <artifactId>guice</artifactId> - <version>4.0</version> - </dependency> - <dependency> - <groupId>aopalliance</groupId> - <artifactId>aopalliance</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>org.apache.oltu.oauth2</groupId> - <artifactId>org.apache.oltu.oauth2.client</artifactId> - <version>1.0.0</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - <version>${fasterxml.jackson.version}</version> - </dependency> - <dependency> - <groupId>org.jmockit</groupId> - <artifactId>jmockit</artifactId> - <version>${jmockit.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - <version>20230227</version> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>platform-monitoring</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>${surefire.version}</version> - <inherited>true</inherited> - <configuration> - <useSystemClassLoader>false</useSystemClassLoader> - <argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine> - - <reuseForks>false</reuseForks> - <argLine> - -javaagent:${settings.localRepository}/org/jmockit/jmockit/${jmockit.version}/jmockit-${jmockit.version}.jar - </argLine> - <testSourceDirectory>${basedir}\src\test\java\</testSourceDirectory> - </configuration> - </plugin> - </plugins> - </build> -</project> diff --git a/modules/distribution/src/main/assembly/participant-bin-assembly.xml b/modules/distribution/src/main/assembly/participant-bin-assembly.xml index fbeac9ddf4..e164d325e0 100644 --- a/modules/distribution/src/main/assembly/participant-bin-assembly.xml +++ b/modules/distribution/src/main/assembly/participant-bin-assembly.xml @@ -161,7 +161,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:services-security:jar</include> <include>org.apache.airavata:airavata-sharing-registry-stubs:jar</include> <include>org.apache.airavata:airavata-security:jar</include> 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 0e81614742..6066681fb2 100644 --- a/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml +++ b/modules/distribution/src/main/assembly/post-wm-bin-assembly.xml @@ -77,7 +77,6 @@ <include>javax.activation:activation:jar</include> <include>org.apache.airavata:airavata-api:jar</include> <include>org.apache.airavata:agent-api:jar</include> - <include>org.apache.airavata:airavata-api:jar</include> <include>org.apache.airavata:airavata-messaging-core:jar</include> <include>org.apache.airavata:airavata-registry-core:jar</include> <include>org.apache.airavata:airavata-registry-cpi:jar</include> @@ -148,7 +147,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:services-security: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> 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 6545bdf604..bfc6c7515a 100644 --- a/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml +++ b/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml @@ -77,7 +77,6 @@ <include>javax.activation:activation:jar</include> <include>org.apache.airavata:airavata-api:jar</include> <include>org.apache.airavata:agent-api:jar</include> - <include>org.apache.airavata:airavata-api:jar</include> <include>org.apache.airavata:airavata-messaging-core:jar</include> <include>org.apache.airavata:airavata-registry-core:jar</include> <include>org.apache.airavata:airavata-registry-cpi:jar</include> @@ -162,7 +161,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:services-security: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> diff --git a/modules/sharing-registry/sharing-data-migrator/pom.xml b/modules/sharing-registry/sharing-data-migrator/pom.xml index eb87799309..b4b7e8f499 100644 --- a/modules/sharing-registry/sharing-data-migrator/pom.xml +++ b/modules/sharing-registry/sharing-data-migrator/pom.xml @@ -72,17 +72,6 @@ under the License. <artifactId>registry-api-stubs</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>services-security</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.httpcomponents.wso2</groupId> - <artifactId>httpcore</artifactId> - </exclusion> - </exclusions> - </dependency> <dependency> <groupId>org.apache.thrift</groupId> <artifactId>libthrift</artifactId>
