remove jdk17 (#782)

* remove jdk17 * pom --------- Co-authored-by: chaya.cy <[email protected]>
sofastack · Nov 16, 2023 · 7c4361d · 7c4361d
1 parent dc821eb
commit 7c4361d
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 178 deletions.
diff --git a/.github/workflows/linux_unit_test.yml b/.github/workflows/linux_unit_test.yml
@@ -27,23 +27,4 @@ jobs:
         && sh ./check_format.sh
         && mvn test
     - name: Codecov
-      uses: codecov/[email protected]
-
-  unit_test_for_jdk17:
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 17
-        uses: actions/setup-java@v1
-        with:
-          java-version: '17'
-          distribution: 'adopt-hotspot'
-          cache: 'maven'
-      - name: Test with Maven
-        run: mvn clean install -DskipTests -Dmaven.javadoc.skip=true -B -U
-          && sh ./check_format.sh
-          && mvn test
-      - name: Codecov
-        uses: codecov/[email protected]
+      uses: codecov/[email protected]
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -39,29 +39,7 @@ jobs:
           gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
           gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
       - name: Build with Maven
-        run: mvn --batch-mode deploy -DskipTests -Prelease,8-release
-        env:
-          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
-          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-          MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
-  release_for_jdk17:
-    #    needs: build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-          cache: maven
-          server-id: ossrh
-          server-username: MAVEN_USERNAME
-          server-password: MAVEN_PASSWORD
-          gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
-          gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
-      - name: Build with Maven
-        run: mvn --batch-mode deploy -DskipTests -Prelease,17-release
+        run: mvn --batch-mode deploy -DskipTests -Prelease
         env:
           MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}

diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
@@ -39,30 +39,7 @@ jobs:
           gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
           gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
       - name: Build with Maven
-        run: mvn --batch-mode deploy -DskipTests -Pdefault,snapshot,8-snapshot
-        env:
-          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
-          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-          MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
-
-  snapshot_for_jdk17:
-    #    needs: build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-          cache: maven
-          server-id: ossrh
-          server-username: MAVEN_USERNAME
-          server-password: MAVEN_PASSWORD
-          gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
-          gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
-      - name: Build with Maven
-        run: mvn --batch-mode deploy -DskipTests -Psnapshot,17-snapshot
+        run: mvn --batch-mode deploy -DskipTests -Pdefault,snapshot
         env:
           MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}

diff --git a/.github/workflows/windows_unit_test.yml b/.github/workflows/windows_unit_test.yml
@@ -32,23 +32,4 @@ jobs:
         && sh ./check_format.sh
         && mvn test
     - name: Codecov
-      uses: codecov/[email protected]
-
-  unit_test_for_jdk17:
-    runs-on: windows-latest
-    strategy:
-      fail-fast: true
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
-        with:
-          java-version: '17'
-          distribution: 'adopt-hotspot'
-          cache: maven
-      - name: Build with Maven
-        run: mvn clean install --% -DskipTests -Dmaven.javadoc.skip=true -B -U
-          && sh ./check_format.sh
-          && mvn test
-      - name: Codecov
-        uses: codecov/[email protected]
+      uses: codecov/[email protected]
diff --git a/conf/javax.json b/conf/javax.json
diff --git a/pom.xml b/pom.xml
@@ -15,11 +15,7 @@
     </modules>
 
     <properties>
-        <!--    JDK 17   打包如下：
-        1. 切换到JDK 17
-        2. 修改 sofa.ark.version.default 和 conf/javax.json 中的 targetVersion 版本号 (conf/javax.json)
-        3. 开始打包，将所有打出的包都上传，其中包含了 -jakarta 后缀的包-->
-        <sofa.ark.version.default>2.2.4</sofa.ark.version.default>
+        <sofa.ark.version>2.2.4</sofa.ark.version>
         <project.encoding>UTF-8</project.encoding>
         <java.version>1.8</java.version>
         <license.maven.plugin>3.0</license.maven.plugin>
@@ -214,79 +210,11 @@
                     </execution>
                 </executions>
             </plugin>
-
-<!--        将依赖的 javax -> jakarta 工具插件
-            构建完毕以后，target 下会有对应的 jakarta 包, 打包的信息都配置在 根目录/conf/javax.json 中
-            https://github.com/sofastack/sofa-jakarta-transformer
-            目前此jar包尚未上传到外部仓库，打包构建时需将如下插件的注释释放
--->
-            <plugin>
-                <groupId>com.alipay.sofa</groupId>
-                <artifactId>jakarta-transformer-maven-plugin</artifactId>
-                <version>0.6.0-sofa-SNAPSHOT</version>
-                <configuration>
-                    <rules>
-                        <pom>conf/javax.json</pom>
-                    </rules>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>jakarta-test</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>jakarta</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 
 
     <profiles>
-<!--
-       jdk17 打出来的 snapshot 版本
-       sofa-ark的包  2.2.4-jdk17-SNAPSHOT
--->
-        <profile>
-            <id>17-snapshot</id>
-            <properties>
-                <sofa.ark.version>${sofa.ark.version.default}-jdk17-SNAPSHOT</sofa.ark.version>
-            </properties>
-        </profile>
-<!--
-       jdk17 打出来的 release 版本
-       sofa-ark的包  2.2.4-jdk17
--->
-        <profile>
-            <id>17-release</id>
-            <properties>
-                <sofa.ark.version>${sofa.ark.version.default}-jdk17</sofa.ark.version>
-            </properties>
-        </profile>
-
-<!--
-        jdk8 打出来的 snapshot 版本
-        sofa-ark 的包  2.2.4-SNAPSHOT
--->
-        <profile>
-            <id>8-snapshot</id>
-            <properties>
-                <sofa.ark.version>${sofa.ark.version.default}-SNAPSHOT</sofa.ark.version>
-            </properties>
-        </profile>
-
-<!--
-        jdk8 打出来的 release 版本
-        sofa-ark的包  2.2.4
--->
-        <profile>
-            <id>8-release</id>
-            <properties>
-                <sofa.ark.version>${sofa.ark.version.default}</sofa.ark.version>
-            </properties>
-        </profile>
-
         <profile>
             <id>release</id>
             <build>
@@ -409,9 +337,6 @@
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
-            <properties>
-                <sofa.ark.version>${sofa.ark.version.default}</sofa.ark.version>
-            </properties>
             <repositories>
                 <repository>
                     <snapshots>