Skip to content

Commit

Permalink
Merge pull request openjdk#76 from SAP/pr-12dba597abd009f41e97f47ac41…
Browse files Browse the repository at this point in the history
…97f0c5ee9fc0e-sap

sap: Merge 12dba59
  • Loading branch information
RealCLanger authored Mar 28, 2024
2 parents 4b2c12b + 1c2b75b commit ddac48e
Show file tree
Hide file tree
Showing 152 changed files with 273 additions and 278 deletions.
31 changes: 13 additions & 18 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
commit: ${{ steps.buildcheck.outputs.commit }}
steps:
- name: Checkout JMC
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ github.event.inputs.gitRef }}

Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
echo "agentVersion=$(echo $AGENT_VERSION)" >> $GITHUB_OUTPUT
- name: Download existing release file
uses: robinraju/release-downloader@v1
uses: robinraju/release-downloader@v1.9
continue-on-error: true
with:
tag: ${{ steps.versions.outputs.githubRelease }}
Expand Down Expand Up @@ -133,43 +133,38 @@ jobs:
echo doBuild: ${{ needs.parameters.outputs.doBuild }}
echo commit: ${{ needs.parameters.outputs.commit }}
deleteold:
name: Delete old Release
needs: parameters
if: ${{ needs.parameters.outputs.doBuild == 'true' && needs.parameters.outputs.publish == 'true' && needs.parameters.outputs.release != 'true' }}
build:
name: Build JMC
needs: [parameters]
if: needs.parameters.outputs.doBuild == 'true'
runs-on: ubuntu-latest
env:
MAVEN_OPTS: -Xmx2048m
MAVEN_CALL: mvn --batch-mode --no-transfer-progress
steps:
- name: Delete old GitHub release ${{ needs.parameters.outputs.githubRelease }}
if: ${{ needs.parameters.outputs.publish == 'true' && needs.parameters.outputs.release != 'true' }}
continue-on-error: true
uses: dev-drprasad/[email protected]
with:
tag_name: ${{ needs.parameters.outputs.githubRelease }}
github_token: ${{ secrets.GITHUB_TOKEN }}

build:
name: Build JMC
needs: [parameters, deleteold]
if: needs.parameters.outputs.doBuild == 'true'
runs-on: ubuntu-latest
env:
MAVEN_OPTS: -Xmx2048m
MAVEN_CALL: mvn --batch-mode --no-transfer-progress
steps:
- name: Checkout JMC
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ needs.parameters.outputs.commit }}

- name: Set up build JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: '17'
java-package: jdk
mvn-toolchain-id: 'JavaSE-17'

- name: Cache local Maven repository
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
Expand Down
2 changes: 1 addition & 1 deletion .jcheck/conf
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
[general]
project=jmc
jbs=jmc
version=9.0.0
version=9.1.0

[checks]
error=author,reviewers,merge,message,issues
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ application/org.openjdk.jmc.updatesite.ide/target/
To install it into Eclipe, simply open Eclipse and select Help | Install New Software... In the dialog, click Add... and then click the Archive... button. Select the built update site, e.g.

```bash
application/org.openjdk.jmc.updatesite.ide/target/org.openjdk.jmc.updatesite.ide-9.0.0-SNAPSHOT.zip
application/org.openjdk.jmc.updatesite.ide/target/org.openjdk.jmc.updatesite.ide-9.1.0-SNAPSHOT.zip
```

