feat(objectionary#650): version props

h1alexbel · Aug 2, 2024 · aafbd3e · aafbd3e
1 parent f018a87
commit aafbd3e
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 81 deletions.
diff --git a/.github/workflows/codecov.yaml b/.github/workflows/codecov.yaml
@@ -20,7 +20,7 @@ jobs:
           key: maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             maven-
-      - run: mvn clean install -Pcheck -Dqulice --errors --batch-mode
+      - run: mvn clean install -Pqulice --errors --batch-mode
       - uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

diff --git a/.github/workflows/maven.test.yaml b/.github/workflows/maven.test.yaml
@@ -32,7 +32,7 @@ jobs:
           key: ${{ runner.os }}-jdk-${{ matrix.java }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-jdk-${{ matrix.java }}-maven-
-      - run: mvn clean install -P"check,long" -Dqulice --errors --batch-mode
+      - run: mvn clean install -P"qulice,long" --errors --batch-mode
       - name: Archive failure logs
         uses: actions/upload-artifact@v4
         if: failure()

diff --git a/pom.xml b/pom.xml
@@ -270,9 +270,35 @@ SOFTWARE.
   </build>
   <profiles>
     <profile>
-      <id>check</id>
+      <id>qulice</id>
       <build>
         <plugins>
+          <plugin>
+            <groupId>com.qulice</groupId>
+            <artifactId>qulice-maven-plugin</artifactId>
+            <version>${qulice.version}</version>
+            <configuration>
+              <license>file:${basedir}/LICENSE.txt</license>
+              <excludes>
+                <exclude>checkstyle:.*/BytecodeInstructionEntry.java</exclude>
+                <exclude>pmd:/src/test/resources/.*</exclude>
+                <exclude>pmd:/src/it/.*</exclude>
+                <exclude>checkstyle:/src/site/.*</exclude>
+                <exclude>checkstyle:/src/test/resources/.*</exclude>
+                <exclude>checkstyle:/src/main/resources/.*</exclude>
+                <exclude>checkstyle:/src/it/.*</exclude>
+                <exclude>duplicatefinder:.*</exclude>
+                <exclude>dependencies:.*</exclude>
+              </excludes>
+            </configuration>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>check</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
           <plugin>
             <groupId>com.github.volodya-lombrozo</groupId>
             <artifactId>jtcop-maven-plugin</artifactId>
@@ -366,90 +392,22 @@ SOFTWARE.
       </build>
     </profile>
     <profile>
-      <id>quliceJava8</id>
+      <id>quliceJava11</id>
       <activation>
-        <jdk>1.8</jdk>
-        <property>
-          <name>qulice</name>
-        </property>
+        <jdk>[11,)</jdk>
       </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>com.qulice</groupId>
-            <artifactId>qulice-maven-plugin</artifactId>
-            <version>0.22.1</version>
-            <configuration>
-              <license>file:${basedir}/LICENSE.txt</license>
-              <excludes>
-                <exclude>checkstyle:.*/BytecodeInstructionEntry.java</exclude>
-                <exclude>pmd:/src/test/resources/.*</exclude>
-                <exclude>pmd:/src/it/.*</exclude>
-                <exclude>checkstyle:/src/site/.*</exclude>
-                <exclude>checkstyle:/src/test/resources/.*</exclude>
-                <exclude>checkstyle:/src/main/resources/.*</exclude>
-                <exclude>checkstyle:/src/it/.*</exclude>
-                <exclude>duplicatefinder:.*</exclude>
-                <exclude>dependencies:.*</exclude>
-              </excludes>
-            </configuration>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>check</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
+      <properties>
+        <qulice.version>0.23.0</qulice.version>
+      </properties>
     </profile>
     <profile>
-      <id>qulice</id>
+      <id>quliceJava8</id>
       <activation>
-        <jdk>[11,)</jdk>
-        <property>
-          <name>qulice</name>
-        </property>
+        <jdk>1.8</jdk>
       </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>com.qulice</groupId>
-            <artifactId>qulice-maven-plugin</artifactId>
-            <version>0.23.0</version>
-            <configuration>
-              <license>file:${basedir}/LICENSE.txt</license>
-              <excludes>
-                <exclude>checkstyle:.*/BytecodeInstructionEntry.java</exclude>
-                <exclude>pmd:/src/test/resources/.*</exclude>
-                <exclude>pmd:/src/it/.*</exclude>
-                <exclude>checkstyle:/src/site/.*</exclude>
-                <exclude>checkstyle:/src/test/resources/.*</exclude>
-                <exclude>checkstyle:/src/main/resources/.*</exclude>
-                <exclude>checkstyle:/src/it/.*</exclude>
-                <exclude>duplicatefinder:.*</exclude>
-                <!--
-                  @todo #30:30min Enable dependency check.
-                    The qulice library has an issue related to dependency check.
-                    You can find more details here:
-                    - https://github.com/yegor256/qulice/issues/1145
-                    When this issue is fixed, we should enable dependency check.
-                    Don't forget to remove the exclude below and this puzzle.
-                -->
-                <exclude>dependencies:.*</exclude>
-              </excludes>
-            </configuration>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>check</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
+      <properties>
+        <qulice.version>0.22.1</qulice.version>
+      </properties>
     </profile>
     <profile>
       <id>long</id>