From 5e50d1bc0e3dffeb22020bdf5da78b984e162510 Mon Sep 17 00:00:00 2001 From: nalsaber Date: Wed, 10 Jan 2024 06:19:08 +0000 Subject: [PATCH] Releasing version 1.4.0 --- CHANGELOG.md | 4 + SECURITY.md | 38 ------ features/feature.xml | 2 +- features/pom.xml | 6 +- plugins/.classpath | 124 +++++++++--------- plugins/.settings/org.eclipse.jdt.core.prefs | 1 + plugins/META-INF/MANIFEST.MF | 67 ++++------ plugins/pom.xml | 61 ++++++++- .../eclipse/account/PreferencesWrapper.java | 2 +- pom.xml | 2 +- .../category.xml | 2 +- releng/com.oracle.oci.eclipse.update/pom.xml | 2 +- releng/pom.xml | 2 +- tests/.classpath | 16 ++- tests/.project | 6 + tests/META-INF/MANIFEST.MF | 2 +- tests/pom.xml | 6 +- 17 files changed, 180 insertions(+), 163 deletions(-) delete mode 100644 SECURITY.md diff --git a/CHANGELOG.md b/CHANGELOG.md index e8e7c0d..d89c834 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/). +## 1.4.0 +### Added +- Update to OCI Java SDK 3.24. + ## 1.3.4 ### Added - Autononmous Database Support diff --git a/SECURITY.md b/SECURITY.md deleted file mode 100644 index 2ca8102..0000000 --- a/SECURITY.md +++ /dev/null @@ -1,38 +0,0 @@ -# Reporting security vulnerabilities - -Oracle values the independent security research community and believes that -responsible disclosure of security vulnerabilities helps us ensure the security -and privacy of all our users. - -Please do NOT raise a GitHub Issue to report a security vulnerability. If you -believe you have found a security vulnerability, please submit a report to -[secalert_us@oracle.com][1] preferably with a proof of concept. Please review -some additional information on [how to report security vulnerabilities to Oracle][2]. -We encourage people who contact Oracle Security to use email encryption using -[our encryption key][3]. - -We ask that you do not use other channels or contact the project maintainers -directly. - -Non-vulnerability related security issues including ideas for new or improved -security features are welcome on GitHub Issues. - -## Security updates, alerts and bulletins - -Security updates will be released on a regular cadence. Many of our projects -will typically release security fixes in conjunction with the -Oracle Critical Patch Update program. Additional -information, including past advisories, is available on our [security alerts][4] -page. - -## Security-related information - -We will provide security related information such as a threat model, considerations -for secure use, or any known security issues in our documentation. Please note -that labs and sample code are intended to demonstrate a concept and may not be -sufficiently hardened for production use. - -[1]: mailto:secalert_us@oracle.com -[2]: https://www.oracle.com/corporate/security-practices/assurance/vulnerability/reporting.html -[3]: https://www.oracle.com/security-alerts/encryptionkey.html -[4]: https://www.oracle.com/security-alerts/ diff --git a/features/feature.xml b/features/feature.xml index 95a0378..26be5d3 100644 --- a/features/feature.xml +++ b/features/feature.xml @@ -2,7 +2,7 @@ diff --git a/features/pom.xml b/features/pom.xml index 43af215..b0ae405 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -2,12 +2,12 @@ 4.0.0 com.oracle.oci.eclipse.feature - 1.3.4-SNAPSHOT + 1.4.0-SNAPSHOT eclipse-feature com.oracle.oci.eclipse com.oracle.oci.eclipse.root - 1.3.4-SNAPSHOT + 1.4.0-SNAPSHOT @@ -53,7 +53,7 @@ pem oci_dex_tools_grp pritpate - ${project.build.directory}/com.oracle.oci.eclipse.feature-1.3.4-SNAPSHOT.jar + ${project.build.directory}/com.oracle.oci.eclipse.feature-1.4.0-SNAPSHOT.jar ${project.build.directory} java2 diff --git a/plugins/.classpath b/plugins/.classpath index 3306c89..ac29975 100644 --- a/plugins/.classpath +++ b/plugins/.classpath @@ -1,68 +1,72 @@ - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/.settings/org.eclipse.jdt.core.prefs b/plugins/.settings/org.eclipse.jdt.core.prefs index 0c68a61..9f6ece8 100644 --- a/plugins/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/.settings/org.eclipse.jdt.core.prefs @@ -4,4 +4,5 @@ org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.8 diff --git a/plugins/META-INF/MANIFEST.MF b/plugins/META-INF/MANIFEST.MF index ac4d005..dc59a0a 100644 --- a/plugins/META-INF/MANIFEST.MF +++ b/plugins/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Vendor: Oracle Bundle-Name: Oracle Cloud Infrastructure Toolkit Bundle-SymbolicName: com.oracle.oci.eclipse.plugin;singleton:=true -Bundle-Version: 1.3.4.qualifier +Bundle-Version: 1.4.0.qualifier Bundle-Activator: com.oracle.oci.eclipse.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, @@ -24,77 +24,62 @@ Require-Bundle: org.eclipse.ui, Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Bundle-ClassPath: . - ,lib/sdk/oci-java-sdk-circuitbreaker-2.49.1.jar - ,lib/sdk/oci-java-sdk-common-2.49.1.jar - ,lib/sdk/oci-java-sdk-containerengine-2.49.1.jar - ,lib/sdk/oci-java-sdk-core-2.49.1.jar - ,lib/sdk/oci-java-sdk-database-2.49.1.jar - ,lib/sdk/oci-java-sdk-identity-2.49.1.jar - ,lib/sdk/oci-java-sdk-identitydataplane-2.49.1.jar - ,lib/sdk/oci-java-sdk-keymanagement-2.49.1.jar - ,lib/sdk/oci-java-sdk-objectstorage-2.49.1.jar - ,lib/sdk/oci-java-sdk-objectstorage-extensions-2.49.1.jar - ,lib/sdk/oci-java-sdk-objectstorage-generated-2.49.1.jar - ,lib/sdk/oci-java-sdk-secrets-2.49.1.jar - ,lib/sdk/oci-java-sdk-vault-2.49.1.jar - ,lib/sdk/oci-java-sdk-workrequests-2.49.1.jar + ,lib/sdk/oci-java-sdk-circuitbreaker-3.24.0.jar + ,lib/sdk/oci-java-sdk-common-3.24.0.jar + ,lib/sdk/oci-java-sdk-common-httpclient-3.24.0.jar + ,lib/sdk/oci-java-sdk-common-httpclient-jersey-3.24.0.jar + ,lib/sdk/oci-java-sdk-containerengine-3.24.0.jar + ,lib/sdk/oci-java-sdk-core-3.24.0.jar + ,lib/sdk/oci-java-sdk-database-3.24.0.jar + ,lib/sdk/oci-java-sdk-identity-3.24.0.jar + ,lib/sdk/oci-java-sdk-identitydataplane-3.24.0.jar + ,lib/sdk/oci-java-sdk-keymanagement-3.24.0.jar + ,lib/sdk/oci-java-sdk-objectstorage-3.24.0.jar + ,lib/sdk/oci-java-sdk-objectstorage-extensions-3.24.0.jar + ,lib/sdk/oci-java-sdk-objectstorage-generated-3.24.0.jar + ,lib/sdk/oci-java-sdk-resourcemanager-3.24.0.jar + ,lib/sdk/oci-java-sdk-secrets-3.24.0.jar + ,lib/sdk/oci-java-sdk-vault-3.24.0.jar + ,lib/sdk/oci-java-sdk-workrequests-3.24.0.jar ,lib/thirdparty/aopalliance-repackaged-2.6.1.jar - ,lib/thirdparty/bcpkix-jdk15on-1.70.jar - ,lib/thirdparty/bcprov-jdk15on-1.70.jar - ,lib/thirdparty/bcutil-jdk15on-1.70.jar - ,lib/thirdparty/checker-qual-3.12.0.jar + ,lib/thirdparty/bcpkix-jdk15to18-1.74.jar + ,lib/thirdparty/bcprov-jdk15to18-1.74.jar + ,lib/thirdparty/bcutil-jdk15to18-1.74.jar ,lib/thirdparty/commons-codec-1.11.jar ,lib/thirdparty/commons-logging-1.2.jar - ,lib/thirdparty/error_prone_annotations-2.7.1.jar - ,lib/thirdparty/failureaccess-1.0.1.jar - ,lib/thirdparty/guava-31.0.1-jre.jar ,lib/thirdparty/hk2-api-2.6.1.jar ,lib/thirdparty/hk2-locator-2.6.1.jar ,lib/thirdparty/hk2-utils-2.6.1.jar ,lib/thirdparty/httpclient-4.5.13.jar ,lib/thirdparty/httpcore-4.4.13.jar - ,lib/thirdparty/j2objc-annotations-1.3.jar - ,lib/thirdparty/jackson-annotations-2.13.1.jar - ,lib/thirdparty/jackson-core-2.13.1.jar + ,lib/thirdparty/jackson-annotations-2.15.2.jar + ,lib/thirdparty/jackson-core-2.15.2.jar ,lib/thirdparty/jackson-databind-2.13.4.2.jar ,lib/thirdparty/jackson-module-jaxb-annotations-2.12.2.jar ,lib/thirdparty/jakarta.activation-api-1.2.1.jar - ,lib/thirdparty/jakarta.annotation-api-1.3.5.jar + ,lib/thirdparty/jakarta.annotation-api-2.1.1.jar ,lib/thirdparty/jakarta.inject-2.6.1.jar ,lib/thirdparty/jakarta.ws.rs-api-2.1.6.jar ,lib/thirdparty/jakarta.xml.bind-api-2.3.2.jar ,lib/thirdparty/javassist-3.25.0-GA.jar ,lib/thirdparty/javax.annotation-api-1.3.2.jar - ,lib/thirdparty/jcip-annotations-1.0-1.jar ,lib/thirdparty/jersey-apache-connector-2.35.jar ,lib/thirdparty/jersey-client-2.35.jar ,lib/thirdparty/jersey-common-2.35.jar ,lib/thirdparty/jersey-entity-filtering-2.35.jar ,lib/thirdparty/jersey-hk2-2.35.jar ,lib/thirdparty/jersey-media-json-jackson-2.35.jar - ,lib/thirdparty/jsr305-3.0.2.jar - ,lib/thirdparty/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar - ,lib/thirdparty/nimbus-jose-jwt-9.15.2.jar ,lib/thirdparty/osgi-resource-locator-1.0.3.jar ,lib/thirdparty/resilience4j-circuitbreaker-1.7.1.jar ,lib/thirdparty/resilience4j-core-1.7.1.jar ,lib/thirdparty/slf4j-api-1.7.33.jar ,lib/thirdparty/vavr-0.10.2.jar ,lib/thirdparty/vavr-match-0.10.2.jar -Export-Package: com.oracle.bmc.auth, - com.oracle.bmc.core.model, - com.oracle.bmc.database, +Export-Package: com.oracle.bmc.core.model, com.oracle.bmc.database.model, com.oracle.bmc.identity.model, - com.oracle.bmc.identity.requests, - com.oracle.bmc.identitydataplane, - com.oracle.bmc.identitydataplane.model, - com.oracle.bmc.identitydataplane.requests, - com.oracle.bmc.identitydataplane.responses, - com.oracle.bmc.keymanagement.model, com.oracle.bmc.objectstorage.model, com.oracle.bmc.objectstorage.responses, - com.oracle.bmc.vault.model, com.oracle.oci.eclipse, com.oracle.oci.eclipse.account, com.oracle.oci.eclipse.sdkclients, @@ -104,8 +89,6 @@ Export-Package: com.oracle.bmc.auth, com.oracle.oci.eclipse.ui.explorer.compute, com.oracle.oci.eclipse.ui.explorer.database, com.oracle.oci.eclipse.ui.explorer.database.actions, - com.oracle.oci.eclipse.ui.explorer.database.editor, - com.oracle.oci.eclipse.ui.explorer.database.provider.dialog, com.oracle.oci.eclipse.ui.explorer.objectstorage Import-Package: org.eclipse.core.net.proxy diff --git a/plugins/pom.xml b/plugins/pom.xml index 9807f62..853d5cb 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -6,11 +6,11 @@ com.oracle.oci.eclipse com.oracle.oci.eclipse.root - 1.3.4-SNAPSHOT + 1.4.0-SNAPSHOT - 2.49.1 + 3.24.0 @@ -57,7 +57,7 @@ pem oci_dex_tools_grp pritpate - ${project.build.directory}/com.oracle.oci.eclipse.plugin-1.3.4-SNAPSHOT.jar + ${project.build.directory}/com.oracle.oci.eclipse.plugin-1.4.0-SNAPSHOT.jar ${project.build.directory} java2 @@ -188,10 +188,10 @@ ${oci.java.sdk.ver} - com.oracle.oci.sdk - oci-java-sdk-identitydataplane - ${oci.java.sdk.ver} - + com.oracle.oci.sdk + oci-java-sdk-identitydataplane + ${oci.java.sdk.ver} + com.oracle.oci.sdk oci-java-sdk-vault @@ -207,6 +207,16 @@ oci-java-sdk-secrets ${oci.java.sdk.ver} + + com.oracle.oci.sdk + oci-java-sdk-resourcemanager + ${oci.java.sdk.ver} + + + com.oracle.oci.sdk + oci-java-sdk-common-httpclient-jersey + ${oci.java.sdk.ver} + @@ -267,4 +277,41 @@ + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.eclipse.tycho + + + tycho-packaging-plugin + + + [0.25.0,) + + + validate-id + + + + + + + + + + + + + diff --git a/plugins/src/com/oracle/oci/eclipse/account/PreferencesWrapper.java b/plugins/src/com/oracle/oci/eclipse/account/PreferencesWrapper.java index ceb9555..7931cd9 100644 --- a/plugins/src/com/oracle/oci/eclipse/account/PreferencesWrapper.java +++ b/plugins/src/com/oracle/oci/eclipse/account/PreferencesWrapper.java @@ -22,7 +22,7 @@ public class PreferencesWrapper { static String pathName = SECURE_STORAGE_KEY_PATH + PREFERENCES_LOCATION; private static Preferences systemPrefs = Preferences.userRoot().node(PREFERENCES_LOCATION); private static ISecurePreferences securePreferences = SecurePreferencesFactory.getDefault().node(pathName); - private final static String VERSION = "1.3.4"; + private final static String VERSION = "1.4.0"; private final static String OCI_IDE_DEBUG_CLEAR_PREFS_KEY = "oracle.debug.oci-ide-prefs.clear"; diff --git a/pom.xml b/pom.xml index 759c06c..03db4f0 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.oracle.oci.eclipse com.oracle.oci.eclipse.root - 1.3.4-SNAPSHOT + 1.4.0-SNAPSHOT pom diff --git a/releng/com.oracle.oci.eclipse.update/category.xml b/releng/com.oracle.oci.eclipse.update/category.xml index 928a6f2..221a91d 100644 --- a/releng/com.oracle.oci.eclipse.update/category.xml +++ b/releng/com.oracle.oci.eclipse.update/category.xml @@ -1,6 +1,6 @@ - + diff --git a/releng/com.oracle.oci.eclipse.update/pom.xml b/releng/com.oracle.oci.eclipse.update/pom.xml index 94fefd3..361e389 100644 --- a/releng/com.oracle.oci.eclipse.update/pom.xml +++ b/releng/com.oracle.oci.eclipse.update/pom.xml @@ -6,6 +6,6 @@ com.oracle.oci.eclipse com.oracle.oci.eclipse.releng - 1.3.4-SNAPSHOT + 1.4.0-SNAPSHOT diff --git a/releng/pom.xml b/releng/pom.xml index 3845829..3bb9ca2 100644 --- a/releng/pom.xml +++ b/releng/pom.xml @@ -9,7 +9,7 @@ com.oracle.oci.eclipse com.oracle.oci.eclipse.root - 1.3.4-SNAPSHOT + 1.4.0-SNAPSHOT com.oracle.oci.eclipse.update diff --git a/tests/.classpath b/tests/.classpath index 3e5654f..5050774 100644 --- a/tests/.classpath +++ b/tests/.classpath @@ -1,10 +1,20 @@ - + + + + + - + + + + + + + - + diff --git a/tests/.project b/tests/.project index dabb2d6..238ded5 100644 --- a/tests/.project +++ b/tests/.project @@ -20,8 +20,14 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature diff --git a/tests/META-INF/MANIFEST.MF b/tests/META-INF/MANIFEST.MF index 983ffe1..6ba5063 100644 --- a/tests/META-INF/MANIFEST.MF +++ b/tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: com.oracle.oci.eclipse.tests Bundle-SymbolicName: com.oracle.oci.eclipse.tests;singleton:=true -Bundle-Version: 1.3.4.qualifier +Bundle-Version: 1.4.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Require-Bundle: org.junit, diff --git a/tests/pom.xml b/tests/pom.xml index eb4e701..7977819 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -11,7 +11,7 @@ com.oracle.oci.eclipse com.oracle.oci.eclipse.root - 1.3.4-SNAPSHOT + 1.4.0-SNAPSHOT src @@ -36,7 +36,7 @@ p2-installable-unit com.oracle.oci.eclipse.plugin - 1.3.4 + 1.4.0 eclipse-feature @@ -65,7 +65,7 @@ com.oracle.oci.eclipse com.oracle.oci.eclipse.plugin - 1.3.4-SNAPSHOT + 1.4.0-SNAPSHOT test