Skip to content
This repository has been archived by the owner on Feb 18, 2024. It is now read-only.

Commit

Permalink
Merge pull request #291 from sofastack/adjust-version
Browse files Browse the repository at this point in the history
Adjust version
  • Loading branch information
lvjing2 committed Nov 16, 2023
2 parents 1fd9d3a + aa68611 commit 0f483a4
Show file tree
Hide file tree
Showing 16 changed files with 316 additions and 46 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/serverless_runtime_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,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
run: mvn --batch-mode deploy -DskipTests -Prelease,8-release
working-directory: sofa-serverless-runtime
env:
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
Expand All @@ -63,9 +63,9 @@ 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
run: mvn --batch-mode deploy -DskipTests -Prelease,17-release
working-directory: sofa-serverless-runtime
env:
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
6 changes: 3 additions & 3 deletions .github/workflows/serverless_runtime_snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,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 -Psnapshot
run: mvn --batch-mode deploy -DskipTests -Psnapshot,8-snapshot
working-directory: sofa-serverless-runtime
env:
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
Expand All @@ -48,9 +48,9 @@ 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 -Psnapshot
run: mvn --batch-mode deploy -DskipTests -Psnapshot,17-snapshot
working-directory: sofa-serverless-runtime
env:
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
2 changes: 1 addition & 1 deletion samples/springboot3-samples/db/mybatis/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ base 为普通 springboot 改造成的基座,改造内容为在 pom 里增加
<groupId>com.alipay.sofa.serverless</groupId>
<artifactId>sofa-serverless-base-starter</artifactId>
<!-- 以上版本支持springboot3 -->
<version>0.5.2-jdk17-SNAPSHOT</version>
<version>0.5.3-jdk17</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion samples/springboot3-samples/db/mybatis/base/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<groupId>com.alipay.sofa.serverless</groupId>
<artifactId>sofa-serverless-base-starter</artifactId>
<!-- 以上版本支持springboot3 -->
<version>0.5.2-jdk17-SNAPSHOT</version>
<version>0.5.3-jdk17</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion samples/springboot3-samples/logging/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ base 为普通 springboot 改造成的基座,改造内容为在 pom 里增加
<groupId>com.alipay.sofa.serverless</groupId>
<artifactId>sofa-serverless-base-starter</artifactId>
<!-- 以上版本支持springboot3 -->
<version>0.5.2-jdk17-SNAPSHOT</version>
<version>0.5.3-jdk17</version>
</dependency>
<!-- end 动态模块相关依赖 -->

Expand Down
2 changes: 1 addition & 1 deletion samples/springboot3-samples/logging/log4j2/base/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<groupId>com.alipay.sofa.serverless</groupId>
<artifactId>sofa-serverless-base-starter</artifactId>
<!-- 以上版本支持springboot3 -->
<version>0.5.2-jdk17-SNAPSHOT</version>
<version>0.5.3-jdk17</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion samples/springboot3-samples/msg/kafka/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ base 为普通 springboot 改造成的基座,改造内容为在 pom 里增加
<groupId>com.alipay.sofa.serverless</groupId>
<artifactId>sofa-serverless-base-starter</artifactId>
<!-- 以上版本支持springboot3 -->
<version>0.5.2-jdk17-SNAPSHOT</version>
<version>0.5.3-jdk17</version>
</dependency>
<!-- end 动态模块相关依赖 -->

Expand Down
2 changes: 1 addition & 1 deletion samples/springboot3-samples/msg/kafka/base/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<groupId>com.alipay.sofa.serverless</groupId>
<artifactId>sofa-serverless-base-starter</artifactId>
<!-- 以上版本支持springboot3 -->
<version>0.5.2-jdk17-SNAPSHOT</version>
<version>0.5.3-jdk17</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion samples/springboot3-samples/web/tomcat/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ base 为普通 springboot 改造成的基座,改造内容为在 pom 里增加
<groupId>com.alipay.sofa.serverless</groupId>
<artifactId>sofa-serverless-base-starter</artifactId>
<!-- 以上版本支持springboot3 -->
<version>0.5.2-jdk17-SNAPSHOT</version>
<version>0.5.3-jdk17</version>
</dependency>
<!-- end 动态模块相关依赖 -->

