Merge remote-tracking branch 'upstream/master' into WINDUP-3322

windup · Oct 5, 2022 · 927219e · 927219e
2 parents bece79a + 8a026ab
commit 927219e
Show file tree

Hide file tree

Showing 2 changed files with 72 additions and 1 deletion.
diff --git a/services/pom.xml b/services/pom.xml
@@ -146,6 +146,16 @@
             <artifactId>windup-server-provider-spi</artifactId>
             <classifier>forge-addon</classifier>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.windup</groupId>
+            <artifactId>windup-bootstrap-${product-name}</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.jboss.windup.rules.apps</groupId>
+                    <artifactId>windup-rules-java-diva</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
 
         <!-- Rules -->
 

diff --git a/tsmodelsgen-maven-plugin/pom.xml b/tsmodelsgen-maven-plugin/pom.xml
@@ -61,7 +61,7 @@
             </dependency>
             <dependency>
                 <groupId>org.jboss.windup.rules</groupId>
-                <artifactId>windup-rulesets</artifactId>
+                <artifactId>windup-rulesets-parent</artifactId>
                 <version>${version.windup.ruleset}</version>
             </dependency>
         </dependencies>
@@ -116,10 +116,12 @@
             <version>${version.windup.core}</version>
         </dependency>
         <!-- But it isn't. The needed rest is referenced as deps in bootstrap. -->
+        <!-- moved down into profiles to add the one with the proper theme
         <dependency>
             <groupId>org.jboss.windup</groupId>
             <artifactId>windup-bootstrap</artifactId>
         </dependency>
+        -->
 
         <!-- Temporary trick to get around addon dependencies issues -->
         <dependency>
@@ -280,5 +282,64 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>windup</id>
+            <activation>
+                <property>
+                    <name>!downstream</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.jboss.windup</groupId>
+                    <artifactId>windup-bootstrap-windup</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>mta</id>
+            <activation>
+                <property>
+                    <name>downstream</name>
+                    <value>mta</value>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.jboss.windup</groupId>
+                    <artifactId>windup-bootstrap-mta</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>tackle</id>
+            <activation>
+                <property>
+                    <name>downstream</name>
+                    <value>tackle</value>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.jboss.windup</groupId>
+                    <artifactId>windup-bootstrap-tackle</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>mtr</id>
+            <activation>
+                <property>
+                    <name>downstream</name>
+                    <value>mtr</value>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.jboss.windup</groupId>
+                    <artifactId>windup-bootstrap-mtr</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
     </profiles>
 </project>