This is an automated email from the ASF dual-hosted git repository. yasith pushed a commit to branch feat/spring-module-reorg in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 741bc635ada414649381d773a755d0bcd303efc7 Author: yasithdev <[email protected]> AuthorDate: Fri Mar 27 22:38:01 2026 -0500 chore: remove stale assembly descriptors from airavata-api The unified airavata-server module now produces the distribution tarball, so the assembly plugin and descriptor files in airavata-api are no longer needed. --- airavata-api/pom.xml | 23 ---- .../src/main/assembly/api-server-bin-assembly.xml | 116 --------------------- .../src/main/assembly/api-server-src-assembly.xml | 81 -------------- 3 files changed, 220 deletions(-) diff --git a/airavata-api/pom.xml b/airavata-api/pom.xml index 55718ecbcd..177e1462e4 100644 --- a/airavata-api/pom.xml +++ b/airavata-api/pom.xml @@ -526,29 +526,6 @@ under the License. </configuration> </plugin> - <!-- Package distribution (tarball) --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>api-server-distribution-package</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <tarLongFileMode>posix</tarLongFileMode> - <finalName>${api.server.dist.name}</finalName> - <descriptors> - <descriptor>src/main/assembly/api-server-bin-assembly.xml</descriptor> - </descriptors> - <attach>false</attach> - </configuration> - </execution> - </executions> - </plugin> - <!-- Copy runtime dependencies for classpath mode (Tiltfile) --> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/airavata-api/src/main/assembly/api-server-bin-assembly.xml b/airavata-api/src/main/assembly/api-server-bin-assembly.xml deleted file mode 100644 index a4ba2f2ae6..0000000000 --- a/airavata-api/src/main/assembly/api-server-bin-assembly.xml +++ /dev/null @@ -1,116 +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. - ---> -<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 http://maven.apache.org/xsd/assembly-2.2.0.xsd";> - <id>bin</id> - <includeBaseDirectory>true</includeBaseDirectory> - <formats> - <format>tar.gz</format> - </formats> - - <fileSets> - - <!-- ********************** copy metadata files ********************** --> - <fileSet> - <directory>..</directory> - <outputDirectory>.</outputDirectory> - <includes> - <include>INSTALL</include> - <include>LICENSE</include> - <include>NOTICE</include> - <include>RELEASE_NOTES</include> - <include>README.md</include> - <include>logo.txt</include> - </includes> - </fileSet> - - <!-- ********************** copy keystore files ********************** --> - <fileSet> - <directory>../keystores</directory> - <outputDirectory>conf/keystores</outputDirectory> - <includes> - <include>*.jks</include> - </includes> - </fileSet> - - <!-- ********************** copy config files ********************** --> - <fileSet> - <directory>src/main/resources</directory> - <outputDirectory>conf</outputDirectory> - <includes> - <include>META-INF/persistence.xml</include> - <include>templates/*.template</include> - <include>*.properties</include> - <include>*.xml</include> - </includes> - </fileSet> - - <!-- ********************** copy database scripts ********************** --> - <fileSet> - <directory>src/main/resources/database_scripts</directory> - <outputDirectory>database_scripts</outputDirectory> - <includes> - <include>*.sql</include> - </includes> - </fileSet> - - <!-- ********************** copy bin files ********************** --> - <fileSet> - <directory>src/main/resources/distribution/bin</directory> - <outputDirectory>bin</outputDirectory> - <fileMode>777</fileMode> - <includes> - <include>*.sh</include> - <include>*.bat</include> - </includes> - </fileSet> - - <!-- ********************** copy config files ********************** --> - <fileSet> - <directory>src/main/resources/distribution/conf</directory> - <outputDirectory>conf</outputDirectory> - <includes> - <include>*</include> - </includes> - </fileSet> - - <!-- ********************** copy logs ********************** --> - <fileSet> - <directory>./</directory> - <outputDirectory>logs</outputDirectory> - <excludes> - <exclude>*/**</exclude> - </excludes> - </fileSet> - - </fileSets> - - <dependencySets> - <dependencySet> - <useProjectArtifact>true</useProjectArtifact> - <outputDirectory>lib</outputDirectory> - <useTransitiveDependencies>true</useTransitiveDependencies> - </dependencySet> - </dependencySets> - -</assembly> \ No newline at end of file diff --git a/airavata-api/src/main/assembly/api-server-src-assembly.xml b/airavata-api/src/main/assembly/api-server-src-assembly.xml deleted file mode 100644 index b33ff157ec..0000000000 --- a/airavata-api/src/main/assembly/api-server-src-assembly.xml +++ /dev/null @@ -1,81 +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. - ---> -<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 http://maven.apache.org/xsd/assembly-2.2.0.xsd";> - <id>src</id> - <includeBaseDirectory>true</includeBaseDirectory> - <baseDirectory>${api.server.dist.name}</baseDirectory> - <formats> - <format>tar.gz</format> - </formats> - - <fileSets> - - <!-- ********************** copy metadata files ********************** --> - <fileSet> - <directory>../..</directory> - <outputDirectory>.</outputDirectory> - <includes> - <include>INSTALL</include> - <include>LICENSE</include> - <include>NOTICE</include> - <include>RELEASE_NOTES</include> - <include>README.md</include> - </includes> - </fileSet> - - <!-- ********************** copy source code ********************** --> - <fileSet> - <directory>../..</directory> - <outputDirectory></outputDirectory> - <useDefaultExcludes>true</useDefaultExcludes> - <includes> - <include>pom.xml</include> - <include>airavata-api/**</include> - <include>modules/**</include> - <include>examples/**</include> - </includes> - <excludes> - <!-- Exclusions from org.apache.resources:apache-source-release-assembly-descriptor. - Note that they assume that all sources are located under an "src" directory. This - is not the case for Axis2, which doesn't use the standard Maven 2 conventions. - Thus we may still encounter some issues here. --> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/).*${project.build.directory}.*]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?maven-eclipse\.xml]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.project]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.classpath]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iws]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.ipr]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iml]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.settings(/.*)?]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.externalToolBuilders(/.*)?]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.deployables(/.*)?]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.wtpmodules(/.*)?]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?cobertura\.ser]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?pom\.xml\.releaseBackup]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?release\.properties]</exclude> - </excludes> - </fileSet> - - </fileSets> -</assembly> \ No newline at end of file
