do not use parent pom (#125)

* do not use parent pom * update github actions * add plugin versions * remove modernizer plugin
artipie · Dec 15, 2023 · 6e8a2a6 · 6e8a2a6
1 parent dbbfdb5
commit 6e8a2a6
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 48 deletions.
diff --git a/.github/workflows/ci-checks.yml b/.github/workflows/ci-checks.yml
@@ -17,12 +17,12 @@ jobs:
       - uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
-          java-version: '17'
+          java-version: '21'
       - uses: actions/cache@v2
         with:
           path: ~/.m2/repository
-          key: ${{ runner.os }}-jdk-17-maven-${{ hashFiles('**/pom.xml') }}
+          key: ${{ runner.os }}-jdk-21-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
-            ${{ runner.os }}-jdk-17-maven-
+            ${{ runner.os }}-jdk-21-maven-
       - name: Build with Maven
         run: mvn -B verify -Pqulice
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v2
         with:
-          java-version: 17
+          java-version: 21
           distribution: adopt
       - run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
       - name: Login to Docker Hub

diff --git a/pom.xml b/pom.xml
@@ -5,11 +5,7 @@ https://github.com/artipie/front/LICENSE.txt
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.artipie</groupId>
-    <artifactId>ppom</artifactId>
-    <version>1.1.0</version>
-  </parent>
+  <groupId>com.artipie</groupId>
   <artifactId>front</artifactId>
   <version>1.0-SNAPSHOT</version>
   <packaging>jar</packaging>
@@ -60,10 +56,23 @@ https://github.com/artipie/front/LICENSE.txt
   </distributionManagement>
   <properties>
     <qulice.license>${project.basedir}/LICENSE.header</qulice.license>
-    <maven.compiler.source>17</maven.compiler.source>
-    <maven.compiler.target>17</maven.compiler.target>
+    <maven.compiler.source>21</maven.compiler.source>
+    <maven.compiler.target>21</maven.compiler.target>
     <docker.image.name>artipie/front</docker.image.name>
+    <javax.json.version>1.1.4</javax.json.version>
+    <junit-platform.version>5.10.0</junit-platform.version>
   </properties>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.junit</groupId>
+        <artifactId>junit-bom</artifactId>
+        <version>${junit-platform.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
   <dependencies>
     <dependency>
       <groupId>com.sparkjava</groupId>
@@ -88,14 +97,17 @@ https://github.com/artipie/front/LICENSE.txt
     <dependency>
       <groupId>javax.json</groupId>
       <artifactId>javax.json-api</artifactId>
+      <version>${javax.json.version}</version>
     </dependency>
     <dependency>
       <groupId>org.glassfish</groupId>
       <artifactId>javax.json</artifactId>
+      <version>${javax.json.version}</version>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
+      <version>32.1.3-jre</version>
     </dependency>
     <dependency>
       <groupId>com.amihaiemil.web</groupId>
@@ -105,47 +117,32 @@ https://github.com/artipie/front/LICENSE.txt
     <dependency>
       <groupId>com.artipie</groupId>
       <artifactId>asto-core</artifactId>
-      <version>v1.13.0</version>
+      <version>v1.16.0</version>
     </dependency>
     <dependency>
         <groupId>com.sparkjava</groupId>
         <artifactId>spark-core</artifactId>
-        <version>2.9.3</version>
+        <version>2.9.4</version>
     </dependency>
     <dependency>
       <groupId>com.jcabi</groupId>
       <artifactId>jcabi-log</artifactId>
       <version>0.20.1</version>
     </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>2.0.0-alpha5</version>
-    </dependency>
     <dependency>
       <groupId>io.github.resilience4j</groupId>
       <artifactId>resilience4j-retry</artifactId>
       <version>1.7.1</version>
     </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <scope>runtime</scope>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.8.0-alpha2</version>
+      <version>2.0.9</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-simple</artifactId>
-      <version>1.8.0-alpha2</version>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>runtime</scope>
+      <artifactId>slf4j-reload4j</artifactId>
+      <version>2.0.9</version>
     </dependency>
     <dependency>
       <groupId>commons-cli</groupId>
@@ -242,7 +239,11 @@ https://github.com/artipie/front/LICENSE.txt
         <artifactId>qulice-maven-plugin</artifactId>
         <version>0.19.0</version>
         <configuration>
+          <license>file:${qulice.license}</license>
           <excludes combine.children="append">
+            <exclude>findbugs:.*</exclude>
+            <exclude>duplicatefinder:.*</exclude>
+            <exclude>dependencies:.*</exclude>
             <exclude>checkstyle:.*/src/test/resources/.*</exclude>
             <exclude>pmd:.*/src/test/resources/.*</exclude>
             <exclude>checkstyle:.*/src/main/resources/public/.*</exclude>
@@ -274,6 +275,7 @@ https://github.com/artipie/front/LICENSE.txt
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-jar-plugin</artifactId>
+            <version>3.3.0</version>
             <configuration>
               <archive>
                 <manifest>
@@ -285,6 +287,7 @@ https://github.com/artipie/front/LICENSE.txt
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-dependency-plugin</artifactId>
+            <version>3.6.1</version>
             <executions>
               <execution>
                 <id>copy-dependencies</id>
@@ -322,28 +325,13 @@ https://github.com/artipie/front/LICENSE.txt
             </configuration>
           </plugin>
           <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-deploy-plugin</artifactId>
+            <version>3.1.1</version>
             <configuration>
               <skip>true</skip>
             </configuration>
           </plugin>
-          <plugin>
-            <groupId>org.gaul</groupId>
-            <artifactId>modernizer-maven-plugin</artifactId>
-            <version>2.3.0</version>
-            <executions>
-              <execution>
-                <id>modernizer</id>
-                <phase>verify</phase>
-                <goals>
-                  <goal>modernizer</goal>
-                </goals>
-              </execution>
-            </executions>
-            <configuration>
-              <javaVersion>${maven.compiler.source}</javaVersion>
-            </configuration>
-          </plugin>
         </plugins>
       </build>
     </profile>