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 Java 17 migration branch with main #85

Merged
merged 35 commits into from
Jul 31, 2023
Merged

Sync Java 17 migration branch with main #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
077c3cf
Migrate to Java 17
gabilang Jun 26, 2023
5ababcb
Merge pull request #67 from gabilang/java_17_migration
warunalakshitha Jun 26, 2023
6b396b2
Fix spotbugs issues
warunalakshitha Jun 26, 2023
0f76a06
Bump workflow actions versions
warunalakshitha Jun 26, 2023
800d7cf
Merge pull request #68 from warunalakshitha/java17-migration
warunalakshitha Jun 26, 2023
1d08c8f
Add required dependencies for integration tests
gabilang Jul 4, 2023
891d4a2
Merge pull request #74 from gabilang/add-dependencies
warunalakshitha Jul 5, 2023
a1cc067
Fix sealed class access for Java 17
gabilang Jul 5, 2023
a843866
Merge pull request #75 from gabilang/fix-sealed-class-error
warunalakshitha Jul 5, 2023
77d395f
Fix missing issue with sealed class conversion
gabilang Jul 5, 2023
0b5e413
Merge pull request #76 from gabilang/fix-missing-sealed-class
warunalakshitha Jul 5, 2023
e064ce0
[Automated] Update the native jar versions
gabilang Jul 5, 2023
8730ebb
Disable test cases temporarily
gabilang Jul 6, 2023
f0eea5a
Revert the automated commit
gabilang Jul 6, 2023
d5d96c4
Merge pull request #77 from gabilang/disable-tests
warunalakshitha Jul 6, 2023
9516ca3
Fix observe tests
warunalakshitha Jul 6, 2023
92c92df
Fix API change
warunalakshitha Jul 6, 2023
64b95b4
Fix integration test
warunalakshitha Jul 6, 2023
af78dc0
Revert API change
warunalakshitha Jul 6, 2023
d3b9d4a
Fix tests
warunalakshitha Jul 8, 2023
56b3c4b
Fix metrics tests
warunalakshitha Jul 8, 2023
4f75d0f
[Automated] Update the native jar versions
gabilang Jul 8, 2023
cd61e52
Merge branch 'java_17_migration'
gabilang Jul 8, 2023
4734b23
[Automated] Update the native jar versions
gabilang Jul 9, 2023
c33dbfb
Disable failing integration test cases temporarily
gabilang Jul 9, 2023
72c9403
Revert dependencies.toml changes
gabilang Jul 9, 2023
fd24903
Merge pull request #82 from gabilang/fix-intg-tests-java17
gabilang Jul 9, 2023
38df92c
Fix oracle jdk download link
gabilang Jul 14, 2023
1e573c0
Downgrade gradle version
gabilang Jul 14, 2023
b24d9bb
Merge pull request #83 from gabilang/fix-jdk-download-link
gabilang Jul 16, 2023
f3023d3
Merge branch 'main' into java_17_migration
gabilang Jul 26, 2023
5096f0e
Add git attributes file
gabilang Jul 26, 2023
5346f61
Update lang version
gabilang Jul 26, 2023
730414a
Update lang version
warunalakshitha Jul 26, 2023
43ff584
Migrate to Gradle 8.2.1
warunalakshitha Jul 28, 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
2 changes: 2 additions & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Ensure all Java files use LF.
*.java eol=lf
8 changes: 4 additions & 4 deletions .github/workflows/build-timestamped-master.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ jobs:
if: github.repository_owner == 'ballerina-platform'
steps:
- name: Checkout Repository
uses: actions/checkout@v2
- name: Set up JDK 11
uses: actions/setup-java@v2
uses: actions/checkout@v3
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'adopt'
java-version: 11
java-version: 17
- name: Change to Timestamped Version
run: |
startTime=$(TZ="Asia/Kolkata" date +'%Y%m%d-%H%M00')
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/publish-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ jobs:

