Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sync master and 2201.7.x #4570

Merged
merged 15 commits into from
Jun 19, 2023
Merged

Sync master and 2201.7.x #4570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
b6e83e4
Remove fixed ignore entries
keizer619 Jun 13, 2023
a686f14
Update yaml and toml timestamp versions
MadhukaHarith92 Jun 13, 2023
d29efd6
Merge pull request #4557 from keizer619/master
keizer619 Jun 13, 2023
f600ff7
Merge pull request #4558 from MadhukaHarith92/master
keizer619 Jun 14, 2023
cdc4e74
Fix trust manager
keizer619 Jun 14, 2023
84b8460
Include https url
keizer619 Jun 14, 2023
95c47fe
Merge pull request #4559 from keizer619/master
keizer619 Jun 15, 2023
1a3b2cf
[Automated] Update ballerina lang to 2201.7.0-20230616-003600-7453c9d7
Jun 15, 2023
38408dd
Merge pull request #4567 from ballerina-platform/master_temp
ballerina-bot Jun 15, 2023
26a075c
[Automated] Update ballerina lang to 2201.7.0-20230617-002400-a3db2e99
Jun 16, 2023
c679c44
Merge pull request #4571 from ballerina-platform/master_temp
ballerina-bot Jun 16, 2023
0dc29f4
[Automated] Update ballerina lang to 2201.7.0-20230618-000200-a3db2e99
Jun 17, 2023
5ea950d
Merge pull request #4572 from ballerina-platform/master_temp
ballerina-bot Jun 17, 2023
838d850
[Automated] Update ballerina lang to 2201.7.0-20230619-002200-a3db2e99
Jun 18, 2023
1416eb9
Merge pull request #4573 from ballerina-platform/master_temp
ballerina-bot Jun 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions .trivyignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
CVE-2020-7768
CVE-2021-3737
CVE-2021-3997
CVE-2022-42003
CVE-2022-40151
CVE-2022-40152
CVE-2022-40153
CVE-2022-40154
CVE-2022-40155
CVE-2022-40156
CVE-2022-41854
CVE-2022-1471
22 changes: 1 addition & 21 deletions ballerina-test-automation/test-automation/src/main/java/io/ballerina/test/Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,34 +39,14 @@ public class Utils {
System.getenv("BALLERINA_STAGING_UPDATE"));
public static final PrintStream OUT = System.out;

private static TrustManager[] trustAllCerts = new TrustManager[]{
new X509TrustManager() {
public java.security.cert.X509Certificate[] getAcceptedIssuers() {
return null;
}

public void checkClientTrusted(java.security.cert.X509Certificate[] certs, String authType) {
//No need to implement.
}

public void checkServerTrusted(java.security.cert.X509Certificate[] certs, String authType) {
//No need to implement.
}
}
};

public static final String DISTRIBUTION_LOCATION = "http://dist-dev.ballerina.io/downloads/";
public static final String DISTRIBUTION_LOCATION = "https://dist-dev.ballerina.io/downloads/";

public static void downloadFile(String version, String installerName) {
OUT.println("Downloading " + installerName);
try {
String destination = getUserHome();
File output = new File(destination + File.separator + installerName);
if (!output.exists()) {
SSLContext sc = SSLContext.getInstance("SSL");
sc.init(null, trustAllCerts, new java.security.SecureRandom());
HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());

HttpURLConnection conn = (HttpURLConnection) new URL(
DISTRIBUTION_LOCATION + version + "/" + installerName).openConnection();
conn.setRequestProperty("content-type", "binary/data");
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ group=org.ballerinalang
# During the release workflow, the following will get bumped automatically
version=2201.7.0-SNAPSHOT
codeName=swan-lake
ballerinaLangVersion=2201.6.0-20230612-002700-7861756b
ballerinaLangVersion=2201.7.0-20230619-002200-a3db2e99
ballerinaJreVersion=1.1.0
dependencyJREVersion=jdk-11.0.18+10-jre
specVersion=2022R4
Expand Down Expand Up @@ -46,8 +46,8 @@ stdlibAuthVersion=2.8.0
stdlibEmailVersion=2.7.1
stdlibJwtVersion=2.8.0
stdlibOAuth2Version=2.8.0
stdlibYamlVersion=0.3.0
stdlibTomlVersion=0.3.0
stdlibYamlVersion=0.3.1-20230612-141800-3f686c6
stdlibTomlVersion=0.3.1-20230609-180200-0462a55
stdlibEdiVersion=1.0.1

# Stdlib Level 05
Expand Down
Loading