## Setting up Development Environment
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-Name: Japanese Language Fragment
Bundle-SymbolicName: org.openjdk.jmc.alert.ja
Bundle-Version: 9.0.0.qualifier
Bundle-Version: 9.1.0.qualifier
Bundle-Vendor: Oracle Corporation
Fragment-Host: org.openjdk.jmc.alert;bundle-version="9.0.0"
Fragment-Host: org.openjdk.jmc.alert;bundle-version="9.1.0"
Bundle-Localization: plugin
Automatic-Module-Name: org.openjdk.jmc.alert.ja
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-Name: Simplified Chinese Language Fragment
Bundle-SymbolicName: org.openjdk.jmc.alert.zh_CN
Bundle-Version: 9.0.0.qualifier
Bundle-Version: 9.1.0.qualifier
Bundle-Vendor: Oracle Corporation
Fragment-Host: org.openjdk.jmc.alert;bundle-version="9.0.0"
Fragment-Host: org.openjdk.jmc.alert;bundle-version="9.1.0"
Bundle-Localization: plugin
Automatic-Module-Name: org.openjdk.jmc.alert.zh_CN
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-Name: Japanese Language Fragment
Bundle-SymbolicName: org.openjdk.jmc.browser.attach.ja
Bundle-Version: 9.0.0.qualifier
Bundle-Version: 9.1.0.qualifier
Bundle-Vendor: Oracle Corporation
Fragment-Host: org.openjdk.jmc.browser.attach;bundle-version="9.0.0"
Fragment-Host: org.openjdk.jmc.browser.attach;bundle-version="9.1.0"
Bundle-Localization: plugin
Automatic-Module-Name: org.openjdk.jmc.browser.attach.ja
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-Name: Simplified Chinese Language Fragment
Bundle-SymbolicName: org.openjdk.jmc.browser.attach.zh_CN
Bundle-Version: 9.0.0.qualifier
Bundle-Version: 9.1.0.qualifier
Bundle-Vendor: Oracle Corporation
Fragment-Host: org.openjdk.jmc.browser.attach;bundle-version="9.0.0"
Fragment-Host: org.openjdk.jmc.browser.attach;bundle-version="9.1.0"
Bundle-Localization: plugin
Automatic-Module-Name: org.openjdk.jmc.browser.attach.zh_CN
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-Name: Japanese Language Fragment
Bundle-SymbolicName: org.openjdk.jmc.browser.ja
Bundle-Version: 9.0.0.qualifier
Bundle-Version: 9.1.0.qualifier
Bundle-Vendor: Oracle Corporation
Fragment-Host: org.openjdk.jmc.browser;bundle-version="9.0.0"
Fragment-Host: org.openjdk.jmc.browser;bundle-version="9.1.0"
Bundle-Localization: plugin
Automatic-Module-Name: org.openjdk.jmc.browser.ja
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-Name: Japanese Language Fragment
Bundle-SymbolicName: org.openjdk.jmc.browser.jdp.ja
Bundle-Version: 9.0.0.qualifier
Bundle-Version: 9.1.0.qualifier
Bundle-Vendor: Oracle Corporation
Fragment-Host: org.openjdk.jmc.browser.jdp;bundle-version="9.0.0"
Fragment-Host: org.openjdk.jmc.browser.jdp;bundle-version="9.1.0"
Bundle-Localization: plugin
Automatic-Module-Name: org.openjdk.jmc.browser.jdp.ja
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-Name: Simplified Chinese Language Fragment
Bundle-SymbolicName: org.openjdk.jmc.browser.jdp.zh_CN
Bundle-Version: 9.0.0.qualifier
Bundle-Version: 9.1.0.qualifier
Bundle-Vendor: Oracle Corporation
Fragment-Host: org.openjdk.jmc.browser.jdp;bundle-version="9.0.0"
Fragment-Host: org.openjdk.jmc.browser.jdp;bundle-version="9.1.0"
Bundle-Localization: plugin
Automatic-Module-Name: org.openjdk.jmc.browser.jdp.zh_CN
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-Name: Simplified Chinese Language Fragment
Bundle-SymbolicName: org.openjdk.jmc.browser.zh_CN
Bundle-Version: 9.0.0.qualifier
Bundle-Version: 9.1.0.qualifier
Bundle-Vendor: Oracle Corporation
Fragment-Host: org.openjdk.jmc.browser;bundle-version="9.0.0"
Fragment-Host: org.openjdk.jmc.browser;bundle-version="9.1.0"
Bundle-Localization: plugin
Automatic-Module-Name: org.openjdk.jmc.browser.zh_CN
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-Name: Japanese Language Fragment
Bundle-SymbolicName: org.openjdk.jmc.console.persistence.ja
Bundle-Version: 9.0.0.qualifier
Bundle-Version: 9.1.0.qualifier
Bundle-Vendor: Oracle Corporation
Fragment-Host: org.openjdk.jmc.console.persistence;bundle-version="9.0.0"
Fragment-Host: org.openjdk.jmc.console.persistence;bundle-version="9.1.0"
Bundle-Localization: plugin
Automatic-Module-Name: org.openjdk.jmc.console.persistence.ja
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-Name: Simplified Chinese Language Fragment
Bundle-SymbolicName: org.openjdk.jmc.console.persistence.zh_CN
Bundle-Version: 9.0.0.qualifier
Bundle-Version: 9.1.0.qualifier
Bundle-Vendor: Oracle Corporation
Fragment-Host: org.openjdk.jmc.console.persistence;bundle-version="9.0.0"
Fragment-Host: org.openjdk.jmc.console.persistence;bundle-version="9.1.0"
Bundle-Localization: plugin
Automatic-Module-Name: org.openjdk.jmc.console.persistence.zh_CN
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-Name: Japanese Language Fragment
Bundle-SymbolicName: org.openjdk.jmc.console.ui.diagnostic.ja
Bundle-Version: 9.0.0.qualifier
Bundle-Version: 9.1.0.qualifier
Bundle-Vendor: Oracle Corporation
Fragment-Host: org.openjdk.jmc.console.ui.diagnostic;bundle-version="9.0.0"
Fragment-Host: org.openjdk.jmc.console.ui.diagnostic;bundle-version="9.1.0"
Bundle-Localization: plugin
Automatic-Module-Name: org.openjdk.jmc.console.ui.diagnostic.ja
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-Name: Simplified Chinese Language Fragment
Bundle-SymbolicName: org.openjdk.jmc.console.ui.diagnostic.zh_CN
Bundle-Version: 9.0.0.qualifier
Bundle-Version: 9.1.0.qualifier
Bundle-Vendor: Oracle Corporation
Fragment-Host: org.openjdk.jmc.console.ui.diagnostic;bundle-version="9.0.0"
Fragment-Host: org.openjdk.jmc.console.ui.diagnostic;bundle-version="9.1.0"
Bundle-Localization: plugin
Automatic-Module-Name: org.openjdk.jmc.console.ui.diagnostic.zh_CN
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-Name: Japanese Language Fragment
Bundle-SymbolicName: org.openjdk.jmc.console.ui.ja
Bundle-Version: 9.0.0.qualifier
Bundle-Version: 9.1.0.qualifier
Bundle-Vendor: Oracle Corporation
Fragment-Host: org.openjdk.jmc.console.ui;bundle-version="9.0.0"
Fragment-Host: org.openjdk.jmc.console.ui;bundle-version="9.1.0"
Bundle-Localization: plugin
Automatic-Module-Name: org.openjdk.jmc.console.ui.ja
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-Name: Japanese Language Fragment
Bundle-SymbolicName: org.openjdk.jmc.console.ui.mbeanbrowser.ja
Bundle-Version: 9.0.0.qualifier
Bundle-Version: 9.1.0.qualifier
Bundle-Vendor: Oracle Corporation
Fragment-Host: org.openjdk.jmc.console.ui.mbeanbrowser;bundle-version="9.0.0"
Fragment-Host: org.openjdk.jmc.console.ui.mbeanbrowser;bundle-version="9.1.0"
Bundle-Localization: plugin
Automatic-Module-Name: org.openjdk.jmc.console.ui.mbeanbrowser.ja
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-Name: Simplified Chinese Language Fragment
Bundle-SymbolicName: org.openjdk.jmc.console.ui.mbeanbrowser.zh_CN
Bundle-Version: 9.0.0.qualifier
Bundle-Version: 9.1.0.qualifier
Bundle-Vendor: Oracle Corporation
Fragment-Host: org.openjdk.jmc.console.ui.mbeanbrowser;bundle-version="9.0.0"
Fragment-Host: org.openjdk.jmc.console.ui.mbeanbrowser;bundle-version="9.1.0"
Bundle-Localization: plugin
Automatic-Module-Name: org.openjdk.jmc.console.ui.mbeanbrowser.zh_CN
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-Name: Japanese Language Fragment
Bundle-SymbolicName: org.openjdk.jmc.console.ui.notification.ja
Bundle-Version: 9.0.0.qualifier
Bundle-Version: 9.1.0.qualifier
Bundle-Vendor: Oracle Corporation
Fragment-Host: org.openjdk.jmc.console.ui.notification;bundle-version="9.0.0"
Fragment-Host: org.openjdk.jmc.console.ui.notification;bundle-version="9.1.0"
Bundle-Localization: plugin
Automatic-Module-Name: org.openjdk.jmc.console.ui.notification.ja
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-Name: Simplified Chinese Language Fragment
Bundle-SymbolicName: org.openjdk.jmc.console.ui.notification.zh_CN
Bundle-Version: 9.0.0.qualifier
Bundle-Version: 9.1.0.qualifier
Bundle-Vendor: Oracle Corporation
Fragment-Host: org.openjdk.jmc.console.ui.notification;bundle-version="9.0.0"
Fragment-Host: org.openjdk.jmc.console.ui.notification;bundle-version="9.1.0"
Bundle-Localization: plugin
Automatic-Module-Name: org.openjdk.jmc.console.ui.notification.zh_CN
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-Name: Simplified Chinese Language Fragment
Bundle-SymbolicName: org.openjdk.jmc.console.ui.zh_CN
Bundle-Version: 9.0.0.qualifier
Bundle-Version: 9.1.0.qualifier
Bundle-Vendor: Oracle Corporation
Fragment-Host: org.openjdk.jmc.console.ui;bundle-version="9.0.0"
Fragment-Host: org.openjdk.jmc.console.ui;bundle-version="9.1.0"
Bundle-Localization: plugin
Automatic-Module-Name: org.openjdk.jmc.console.ui.zh_CN
4 changes: 2 additions & 2 deletions application/l10n/org.openjdk.jmc.docs.ja/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-Name: Japanese Language Fragment
Bundle-SymbolicName: org.openjdk.jmc.docs.ja
Bundle-Version: 9.0.0.qualifier
Bundle-Version: 9.1.0.qualifier
Bundle-Vendor: Oracle Corporation
Fragment-Host: org.openjdk.jmc.docs;bundle-version="9.0.0"
Fragment-Host: org.openjdk.jmc.docs;bundle-version="9.1.0"
Automatic-Module-Name: org.openjdk.jmc.docs.ja
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-Name: Simplified Chinese Language Fragment
Bundle-SymbolicName: org.openjdk.jmc.docs.zh_CN
Bundle-Version: 9.0.0.qualifier
Bundle-Version: 9.1.0.qualifier
Bundle-Vendor: Oracle Corporation
Fragment-Host: org.openjdk.jmc.docs;bundle-version="9.0.0"
Fragment-Host: org.openjdk.jmc.docs;bundle-version="9.1.0"
Automatic-Module-Name: org.openjdk.jmc.docs.zh_CN
6 changes: 3 additions & 3 deletions application/l10n/org.openjdk.jmc.feature.ja/feature.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
Expand Down Expand Up @@ -34,10 +34,10 @@
<feature
id="org.openjdk.jmc.feature.ja"
label="%name"
version="9.0.0.qualifier"
version="9.1.0.qualifier"
provider-name="%provider"
license-feature="org.openjdk.jmc.feature.license"
license-feature-version="9.0.0.qualifier">
license-feature-version="9.1.0.qualifier">

