[kie-drools#5653] Remove productized profile (apache#5654)

* remove modules from productized profile * remove jandex workaround used to workaround Quarkus 2.13.x Most of those changes were introduced as part of commit d15e51c * remove not used KieMeta class
kiegroup · Jan 16, 2024 · 9028fc5 · 9028fc5
1 parent 58cb93f
commit 9028fc5
Show file tree

Hide file tree

Showing 15 changed files with 84 additions and 349 deletions.
diff --git a/build-parent/pom.xml b/build-parent/pom.xml
@@ -156,9 +156,6 @@
     <!-- Version of JMH -->
     <version.org.openjdk.jmh>1.21</version.org.openjdk.jmh>
 
-    <!-- In community builds productized is false, in product builds it's true to enable branding changes -->
-    <org.kie.productized>false</org.kie.productized>
-
     <maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
 
     <!-- This property needs to be defined in all modules that use the packaging 'jar' or 'bundle'. It is
@@ -206,7 +203,6 @@
 
     <version.ch.obermuhlner>2.0.1</version.ch.obermuhlner>
     <version.io.smallrye.jandex>3.1.2</version.io.smallrye.jandex>
-    <version.io.smallrye.jandex-maven-plugin>${version.io.smallrye.jandex}</version.io.smallrye.jandex-maven-plugin>
     <version.org.eclipse.yasson>3.0.3</version.org.eclipse.yasson>
 
     <version.com.github.javaparser>3.25.3</version.com.github.javaparser>
@@ -225,10 +221,6 @@
     <version.jdk>${maven.compiler.release}</version.jdk>
     <version.maven>${version.org.apache.maven}</version.maven>
 
-    <!-- Override with old org.jboss if relying on quarkus 2.13.x or older -->
-    <jandex.group-id>io.smallrye</jandex.group-id>
-    <jandex-maven-plugin.group-id>${jandex.group-id}</jandex-maven-plugin.group-id>
-
     <!-- These are added as part of the migration from JBoss to Apache parent pom.xml. They may be extracted to a KIE parent bom. -->
     <version.maven-checkstyle>3.3.0</version.maven-checkstyle>
     <version.build.helper.maven.plugin>3.4.0</version.build.helper.maven.plugin>
@@ -1198,7 +1190,7 @@
 
       <!-- used  by DMN test to ensure NI reflect-conf.json is correctly up-to-date -->
       <dependency>
-        <groupId>${jandex.group-id}</groupId>
+        <groupId>io.smallrye</groupId>
         <artifactId>jandex</artifactId>
         <version>${version.io.smallrye.jandex}</version>
       </dependency>
@@ -1840,9 +1832,9 @@
           <version>1.0</version>
         </plugin>
         <plugin>
-          <groupId>${jandex-maven-plugin.group-id}</groupId>
+          <groupId>io.smallrye</groupId>
           <artifactId>jandex-maven-plugin</artifactId>
-          <version>${version.io.smallrye.jandex-maven-plugin}</version>
+          <version>${version.io.smallrye.jandex}</version>
         </plugin>
         <plugin>
           <groupId>org.asciidoctor</groupId>
@@ -2292,21 +2284,6 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>productizedProfile</id>
-      <activation>
-        <property>
-          <name>productized</name>
-        </property>
-      </activation>
-      <properties>
-        <org.kie.productized>true</org.kie.productized>
-        <jandex.group-id>org.jboss</jandex.group-id>
-        <version.io.smallrye.jandex>2.4.3.Final</version.io.smallrye.jandex>
-        <jandex-maven-plugin.group-id>org.jboss.jandex</jandex-maven-plugin.group-id>
-        <version.io.smallrye.jandex-maven-plugin>1.2.3</version.io.smallrye.jandex-maven-plugin>
-      </properties>
-    </profile>
     <!--
       Creates JaCoCo XML reports and invokes the Sonar scanner, which uploads code quality data into the SonarCloud.
     -->
@@ -2546,42 +2523,6 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>default</id>
-      <activation>
-        <property>
-          <name>!productized</name>
-        </property>
-      </activation>
-      <build>
-        <pluginManagement>
-          <plugins>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-enforcer-plugin</artifactId>
-              <executions>
-                <!-- Additional ban-blacklisted-dependencies deps to be checked when productized is disabled -->
-                <execution>
-                  <id>ban-blacklisted-dependencies</id>
-                  <configuration>
-                    <rules>
-                      <bannedDependencies>
-                        <!-- these banned deps are added to the default list define above -->
-                        <excludes combine.children="append">
-                          <exclude>org.jboss:jandex</exclude> <!-- Use io.smallrye:jandex instead -->
-                          <exclude>org.jboss.jandex:jandex-maven-plugin</exclude> <!-- Use io.smallrye:jandex-maven-plugin instead -->
-                          <!-- End  -->
-                        </excludes>
-                      </bannedDependencies>
-                    </rules>
-                  </configuration>
-                </execution>
-              </executions>
-            </plugin>
-          </plugins>
-        </pluginManagement>
-      </build>
-    </profile>
   </profiles>
 
 </project>
diff --git a/drools-persistence/drools-persistence-jpa/pom.xml b/drools-persistence/drools-persistence-jpa/pom.xml
@@ -178,7 +178,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>${jandex.group-id}</groupId>
+      <groupId>io.smallrye</groupId>
       <artifactId>jandex</artifactId>
       <scope>test</scope>
     </dependency>

diff --git a/drools-quarkus-extension/drools-quarkus/pom.xml b/drools-quarkus-extension/drools-quarkus/pom.xml
@@ -144,7 +144,7 @@
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>${jandex-maven-plugin.group-id}</groupId>
+                <groupId>io.smallrye</groupId>
                 <artifactId>jandex-maven-plugin</artifactId>
             </plugin>
         </plugins>

diff --git a/drools-quarkus-extension/pom.xml b/drools-quarkus-extension/pom.xml
@@ -37,6 +37,13 @@
 
   <modules>
     <module>drools-quarkus-util-deployment</module>
+    <module>drools-quarkus</module>
+    <module>drools-quarkus-deployment</module>
+    <module>drools-quarkus-integration-test</module>
+    <module>drools-quarkus-integration-test-hotreload</module>
+    <module>drools-quarkus-ruleunit-integration-test</module>
+    <module>drools-quarkus-quickstart-test</module>
+    <module>drools-quarkus-examples</module>
   </modules>
 
   <dependencyManagement>
@@ -51,24 +58,4 @@
     </dependencies>
   </dependencyManagement>
 
-  <profiles>
-    <profile>
-      <id>default</id>
-      <activation>
-        <property>
-          <name>!productized</name>
-        </property>
-      </activation>
-      <modules>
-        <module>drools-quarkus</module>
-        <module>drools-quarkus-deployment</module>
-        <module>drools-quarkus-integration-test</module>
-        <module>drools-quarkus-integration-test-hotreload</module>
-        <module>drools-quarkus-ruleunit-integration-test</module>
-        <module>drools-quarkus-quickstart-test</module>
-        <module>drools-quarkus-examples</module>
-      </modules>
-    </profile>
-  </profiles>
-
 </project>
diff --git a/drools-traits/pom.xml b/drools-traits/pom.xml
@@ -174,7 +174,7 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>${jandex.group-id}</groupId>
+      <groupId>io.smallrye</groupId>
       <artifactId>jandex</artifactId>
       <scope>test</scope>
     </dependency>

diff --git a/kie-dmn/kie-dmn-core/pom.xml b/kie-dmn/kie-dmn-core/pom.xml
@@ -180,7 +180,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${jandex.group-id}</groupId>
+      <groupId>io.smallrye</groupId>
       <artifactId>jandex</artifactId>
       <scope>test</scope>
     </dependency>

diff --git a/kie-dmn/kie-dmn-feel/pom.xml b/kie-dmn/kie-dmn-feel/pom.xml
@@ -112,7 +112,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${jandex.group-id}</groupId>
+      <groupId>io.smallrye</groupId>
       <artifactId>jandex</artifactId>
       <scope>test</scope>
     </dependency>

diff --git a/kie-dmn/kie-dmn-model/pom.xml b/kie-dmn/kie-dmn-model/pom.xml
@@ -71,7 +71,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${jandex.group-id}</groupId>
+      <groupId>io.smallrye</groupId>
       <artifactId>jandex</artifactId>
       <scope>test</scope>
     </dependency>

diff --git a/kie-dmn/pom.xml b/kie-dmn/pom.xml
@@ -44,6 +44,16 @@
     <module>kie-dmn-backend</module>
     <module>kie-dmn-validation-bootstrap</module>
     <module>kie-dmn-validation</module>
+    <module>kie-dmn-openapi</module>
+    <module>kie-dmn-tck</module>
+    <module>kie-dmn-legacy-tests</module>
+    <module>kie-dmn-trisotech</module>
+    <module>kie-dmn-signavio</module>
+    <module>kie-dmn-pmml-tests-parent</module>
+    <module>kie-dmn-xls2dmn-cli</module>
+    <module>kie-dmn-core-jsr223-jq</module>
+    <module>kie-dmn-core-jsr223</module>
+    <module>kie-dmn-ruleset2dmn-parent</module>
   </modules>
 
   <dependencyManagement>
@@ -58,27 +68,4 @@
     </dependencies>
   </dependencyManagement>
 
-  <profiles>
-    <profile>
-      <id>default</id>
-      <activation>
-        <property>
-          <name>!productized</name>
-        </property>
-      </activation>
-      <modules>
-        <module>kie-dmn-openapi</module>
-        <module>kie-dmn-tck</module>
-        <module>kie-dmn-legacy-tests</module>
-        <module>kie-dmn-trisotech</module>
-        <module>kie-dmn-signavio</module>
-        <module>kie-dmn-pmml-tests-parent</module>
-        <module>kie-dmn-xls2dmn-cli</module>
-        <module>kie-dmn-core-jsr223-jq</module>
-        <module>kie-dmn-core-jsr223</module>
-        <module>kie-dmn-ruleset2dmn-parent</module>
-      </modules>
-    </profile>
-  </profiles>
-
 </project>
diff --git a/kie-drl/kie-drl-implementations/pom.xml b/kie-drl/kie-drl-implementations/pom.xml
@@ -38,21 +38,7 @@
 
     <modules>
         <module>kie-drl-map-input</module>
+        <module>kie-drl-kiesession-local</module>
     </modules>
 
-    <profiles>
-        <profile>
-        <id>default</id>
-        <activation>
-            <property>
-            <name>!productized</name>
-            </property>
-        </activation>
-        <modules>
-            <module>kie-drl-kiesession-local</module>
-        </modules>
-        </profile>
-    </profiles>
-
-
 </project>
diff --git a/kie-drl/pom.xml b/kie-drl/pom.xml
@@ -42,6 +42,8 @@
     <module>kie-drl-compilation-common</module>
     <module>kie-drl-implementations</module>
     <module>kie-drl-runtime-common</module>
+    <module>kie-drl-tests</module>
+    <module>kie-drl-tests-without-index-file</module>
   </modules>
 
   <dependencyManagement>
@@ -122,21 +124,5 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
-  <profiles>
-    <profile>
-      <id>default</id>
-      <activation>
-        <property>
-          <name>!productized</name>
-        </property>
-      </activation>
-      <modules>
-        <module>kie-drl-tests</module>
-        <module>kie-drl-tests-without-index-file</module>
-      </modules>
-    </profile>
-  </profiles>
-
 </project>
 
diff --git a/kie-internal/src/main/filtered-resources/org/kie/internal/utils/kieMeta.properties b/kie-internal/src/main/filtered-resources/org/kie/internal/utils/kieMeta.properties
diff --git a/kie-internal/src/main/java/org/kie/internal/utils/KieMeta.java b/kie-internal/src/main/java/org/kie/internal/utils/KieMeta.java