#2 fix build of modules with intra-project chart dependencies

boozallen · May 2, 2024 · e05ecc4 · e05ecc4
1 parent afabc14
commit e05ecc4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 54 deletions.
diff --git a/build-parent/pom.xml b/build-parent/pom.xml
@@ -963,51 +963,6 @@ To suppress enforce-helm-version rule, you must add following plugin to the root
             </build>
         </profile>
 
-        <!-- The profile aiops-release must be active when a project is released.
-            The configuration in this POM will automatically call this profile if using
-            the maven-release-plugin. If the maven-release-plugin is not used during
-            the release, this profile must be manually activated. -->
-        <profile>
-            <id>aiops-release</id>
-            <build>
-                <plugins>
-                    <!-- Create a source-release artifact that contains the fully buildable
-                        project directory source structure. This should be released to the Maven
-                        repository for each AIOps project release. -->
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-deploy-plugin</artifactId>
-                        <configuration>
-                            <updateReleaseInfo>true</updateReleaseInfo>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-javadocs</id>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-source-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-sources</id>
-                                <goals>
-                                    <goal>jar-no-fork</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
         <profile>
             <id>doclint-java8-disable</id>
             <activation>

diff --git a/extensions/extensions-helm/pom.xml b/extensions/extensions-helm/pom.xml
@@ -16,20 +16,20 @@
     <modules>
         <module>aissemble-quarkus-chart</module>
         <module>aissemble-airflow-chart</module>
-<!--        <module>aissemble-data-access-chart</module>-->
+        <module>aissemble-data-access-chart</module>
         <module>aissemble-fastapi-chart</module>
         <module>aissemble-inference-chart</module>
-<!--        <module>aissemble-versioning-chart</module>-->
+        <module>aissemble-versioning-chart</module>
         <module>aissemble-kafka-chart</module>
         <module>extensions-helm-hive</module>
         <module>aissemble-keycloak-chart</module>
         <module>aissemble-elasticsearch-operator-chart</module>
         <module>aissemble-elasticsearch-chart</module>
         <module>aissemble-spark-application-chart</module>
         <module>aissemble-spark-operator-chart</module>
-<!--        <module>aissemble-lineage-http-consumer-chart</module>-->
+        <module>aissemble-lineage-http-consumer-chart</module>
         <module>aissemble-jenkins-chart</module>
-<!--        <module>extensions-helm-pipeline-invocation</module>-->
+        <module>extensions-helm-pipeline-invocation</module>
         <module>aissemble-policy-decision-point-chart</module>
         <module>aissemble-mlflow-chart</module>
         <module>aissemble-localstack-chart</module>
@@ -61,7 +61,7 @@
             </properties>
         </profile>
         <profile>
-            <id>ci</id>
+            <id>release</id>
             <properties>
                 <overwrite.dependencies>true</overwrite.dependencies>
             </properties>

diff --git a/pom.xml b/pom.xml
@@ -284,6 +284,7 @@
                           the habushu-managed updates to pyproject.toml files lags behind. To prevent the first
                           committer after a release from needing to commit these files, we force the update here. -->
                         <completionGoals>org.technologybrewery.habushu:habushu-maven-plugin:initialize-habushu</completionGoals>
+                        <releaseProfiles>release</releaseProfiles>
                     </configuration>
                 </plugin>
                 <plugin>

diff --git a/test/test-mda-models/pom.xml b/test/test-mda-models/pom.xml
@@ -16,10 +16,10 @@
     <description>Contains metamodel instance examples used by aiSSEMBLE MDA for code generation</description>
 
     <modules>
-<!--        <module>test-data-delivery-spark-model</module>-->
-<!--        <module>test-data-delivery-spark-model-basic</module>-->
-<!--        <module>aissemble-test-data-delivery-pyspark-model</module>-->
-<!--        <module>aissemble-test-data-delivery-pyspark-model-basic</module>-->
+        <module>test-data-delivery-spark-model</module>
+        <module>test-data-delivery-spark-model-basic</module>
+        <module>aissemble-test-data-delivery-pyspark-model</module>
+        <module>aissemble-test-data-delivery-pyspark-model-basic</module>
         <module>test-machine-learning-model-definition</module>
         <module>test-machine-learning-model</module>
         <module>test-machine-learning-base-model</module>