Skip to content

Commit 098ee33

Browse files
Merge pull request #23 from oracle/topic_spalared_sync_with_bitbucket
Documentation changes, plugin to flatten pom, plugin to generate checksum files. Added name, description, url, developers and scm details in poms
2 parents 20e4d7b + 68f97e1 commit 098ee33

File tree

39 files changed

+278
-186
lines changed

39 files changed

+278
-186
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ For a deep dive into the project, refer to the Spring Cloud OCI documentation:
2626

2727
This project has dependency and transitive dependencies on Spring Projects. The table below outlines the versions of Spring Cloud, Spring Boot and Spring Framework versions that are compatible with certain Spring Cloud OCI version.
2828

29-
| Spring Cloud OCI | Spring Cloud | Spring Boot | OCI Java SDK |
30-
|-------------------|-----------------|---------------------|--------------|
31-
| 1.0.0 | 2021.0.x | 2.7.x | 3.19.0 |
29+
| Spring Cloud OCI | Spring Cloud | Spring Boot | OCI Java SDK |
30+
|-------------------|---------------------------|---------------------|--------------|
31+
| 1.0.0 | 2021.0.x | 2.7.x | 3.19.0 |
3232

3333

3434
## Try out samples

docs/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
1010
<parent>
1111
<groupId>org.springframework.cloud</groupId>
1212
<artifactId>spring-cloud-build</artifactId>
13-
<version>3.1.5</version>
13+
<version>4.0.4</version>
1414
<relativePath/>
1515
</parent>
1616
<modelVersion>4.0.0</modelVersion>

