Delete unnecessary profiles (#920)

tesshucom · Mar 31, 2021 · 041676e · 041676e
1 parent c6b5750
commit 041676e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 31 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -57,7 +57,7 @@ $ mvn clean package -Dmaven.test.skip=true -Dpmd.skip=true -Pjetty-embed
 When using the Java 15 compiler and JVM:
 
 ```
-$ mvn clean package -Dmaven.test.skip=true -Dpmd.skip=true -Pjetty-embed -Prelease15
+$ mvn clean package -Dmaven.test.skip=true -Dpmd.skip=true -Pjetty-embed -Dmaven.compiler.release=15
 ```
 
 See [the documentation](https://tesshu.com/update/how-to-compile-jpsonic) for more information.

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -114,7 +114,7 @@ jobs:
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2 
       - name: Verify with Maven
-        run: mvn clean verify -B -Prelease${{ matrix.java }} -Punit-test
+        run: mvn clean verify -B -Dmaven.compiler.release=${{ matrix.java }} -Punit-test
   ##########################################################################
   package:
     if: github.ref == 'refs/heads/master'
@@ -148,7 +148,7 @@ jobs:
           gpg --quiet --import ~/.gnupg/private.key
       - name: Create jetty.war
         run: |
-          mvn clean package -Dmaven.test.skip=true -Dpmd.skip=true -Pjetty-embed -Prelease${{ matrix.java }}
+          mvn clean package -Dmaven.test.skip=true -Dpmd.skip=true -Pjetty-embed -Dmaven.compiler.release${{ matrix.java }}
           gpg2 --clearsign jpsonic-main/target/artifacts-checksums.sha
       - name: Copy README
         # Due to the specifications of actions/upload-artifact@v2.

diff --git a/pom.xml b/pom.xml
@@ -796,34 +796,6 @@
         </plugins>
     </reporting>
     <profiles>
-        <profile>
-            <id>release12</id>
-            <properties>
-                <maven.compiler.release>12</maven.compiler.release>
-                <compile.version>12</compile.version>
-            </properties>
-        </profile>
-        <profile>
-            <id>release13</id>
-            <properties>
-                <maven.compiler.release>13</maven.compiler.release>
-                <compile.version>13</compile.version>
-            </properties>
-        </profile>
-        <profile>
-            <id>release14</id>
-            <properties>
-                <maven.compiler.release>14</maven.compiler.release>
-                <compile.version>14</compile.version>
-            </properties>
-        </profile>
-        <profile>
-            <id>release15</id>
-            <properties>
-                <maven.compiler.release>15</maven.compiler.release>
-                <compile.version>15</compile.version>
-            </properties>
-        </profile>
         <profile>
             <id>unit-test</id>
             <modules>