Skip to content

Commit

Permalink
Merge pull request #1753 from ballerina-platform/update-bc-version-u7
Browse files Browse the repository at this point in the history
[2201.7.x] Update Bouncy Castle version
  • Loading branch information
TharmiganK committed Sep 7, 2023
2 parents e5c4a64 + bcdbb97 commit 8fda7da
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-with-bal-test-graalvm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
if: ${{ github.event_name != 'schedule' || (github.event_name == 'schedule' && github.repository_owner == 'ballerina-platform') }}
uses: ballerina-platform/ballerina-standard-library/.github/workflows/build-with-bal-test-graalvm-template.yml@2201.7.x
with:
lang_tag: ${{ inputs.lang_tag || 2201.7.x }}
lang_tag: ${{ inputs.lang_tag || '2201.7.x' }}
lang_version: ${{ inputs.lang_version }}
native_image_options: '-J-Xmx7G ${{ inputs.native_image_options }}'
additional_ubuntu_build_flags: '-x :http-native:test -x :http-compiler-plugin-tests:test ${{ inputs.build_properties }}'
Expand Down
18 changes: 9 additions & 9 deletions ballerina/Ballerina.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
org = "ballerina"
name = "http"
version = "2.9.2"
version = "2.9.3"
authors = ["Ballerina"]
keywords = ["http", "network", "service", "listener", "client"]
repository = "https://github.com/ballerina-platform/module-ballerina-http"
Expand All @@ -16,8 +16,8 @@ graalvmCompatible = true
[[platform.java11.dependency]]
groupId = "io.ballerina.stdlib"
artifactId = "http-native"
version = "2.9.2"
path = "../native/build/libs/http-native-2.9.2.jar"
version = "2.9.3"
path = "../native/build/libs/http-native-2.9.3-SNAPSHOT.jar"

[[platform.java11.dependency]]
groupId = "io.ballerina.stdlib"
Expand Down Expand Up @@ -99,15 +99,15 @@ path = "./lib/netty-transport-native-unix-common-4.1.94.Final.jar"

[[platform.java11.dependency]]
groupId = "org.bouncycastle"
artifactId = "bcprov-jdk15on"
version = "1.69"
path = "./lib/bcprov-jdk15on-1.69.jar"
artifactId = "bcprov-jdk18on"
version = "1.74"
path = "./lib/bcprov-jdk18on-1.74.jar"

[[platform.java11.dependency]]
groupId = "org.bouncycastle"
artifactId = "bcpkix-jdk15on"
version = "1.69"
path = "./lib/bcpkix-jdk15on-1.69.jar"
artifactId = "bcpkix-jdk18on"
version = "1.74"
path = "./lib/bcpkix-jdk18on-1.74.jar"

[[platform.java11.dependency]]
groupId = "io.netty"
Expand Down
2 changes: 1 addition & 1 deletion ballerina/CompilerPlugin.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ id = "http-compiler-plugin"
class = "io.ballerina.stdlib.http.compiler.HttpCompilerPlugin"

[[dependency]]
path = "../compiler-plugin/build/libs/http-compiler-plugin-2.9.2.jar"
path = "../compiler-plugin/build/libs/http-compiler-plugin-2.9.3-SNAPSHOT.jar"
2 changes: 1 addition & 1 deletion ballerina/Dependencies.toml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ modules = [
[[package]]
org = "ballerina"
name = "http"
version = "2.9.2"
version = "2.9.3"
dependencies = [
{org = "ballerina", name = "auth"},
{org = "ballerina", name = "cache"},
Expand Down
4 changes: 2 additions & 2 deletions ballerina/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,10 @@ dependencies {
externalJars(group: 'commons-pool.wso2', name: 'commons-pool', version: "${wso2CommonsPoolVersion}") {
transitive = false
}
externalJars(group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: "${bouncycastleVersion}") {
externalJars(group: 'org.bouncycastle', name: 'bcprov-jdk18on', version: "${bouncycastleVersion}") {
transitive = false
}
externalJars(group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: "${bouncycastleVersion}") {
externalJars(group: 'org.bouncycastle', name: 'bcpkix-jdk18on', version: "${bouncycastleVersion}") {
transitive = false
}
externalJars(group: 'io.netty', name: 'netty-tcnative-boringssl-static', version: "${nettyTcnativeVersion}") {
Expand Down
8 changes: 4 additions & 4 deletions build-config/resources/Ballerina.toml
Original file line number Diff line number Diff line change
Expand Up @@ -99,15 +99,15 @@ path = "./lib/netty-transport-native-unix-common-@netty.version@.jar"

[[platform.java11.dependency]]
groupId = "org.bouncycastle"
artifactId = "bcprov-jdk15on"
artifactId = "bcprov-jdk18on"
version = "@bouncycastle.version@"
path = "./lib/bcprov-jdk15on-@bouncycastle.version@.jar"
path = "./lib/bcprov-jdk18on-@bouncycastle.version@.jar"

[[platform.java11.dependency]]
groupId = "org.bouncycastle"
artifactId = "bcpkix-jdk15on"
artifactId = "bcpkix-jdk18on"
version = "@bouncycastle.version@"
path = "./lib/bcpkix-jdk15on-@bouncycastle.version@.jar"
path = "./lib/bcpkix-jdk18on-@bouncycastle.version@.jar"

[[platform.java11.dependency]]
groupId = "io.netty"
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ballerinaTomlParserVersion=1.2.2
commonsLang3Version=3.8.1
nettyVersion=4.1.94.Final
nettyTcnativeVersion=2.0.61.Final
bouncycastleVersion=1.69
bouncycastleVersion=1.74
slf4jVersion=1.7.30
jakartaXmlBindVersion=2.3.3
wso2CommonsPoolVersion=1.5.6.wso2v1
Expand Down
4 changes: 2 additions & 2 deletions native/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ dependencies {

implementation group: 'org.wso2.eclipse.osgi', name: 'org.eclipse.osgi', version:"${wso2EclipseOsgiVersion}"
implementation group: 'commons-pool.wso2', name: 'commons-pool', version:"${wso2CommonsPoolVersion}"
implementation group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: "${bouncycastleVersion}"
implementation group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: "${bouncycastleVersion}"
implementation group: 'org.bouncycastle', name: 'bcprov-jdk18on', version: "${bouncycastleVersion}"
implementation group: 'org.bouncycastle', name: 'bcpkix-jdk18on', version: "${bouncycastleVersion}"
implementation group: 'jakarta.xml.bind', name: 'jakarta.xml.bind-api', version: "${jakartaXmlBindVersion}"

testImplementation group: 'org.mock-server', name: 'mockserver-netty', version:"${mockserverNettyVersion}"
Expand Down

0 comments on commit 8fda7da

Please sign in to comment.