Expand Down
2 changes: 1 addition & 1 deletion samples/springboot3-samples/web/tomcat/base/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<groupId>com.alipay.sofa.serverless</groupId>
<artifactId>sofa-serverless-base-starter</artifactId>
<!-- 以上版本支持springboot3 -->
<version>0.5.2-jdk17-SNAPSHOT</version>
<version>0.5.3-jdk17</version>
</dependency>
<!-- end 动态模块相关依赖 -->

Expand Down
130 changes: 103 additions & 27 deletions sofa-serverless-runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,10 @@
<properties>
<!-- JDK 17 打包如下:
1. 切换到JDK 17
2. 修改 sofa.ark.version.default, sofa.ark.version.base 和 revision.default 中的 "数字" 版本号
例如: sofa.ark.version.default 如果是2.2.5-SNAPSHOT,那么sofa.ark.version.base 的取值需要修改成2.2.5
例如: sofa.ark.version.default 如果是2.2.5,那么sofa.ark.version.base 的取值也修改成2.2.5
2. 修改 sofa.ark.version.base 和 revision.default 中的 "数字" 版本号
3. 开始打包,将所有打出的包都上传-->
<sofa.ark.version.base>2.2.4</sofa.ark.version.base>
<sofa.ark.version.default>2.2.4-SNAPSHOT</sofa.ark.version.default>
<revision.default>0.5.3-SNAPSHOT</revision.default>
<revision.default>0.5.3</revision.default>
<project.encoding>UTF-8</project.encoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
Expand All @@ -35,7 +32,7 @@
<flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version>
<oshi.version>6.4.5</oshi.version>
<commons.lang3.version>3.12.0</commons.lang3.version>
<guice.version>4.0</guice.version>
<guice.version>5.1.0</guice.version>
<netty.version>4.1.42.Final</netty.version>
<logback.version>1.2.9</logback.version>
<lombok.version>1.18.22</lombok.version>
Expand Down Expand Up @@ -156,9 +153,24 @@
</dependency>
<dependency>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-ark-springboot-starter</artifactId>
<artifactId>sofa-ark-support-starter</artifactId>
<version>${sofa.ark.version}</version>
</dependency>
<dependency>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-ark-compatible-springboot1</artifactId>
<version>${sofa.ark.version}</version>
</dependency>
<dependency>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-ark-compatible-springboot2</artifactId>
<version>${sofa.ark.version}</version>
</dependency>
<dependency>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-ark-springboot-starter</artifactId>
<version>${sofa.ark.starter.version}</version>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down Expand Up @@ -200,7 +212,7 @@
<dependency>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-multibindings</artifactId>
<version>${guice.version}</version>
<version>4.2.3</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -480,25 +492,71 @@


<profiles>
<!--
jdk17 打出来的 snapshot 版本
举例:
打出来的包为 0.5.2-jdk17-SNAPSHOT
使用sofa-ark的包 2.2.4-jdk17
使用sofa-ark starter 的包 2.2.4-jdk17-jakarta
-->
<profile>
<id>jakarta-snapshot</id>
<id>17-snapshot</id>
<properties>
<revision>${revision.default}-jdk17-SNAPSHOT</revision>
<sofa.ark.version>${sofa.ark.version.base}-jdk17-SNAPSHOT</sofa.ark.version>
<sofa.ark.starter.version>${sofa.ark.version.base}-jdk17-jakarta-SNAPSHOT</sofa.ark.starter.version>
<sofa.ark.version>${sofa.ark.version.base}-jdk17</sofa.ark.version>
<sofa.ark.starter.version>${sofa.ark.version.base}-jdk17-jakarta</sofa.ark.starter.version>
</properties>
</profile>
<!--
jdk17 打出来的 release 版本
举例:
打出来的包为 0.5.2-jdk17
使用sofa-ark的包 2.2.4-jdk17
使用sofa-ark starter 的包 2.2.4-jdk17-jakarta
-->
<profile>
<id>17-release</id>
<properties>
<revision>${revision.default}-jdk17</revision>
<sofa.ark.version>${sofa.ark.version.base}-jdk17</sofa.ark.version>
<sofa.ark.starter.version>${sofa.ark.version.base}-jdk17-jakarta</sofa.ark.starter.version>
</properties>
<activation>
<jdk>17</jdk>
</activation>
</profile>