<description url="%descriptionUrl">
%description
Expand Down
6 changes: 3 additions & 3 deletions application/l10n/org.openjdk.jmc.feature.rcp.ja/feature.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
Expand Down Expand Up @@ -34,10 +34,10 @@
<feature
id="org.openjdk.jmc.feature.rcp.ja"
label="%name"
version="9.0.0.qualifier"
version="9.1.0.qualifier"
provider-name="%provider"
license-feature="org.openjdk.jmc.feature.license"
license-feature-version="9.0.0.qualifier">
license-feature-version="9.1.0.qualifier">

<description url="%descriptionUrl">
%description
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
Expand Down Expand Up @@ -34,10 +34,10 @@
<feature
id="org.openjdk.jmc.feature.rcp.zh_CN"
label="%name"
version="9.0.0.qualifier"
version="9.1.0.qualifier"
provider-name="%provider"
license-feature="org.openjdk.jmc.feature.license"
license-feature-version="9.0.0.qualifier">
license-feature-version="9.1.0.qualifier">

<description url="%descriptionUrl">
%description
Expand Down
6 changes: 3 additions & 3 deletions application/l10n/org.openjdk.jmc.feature.zh_CN/feature.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
Expand Down Expand Up @@ -34,10 +34,10 @@
<feature
id="org.openjdk.jmc.feature.zh_CN"
label="%name"
version="9.0.0.qualifier"
version="9.1.0.qualifier"
provider-name="%provider"
license-feature="org.openjdk.jmc.feature.license"
license-feature-version="9.0.0.qualifier">
license-feature-version="9.1.0.qualifier">

<description url="%descriptionUrl">
%description
Expand Down
Loading

0 comments on commit ddac48e

Please sign in to comment.