docs/src/main/asciidoc/core.adoc

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,22 @@ dependencies {
2727

2828
=== Authentication Configuration
2929

30-
Spring Cloud OCI allows you to authenticate with OCI with various following available options.
30+
Spring Cloud OCI allows you to authenticate with OCI using various available options.
3131

32-
==== Config File Based Authentication
32+
==== Configuration File Based Authentication
3333

34-
By default config file based authentication is enabled, to set it explicitly set the property spring.cloud.oci.config.type to `FILE`. There are below optional configuration to choose custom config profile name and config file name.
34+
By default, configuration file based authentication is enabled. To set it explicitly, set the property `spring.cloud.oci.config.type` to `FILE`. The following are optional configurations to set a custom configuration profile name and file name.
3535

3636
----
3737
spring.cloud.oci.config.profile = DEFAULT
3838
spring.cloud.oci.config.file = <FILE_PATH>
3939
----
4040

41-
For further details about the Authentication config file refer https://docs.oracle.com/en-us/iaas/Content/API/Concepts/sdkconfig.htm[SDK and CLI Configuration File]
41+
For further details about the Authentication configuration file, refer https://docs.oracle.com/en-us/iaas/Content/API/Concepts/sdkconfig.htm[SDK and CLI Configuration File]
4242

4343
==== Simple Authentication
4444

45-
Set the property spring.cloud.oci.config.type to `SIMPLE` and add below properties:
45+
Set the property `spring.cloud.oci.config.type` to `SIMPLE` and add the following properties:
4646

4747
----
4848
spring.cloud.oci.config.type = SIMPLE
@@ -53,40 +53,40 @@ spring.cloud.oci.config.privateKey = <PRIVATE_KEY_FILE_PATH>
5353
spring.cloud.oci.config.passPhrase = <PASS_PHRASE>
5454
spring.cloud.oci.config.region = <REGION>
5555
----
56-
Note: All the above properties are mandatory except spring.cloud.oci.config.passPhrase
56+
Note: All the preceding properties are mandatory except `spring.cloud.oci.config.passPhrase`
5757

5858
==== Instance Principal Configuration
5959

60-
Set the config.type to `INSTANCE_PRINCIPAL` as below.
60+
Set the config.type to `INSTANCE_PRINCIPAL` as shown here.
6161

6262
----
6363
spring.cloud.oci.config.type = INSTANCE_PRINCIPAL
6464
----
65-
For further details refer https://docs.oracle.com/en-us/iaas/Content/Identity/Tasks/callingservicesfrominstances.htm[OCI Instance Principal Authentication]
65+
For further details, refer to https://docs.oracle.com/en-us/iaas/Content/Identity/Tasks/callingservicesfrominstances.htm[OCI Instance Principal Authentication]
6666

6767
==== Resource Principal Configuration
6868

69-
Set the config.type to `RESOURCE_PRINCIPAL` as below.
69+
Set the config.type to `RESOURCE_PRINCIPAL` as shown here.
7070

7171
----
7272
spring.cloud.oci.config.type = RESOURCE_PRINCIPAL
7373
----
7474

75-
For further details refer https://docs.public.oneportal.content.oci.oraclecloud.com/en-us/iaas/Content/API/Concepts/sdk_authentication_methods.htm#sdk_authentication_methods_resource_principal[OCI Resource Principal Authentication]
75+
For further details, refer to https://docs.public.oneportal.content.oci.oraclecloud.com/en-us/iaas/Content/API/Concepts/sdk_authentication_methods.htm#sdk_authentication_methods_resource_principal[OCI Resource Principal Authentication]
7676

7777
=== Region Configuration
7878

79-
OCI services are available in different regions. Based on the custom requirements, the user can host the application on different OCI regions. The below configuration allows to set specific region for the entire application.
79+
OCI services are available in different regions. Based on the custom requirements, you can host the application on different OCI regions. The following configuration allows you to set a specific region for the entire application.
8080

8181
----
8282
spring.cloud.oci.region.static = us-ashburn-1
8383
----
8484

85-
Region value set in the above property takes precedence over the property `spring.cloud.oci.config.region` and `region` from the Authentication config file
85+
Region value set in the preceding property takes precedence over the property `spring.cloud.oci.config.region` and `region` from the Authentication configuration file
8686

8787
=== Compartment Configuration
8888

89-
A compartment is a logical container, to organize and control access to the Oracle Cloud Infrastructure (OCI) Resources (Compute, Storage, Network, Load Balancer, etc) created within that compartment. Below configuration allows you to set default compartment for your application.
89+
A compartment is a logical container, used to organize and control access to the OCI Resources (Compute, Storage, Network, Load Balancer, etc.) created within that compartment. The following configuration allows you to set the default compartment for your application.
9090

9191
----
9292
spring.cloud.oci.compartment.static = <COMPARTMENT_OCID>

docs/src/main/asciidoc/getting-started.adoc

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33

44
== Getting Started
55

6-
This section describes how to get up to speed with Spring Cloud OCI libraries.
6+
This section describes how to get started using Spring Cloud OCI libraries.
77

8-
=== Spring Cloud OCI maven dependency management
8+
=== Spring Cloud OCI
99

10-
Spring Cloud OCI module dependencies can be used directly in Maven with a direct configuration of the particular module. The Spring Cloud OCI module includes all transitive dependencies for the Spring modules and also the OCI SDK that are needed to operate the modules. The general dependency configuration will look like this:
10+
Spring Cloud OCI module dependencies can be used directly in Maven with a direct configuration of the module. The Spring Cloud OCI module includes all transitive dependencies for the Spring modules, and the OCI SDK that are needed to operate the modules. The general dependency configuration will look like this:
1111

1212
----
1313
<dependencies>
@@ -19,20 +19,20 @@ Spring Cloud OCI module dependencies can be used directly in Maven with a direct
1919
</dependencies>
2020
----
2121

22-
Different modules can be included by replacing the module name with the respective one (e.g. `spring-cloud-oci-starter-storage` instead of `spring-cloud-oci-starter`)
22+
Different modules can be included by replacing the module name with the respective one (for example, `spring-cloud-oci-starter-storage` instead of `spring-cloud-oci-starter`)
2323

2424
==== Starter Dependencies
2525

2626
Spring Cloud OCI offers https://github.com/oracle/spring-cloud-oci/tree/main/spring-cloud-oci-starters[starter dependencies] through Maven to easily depend on different modules of the library.
2727
Each starter contains all the dependencies and transitive dependencies needed to begin using their corresponding Spring Cloud OCI module.
2828

29-
For example, if you wish to write a Spring application with Cloud Storage, you would include the `spring-cloud-oci-starter-storage` dependency in your project.
29+
For example, to write a Spring application with Cloud Storage, you include the `spring-cloud-oci-starter-storage` dependency in your project.
3030
You do *not* need to include the underlying `spring-cloud-oci-storage` dependency, because the `starter` dependency includes it.
3131

32-
A summary of these artifacts are provided below.
32+
A summary of these artifacts is provided here.
3333

3434
|===
35-
| Spring Cloud OCI Starter | Description | Maven Artifact Name
35+
^| Spring Cloud OCI Starter ^| Description ^| Maven Artifact Name
3636

3737
| Core
3838
| Automatically configure authentication
@@ -53,10 +53,10 @@ There are a variety of resources to help you learn how to use Spring Cloud OCI l
5353

5454
The easiest way to learn how to use Spring Cloud OCI is to consult the https://github.com/oracle/spring-cloud-oci/tree/main/spring-cloud-oci-samples[sample applications on Github].
5555
Spring Cloud OCI provides sample applications which demonstrate how to use every integration in the library.
56-
The table below highlights several samples of the most commonly used integrations in Spring Cloud OCI.
56+
The following table highlights several samples of the most used integrations in Spring Cloud OCI.
5757

5858
|===
59-
| OCI Integration | Sample Application
59+
^| OCI Integration ^| Sample Application
6060

6161
| Cloud Storage
6262
| https://github.com/oracle/spring-cloud-oci/tree/main/spring-cloud-oci-samples/spring-cloud-oci-storage-sample[spring-cloud-oci-storage-sample]

docs/src/main/asciidoc/index.adoc

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,9 @@ include::_attributes.adoc[]
1010

1111
== Introduction
1212

13-
Spring Cloud for OCI, part of the Spring Cloud umbrella project, eases the integration with hosted OCI Services. It offers a convenient way to interact with OCI provided services using well-known Spring idioms and APIs, such as storage resources. Developers can build their application around the hosted services without having to care about infrastructure or maintenance.
13+
Spring Cloud for OCI, part of the Spring Cloud umbrella project, eases the integration with hosted OCI Services. It offers a convenient way to interact with OCI provided services using well-known Spring idioms and APIs, such as storage resources. Developers can build their application around the hosted services without having to worry about infrastructure or maintenance.
1414

15-
Spring Cloud OCI lets you leverage the power and simplicity of the Spring Framework to:
16-
17-
- Read and write from Spring Resources backed up by Oracle Cloud Storage
15+
Spring Cloud OCI lets you leverage the power and simplicity of the Spring Framework to read and write from Spring Resources backed up by Oracle Cloud Storage
1816

1917
include::getting-started.adoc[]
2018

@@ -28,14 +26,14 @@ include::logging.adoc[]
2826

2927
== Configuration properties
3028

31-
To see the list of all OCI related configuration properties please check link:appendix.html[the Appendix page].
29+
To see the list of all OCI-related configuration properties see the link:appendix.html[Appendix page].
3230

3331
=== Configuration Refresh
3432

3533
The following properties are supported for Configuration auto-refresh at runtime without the need to restart applications
3634

3735
|===
38-
|Name | Default
36+
^|Name ^| Default
3937

4038
|spring.cloud.oci.config.profile | `DEFAULT`
4139
|spring.cloud.oci.config.file | NA

docs/src/main/asciidoc/logging.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
[#cloud-logging]
55
== Cloud Logging
66

7-
https://docs.oracle.com/en-us/iaas/Content/Logging/home.htm/[Oracle Cloud Infrastructure (OCI) Logging] service is a highly scalable and fully managed single pane of glass for all the logs in your tenancy. Logging provides access to logs from Oracle Cloud Infrastructure resources. These logs include critical diagnostic information that describes how resources are performing and being accessed. Use Logging to enable, manage, and search Audit, Service and Custom logs. The Spring Cloud module for OCI Logging allows ingesting logs associated with a logId.
7+
https://docs.oracle.com/en-us/iaas/Content/Logging/home.htm/[OCI Logging] service is a highly scalable and fully managed single pane of glass for all the logs in your tenancy. Logging provides access to logs from OCI resources. These logs include critical diagnostic information that describes how resources are performing and being accessed. Use Logging to enable, manage, and search Audit, Service, and Custom logs. The Spring Cloud module for OCI Logging allows ingesting logs associated with a logId.
88
A Spring Boot starter is provided to auto-configure the Logging component.
99

1010
Maven coordinates, using <<getting-started.adoc#bill-of-materials, Spring Cloud OCI BOM>>:
@@ -29,7 +29,7 @@ dependencies {
2929
=== Using Cloud Logging
3030

3131
The starter automatically configures and registers a `Logging` bean in the Spring application context.
32-
The `Logging` bean (link[Javadoc]) can be used to ingest logs associated with a logId set in the property `spring.cloud.oci.logging.logId` in the application configuration file
32+
The `Logging` bean (link[Javadoc]) can be used to ingest logs associated with a logId specified in the property `spring.cloud.oci.logging.logId` within the application configuration file
3333

3434
[source,java]
3535
----
@@ -48,11 +48,11 @@ public void putLog() {
4848
The Spring Boot Starter for Oracle Cloud Logging provides the following configuration options:
4949

5050
|===
51-
| Name | Description | Required | Default value
51+
^| Name ^| Description ^| Required ^| Default value
5252
| `spring.cloud.oci.logging.enabled` | Enables the OCI Logging APIs. | No | `true`
5353
|===
5454

5555

5656
=== Sample
5757

58-
A https://github.com/oracle/spring-cloud-oci/tree/main/spring-cloud-oci-samples/spring-cloud-oci-logging-sample[sample application] is available.
58+
A sample application provided https://github.com/oracle/spring-cloud-oci/tree/main/spring-cloud-oci-samples/spring-cloud-oci-logging-sample[here] contains the examples to demonstrates the usage of OCI Spring Cloud Logging module.

docs/src/main/asciidoc/notifications.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
[#cloud-notifications]
55
== Cloud Notifications
66

7-
https://www.oracle.com/in/devops/notifications/[Oracle Cloud Infrastructure (OCI) Notifications] is a highly available, low-latency publish/subscribe (pub/sub) service that sends alerts and messages to Oracle Cloud Functions, email, SMS, and message delivery partners, including Slack, PagerDuty and custom HTTPS endpoint. Spring Cloud module for Oracle Cloud Notifications allows to create a Topic and create and publish messages to multiple subsctiption types like Oracle Cloud Functions, email, SMS, Slack, PagerDuty and custom HTTPS endpoint.
7+
https://www.oracle.com/in/devops/notifications/[OCI Notifications] is a highly available, low latency publish/subscribe (pub/sub) service that sends alerts and messages to Oracle Cloud Functions, email, SMS, and message delivery partners, including Slack, PagerDuty and custom HTTPS endpoint. Spring Cloud module for Oracle Cloud Notifications allows you to create a Topic, then create and publish messages to multiple subscription types such as Oracle Cloud Functions, email, SMS, Slack, PagerDuty and custom HTTPS endpoint.
88
A Spring Boot starter is provided to auto-configure the various Notification components.
99

1010
Maven coordinates, using <<getting-started.adoc#bill-of-materials, Spring Cloud OCI BOM>>:
@@ -29,7 +29,7 @@ dependencies {
2929
=== Using Cloud Notifications
3030

3131
The starter automatically configures and registers a `Notification` bean in the Spring application context.
32-
The `Notification` bean (link[Javadoc]) can be used to create Topic, create/list/get Subscription and publish message to the Subscriptions in a Topic.
32+
The `Notification` bean (link[Javadoc]) can be used to create a Topic, create, list, get a Subscription, and publish messages to the Subscriptions in a Topic.
3333

3434
[source,java]
3535
----
@@ -48,11 +48,11 @@ public void createTopic() {
4848
The Spring Boot Starter for Oracle Cloud Notifications provides the following configuration options:
4949

5050
|===
51-
| Name | Description | Required | Default value
51+
^| Name ^| Description ^| Required ^| Default value
5252
| `spring.cloud.oci.notification.enabled` | Enables the OCI Notifications APIs. | No | `true`
5353
|===
5454

5555

5656
=== Sample
5757

58-
A https://github.com/oracle/spring-cloud-oci/tree/main/spring-cloud-oci-samples/spring-cloud-oci-notification-sample[sample application] is available.
58+
A sample application provided https://github.com/oracle/spring-cloud-oci/tree/main/spring-cloud-oci-samples/spring-cloud-oci-notification-sample[here] contains the examples to demonstrates the usage of OCI Spring Cloud Notification module.

docs/src/main/asciidoc/storage.adoc

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
[#cloud-storage]
55
== Cloud Storage
66

7-
https://www.oracle.com/in/cloud/storage/[Oracle Cloud Storage] allows storing any types of files.
7+
https://www.oracle.com/in/cloud/storage/[Oracle Cloud Storage] allows you to store any types of file.
88
A Spring Boot starter is provided to auto-configure the various Storage components.
99

1010
Maven coordinates, using <<getting-started.adoc#bill-of-materials, Spring Cloud OCI BOM>>:
@@ -29,7 +29,7 @@ dependencies {
2929
=== Using Cloud Storage
3030

3131
The starter automatically configures and registers a `Storage` bean in the Spring application context.
32-
The `Storage` bean (link[Javadoc]) can be used to list/create/update/delete buckets and objects.
32+
The `Storage` bean (link[Javadoc]) can be used to list, create, update or delete buckets and objects.
3333

3434
[source,java]
3535
----
@@ -43,27 +43,24 @@ public void createBucketAndUploadFile() {
4343
}
4444
----
4545

46-
=== Cloud Storage Objects As Spring Resources
46+
=== Cloud Storage Objects Spring Resources
4747

48-
https://docs.spring.io/spring/docs/current/spring-framework-reference/html/resources.html[Spring Resources] are an abstraction for a number of low-level resources, such as file system files, classpath files, servlet context-relative files, etc.
49-
Spring Cloud OCI adds a new resource type: a Oracle Cloud Storage (OCS) object.
48+
https://docs.spring.io/spring/docs/current/spring-framework-reference/html/resources.html[Spring Resources] are an abstraction for several low-level resources, such as file system files, classpath files, servlet context-relative files, etc.
49+
Spring Cloud OCI adds a new resource type: an Oracle Cloud Storage (OCS) object.
5050

51-
The Spring Resource Abstraction for Oracle Cloud Storage allows OCS objects to be accessed by their OCS URL using the `@Value` annotation:
51+
The Spring Resource Abstraction for Oracle Cloud Storage allows OCS objects to be accessed by their OCS URL using the `@Value` annotation or the Spring application context:
5252

5353
[source,java]
5454
----
5555
@Value("ocs://[YOUR_OCS_BUCKET]/[OCS_FILE_NAME]")
5656
private Resource ocsResource;
5757
----
5858

59-
...or the Spring application context
60-
6159
[source,java]
6260
----
6361
SpringApplication.run(...).getResource("ocs://[YOUR_OCS_BUCKET]/[OCS_FILE_NAME]");
6462
----
6563

66-
6764
This creates a `Resource` object that can be used to read the object, among https://docs.spring.io/spring/docs/current/spring-framework-reference/html/resources.html#resources-resource[other possible operations].
6865

6966
Currently this resource is only readable.
@@ -73,11 +70,11 @@ Currently this resource is only readable.
7370
The Spring Boot Starter for Oracle Cloud Storage provides the following configuration options:
7471

7572
|===
76-
| Name | Description | Required | Default value
73+
^| Name ^| Description ^| Required ^| Default value
7774
| `spring.cloud.oci.storage.enabled` | Enables the OCI storage APIs. | No | `true`
7875
|===
7976

8077

8178
=== Sample
8279

83-
A https://github.com/oracle/spring-cloud-oci/tree/main/spring-cloud-oci-samples/spring-cloud-oci-storage-sample[sample application] is available.
80+
A sample application provided https://github.com/oracle/spring-cloud-oci/tree/main/spring-cloud-oci-samples/spring-cloud-oci-storage-sample[here] contains the examples to demonstrate the usage of OCI Spring Cloud Storage module.

0 commit comments

Comments
 (0)