steps:
- name: Checkout Repository
uses: actions/checkout@v2
- name: Set up JDK 11
uses: actions/setup-java@v2
uses: actions/checkout@v3
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'adopt'
java-version: 11
java-version: 17
- name: Build with Gradle
env:
packageUser: ${{ github.actor }}
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/pull-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v2
- name: Set up JDK 11
uses: actions/setup-java@v2
uses: actions/checkout@v3
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'adopt'
java-version: 11
java-version: 17
- name: Build with Gradle
env:
packageUser: ${{ github.actor }}
Expand All @@ -28,12 +28,12 @@ jobs:
runs-on: windows-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v2
- name: Set up JDK 11
uses: actions/setup-java@v2
uses: actions/checkout@v3
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'adopt'
java-version: 11
java-version: 17
- name: Build with Gradle
env:
packageUser: ${{ github.actor }}
Expand All @@ -48,12 +48,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v2
- name: Set up JDK 11
uses: actions/setup-java@v2
uses: actions/checkout@v3
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'adopt'
java-version: 11
java-version: 17
- name: Build with Gradle
env:
packageUser: ${{ github.actor }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/trivy-scan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ jobs:
name: Build on Ubuntu
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
uses: actions/setup-java@v2
- uses: actions/checkout@v3
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'adopt'
java-version: 11
java-version: 17
- name: Build with Gradle
env:
packageUser: ${{ github.actor }}
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ This module contains internal configurations and initializations for Ballerina o

### Set Up the prerequisites

1. Download and install Java SE Development Kit (JDK) version 11 (from one of the following locations).
1. Download and install Java SE Development Kit (JDK) version 17 (from one of the following locations).

* [Oracle](https://www.oracle.com/java/technologies/javase-jdk11-downloads.html)
* [Oracle](https://www.oracle.com/java/technologies/downloads/)

* [OpenJDK](https://adoptopenjdk.net/)

Expand Down
4 changes: 2 additions & 2 deletions ballerina/Ballerina.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ name = "observe"
version = "1.1.0"
distribution = "2201.7.0"

[platform.java11]
[platform.java17]
graalvmCompatible = true

[[platform.java11.dependency]]
[[platform.java17.dependency]]
path = "../native/build/libs/observe-internal-native-1.1.0.jar"
1 change: 1 addition & 0 deletions ballerina/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,3 +115,4 @@ test.dependsOn ":observe-internal-native:build"

publishToMavenLocal.dependsOn build
publish.dependsOn build
build.dependsOn(':observe-ballerina:generatePomFileForMavenPublication')
4 changes: 2 additions & 2 deletions build-config/checkstyle/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ apply plugin: 'java'

task downloadCheckstyleRuleFiles(type: Download) {
src([
'https://raw.githubusercontent.com/wso2/code-quality-tools/v1.3/checkstyle/checkstyle.xml',
'https://raw.githubusercontent.com/wso2/code-quality-tools/v1.3/checkstyle/suppressions.xml'
'https://raw.githubusercontent.com/wso2/code-quality-tools/v1.4/checkstyle/jdk-17/checkstyle.xml',
'https://raw.githubusercontent.com/wso2/code-quality-tools/v1.4/checkstyle/jdk-17/suppressions.xml'
])
overwrite false
onlyIfNewer true
Expand Down
4 changes: 2 additions & 2 deletions build-config/resources/Ballerina.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ name = "observe"
version = "@toml.version@"
distribution = "2201.7.0"

[platform.java11]
[platform.java17]
graalvmCompatible = true

[[platform.java11.dependency]]
[[platform.java17.dependency]]
path = "../native/build/libs/observe-internal-native-@project.version@.jar"
2 changes: 1 addition & 1 deletion build-config/resources/testobserve/Ballerina.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ org = "ballerina"
name = "testobserve"
version = "0.0.0"

[[platform.java11.dependency]]
[[platform.java17.dependency]]
path = "../native/build/libs/testobserve-native-@project.version@-all.jar"
6 changes: 3 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
*/

plugins {
id "com.github.spotbugs" version "4.2.3"
id "com.github.johnrengelman.shadow" version "5.2.0"
id "de.undercouch.download" version "4.0.4"
id "com.github.spotbugs" version "5.0.14"
id "com.github.johnrengelman.shadow" version "7.1.2"
id "de.undercouch.download" version "5.4.0"
id "net.researchgate.release" version "2.8.0"
}

Expand Down
10 changes: 5 additions & 5 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@ org.gradle.caching=true
group=io.ballerina
version=1.1.0

ballerinaLangVersion= 2201.7.0
ballerinaLangVersion=2201.8.0-20230726-145300-b2bdf796
ballerinaTomlParserVersion=1.2.2
ballerinaGradlePluginVersion=0.14.2
puppycrawlCheckstyleVersion=8.18
ballerinaGradlePluginVersion=2.0.1-SNAPSHOT
puppycrawlCheckstyleVersion=10.12.0
openTelemetryVersion=1.7.0
nettyCodecVersion=4.1.77.Final
gsonVersion=2.8.8
gsonVersion=2.10.1

observeVersion=1.1.0

# Test Dependency Versions
testngVersion=7.4.0
testngVersion=7.6.1
slf4jVersion=1.7.26
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading
Loading