<!--
jdk8 打出来的 snapshot 版本
举例:
打出来的包为 0.5.2-SNAPSHOT
使用sofa-ark的包 2.2.4
使用sofa-ark starter 的包 2.2.4
-->
<profile>
<id>release</id>
<id>8-snapshot</id>
<properties>
<revision>${revision.default}-SNAPSHOT</revision>
<sofa.ark.version>${sofa.ark.version.base}</sofa.ark.version>
<sofa.ark.starter.version>${sofa.ark.version.base}</sofa.ark.starter.version>
</properties>
</profile>

<!--
jdk8 打出来的 release 版本
举例:
打出来的包为 0.5.2
使用sofa-ark的包 2.2.4
使用sofa-ark starter 的包 2.2.4
-->
<profile>
<id>8-release</id>
<properties>
<revision>${revision.default}</revision>
<sofa.ark.version>${sofa.ark.version.default}</sofa.ark.version>
<sofa.ark.starter.version>${sofa.ark.version.default}</sofa.ark.starter.version>
<sofa.ark.version>${sofa.ark.version.base}</sofa.ark.version>
<sofa.ark.starter.version>${sofa.ark.version.base}</sofa.ark.starter.version>
</properties>
</profile>

<profile>
<id>release</id>
<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -560,15 +618,19 @@
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>
<pluginRepositories>
<pluginRepository>
<snapshots>
<enabled>true</enabled>
</snapshots>
<id>maven-snapshot</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</pluginRepository>
</pluginRepositories>
</profile>

<profile>
<id>snapshot</id>
<properties>
<revision>${revision.default}</revision>
<sofa.ark.version>${sofa.ark.version.default}</sofa.ark.version>
<sofa.ark.starter.version>${sofa.ark.version.default}</sofa.ark.starter.version>
</properties>
<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -609,11 +671,25 @@
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
</distributionManagement>
<repositories>
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
<id>maven-snapshot</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</repository>
</distributionManagement>
</repositories>
<pluginRepositories>
<pluginRepository>
<snapshots>
<enabled>true</enabled>
</snapshots>
<id>maven-snapshot</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</pluginRepository>
</pluginRepositories>
</profile>

<profile>
Expand All @@ -623,8 +699,8 @@
</activation>
<properties>
<revision>${revision.default}</revision>
<sofa.ark.version>${sofa.ark.version.default}</sofa.ark.version>
<sofa.ark.starter.version>${sofa.ark.version.default}</sofa.ark.starter.version>
<sofa.ark.version>${sofa.ark.version.base}</sofa.ark.version>
<sofa.ark.starter.version>${sofa.ark.version.base}</sofa.ark.starter.version>
</properties>
<repositories>
<repository>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
<dependency>
<groupId>com.alipay.sofa</groupId>
<artifactId>sofa-ark-springboot-starter</artifactId>
<version>${sofa.ark.starter.version}</version>
</dependency>
<!-- sofa-ark end -->

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.alipay.sofa.serverless.common.util;

/**
* <em>Consider this class private.</em> Utility class for ClassLoaders.
*
* @see ClassLoader
* @see RuntimePermission
* @see Thread#getContextClassLoader()
* @see ClassLoader#getSystemClassLoader()
*/
public final class LoaderUtil {
private LoaderUtil() {
}

/**
* Gets the current Thread ClassLoader. Returns the system ClassLoader if the TCCL is {@code null}. If the system
* ClassLoader is {@code null} as well, then the ClassLoader for this class is returned. If running with a
* {@link SecurityManager} that does not allow access to the Thread ClassLoader or system ClassLoader, then the
* ClassLoader for this class is returned.
*
* @return the current ThreadContextClassLoader.
*/
public static ClassLoader getThreadContextClassLoader() {
final ClassLoader cl = Thread.currentThread().getContextClassLoader();
if (cl != null) {
return cl;
}
final ClassLoader ccl = LoaderUtil.class.getClassLoader();
return ccl == null ? ClassLoader.getSystemClassLoader() : ccl;
}

/**
* @param className The class name.
* @return the Class for the given name.
* @throws ClassNotFoundException if the specified class name could not be found
* @since 2.1
*/
public static Class<?> loadClass(final String className) throws ClassNotFoundException {
try {
return getThreadContextClassLoader().loadClass(className);
} catch (final Throwable ignored) {
return Class.forName(className);
}
}

}
Loading

0 comments on commit 0f483a4

Please sign in to comment.