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

Rename confidential ledger package #22056

Merged
merged 2 commits into from
Jun 4, 2021
Merged

Rename confidential ledger package #22056

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61c8dd5
Rename confidential ledger package
jianghaolu Jun 3, 2021
825c616
Use 1.0.0-beta.2 as dependency version
jianghaolu Jun 4, 2021
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: 1 addition & 1 deletion eng/.docsettings.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ known_content_issues:
- ['sdk/communication/azure-communication-sms/swagger/README.md', '#3113']
- ['sdk/communication/azure-communication-identity/swagger/README.md', '#3113']
- ['sdk/communication/azure-communication-phonenumbers/swagger/README.md', '#3113']
- ['sdk/confidentialledger/azure-data-confidentialledger/swagger/README.md', '#3113']
- ['sdk/confidentialledger/azure-security-confidentialledger/swagger/README.md', '#3113']
- ['sdk/cosmos/changelog/README.md', '#3113']
- ['sdk/cosmos/faq/README.md', '#3113']
- ['sdk/cosmos/azure-cosmos-benchmark/README.md', '#3113']
Expand Down
2 changes: 1 addition & 1 deletion eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2486,7 +2486,7 @@

<!-- Two clients in Confidential Ledger share the same builder resulting unused field in each -->
<Match>
<Class name="~com\.azure\.data\.confidentialledger\.\w+BaseClient"/>
<Class name="~com\.azure\.security\.confidentialledger\.\w+BaseClient"/>
<Bug pattern="URF_UNREAD_FIELD"/>
</Match>

Expand Down
2 changes: 1 addition & 1 deletion eng/versioning/version_client.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ com.azure.cosmos.spark:azure-cosmos-spark_3-1_2-12;4.2.0-beta.1;4.2.0-beta.1
com.azure:azure-cosmos-encryption;1.0.0-beta.5;1.0.0-beta.6
com.azure:azure-data-appconfiguration;1.1.12;1.2.0-beta.2
com.azure:azure-data-appconfiguration-perf;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-data-confidentialledger;1.0.0-beta.1;1.0.0-beta.2
com.azure:azure-data-schemaregistry;1.0.0-beta.4;1.0.0-beta.5
com.azure:azure-data-schemaregistry-avro;1.0.0-beta.4;1.0.0-beta.5
com.azure:azure-data-tables;12.0.0-beta.7;12.0.0-beta.8
Expand All @@ -105,6 +104,7 @@ com.azure:azure-quantum-jobs;1.0.0-beta.1;1.0.0-beta.2
com.azure:azure-search-documents;11.3.2;11.4.0-beta.3
com.azure:azure-search-perf;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-security-attestation;1.0.0-beta.1;1.0.0-beta.2
com.azure:azure-security-confidentialledger;1.0.0-beta.1;1.0.0-beta.2
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd make this 1.0.0-beta.2 for both the dependency and current version given that if anything attempts to use this as a dependency it'll break.

com.azure:azure-security-keyvault-administration;4.0.0-beta.7;4.0.0-beta.8
com.azure:azure-security-keyvault-certificates;4.1.8;4.2.0-beta.7
com.azure:azure-security-keyvault-jca;1.0.0-beta.7;1.0.0-beta.8
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<module>sdk/communication/azure-communication-sms</module>

<!-- Azure Confidential Ledger -->
<module>sdk/confidentialledger/azure-data-confidentialledger</module>
<module>sdk/confidentialledger/azure-security-confidentialledger</module>

<!-- Azure Container Registry -->
<module>sdk/containerregistry/azure-containers-containerregistry</module>
Expand Down Expand Up @@ -367,7 +367,7 @@
</group>
<group>
<title>Azure Confidential Ledger</title>
<packages>com.azure.data.confidentialledger.*</packages>
<packages>com.azure.security.confidentialledger.*</packages>
</group>
</groups>
<links combine.children="append">
Expand Down Expand Up @@ -589,7 +589,7 @@
So, path for aggregate reports have to be defined relative to parent pom -->
<additionalOptions>-maxLineLength 120
-snippetpath ${project.basedir}/sdk/appconfiguration/azure-data-appconfiguration/src/samples/java
-snippetpath ${project.basedir}/sdk/confidentialledger/azure-data-confidentialledger/src/samples/java
-snippetpath ${project.basedir}/sdk/confidentialledger/azure-security-confidentialledger/src/samples/java
-snippetpath ${project.basedir}/sdk/containerregistry/azure-containers-containerregistry/src/samples/java
-snippetpath ${project.basedir}/sdk/core/azure-core/src/samples/java
-snippetpath ${project.basedir}/sdk/core/azure-core-amqp/src/samples/java
Expand Down
8 changes: 0 additions & 8 deletions sdk/confidentialledger/azure-data-confidentialledger/CHANGELOG.md
View file
Open in desktop

This file was deleted.

9 changes: 9 additions & 0 deletions sdk/confidentialledger/azure-security-confidentialledger/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Release History

## 1.0.0-beta.2 (2021-06-08)

- Rename package name from azure-data-confidentialledger to azure-security-confidentialledger

## 1.0.0-beta.1 (2021-05-11)

- Initial beta release for Confidential Ledger client library.
22 changes: 11 additions & 11 deletions ...r/azure-data-confidentialledger/README.md → ...ure-security-confidentialledger/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ portfolio, Azure Confidential Ledger runs in SGX enclaves. It is built on Micros

### Include the Package

[//]: # ({x-version-update-start;com.azure:azure-data-confidentialledger;current})
[//]: # ({x-version-update-start;com.azure:azure-security-confidentialledger;current})
```xml
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-data-confidentialledger</artifactId>
<version>1.0.0-beta.1</version>
<artifactId>azure-security-confidentialledger</artifactId>
<version>1.0.0-beta.2</version>
</dependency>
```
[//]: # ({x-version-update-end})
Expand Down Expand Up @@ -58,7 +58,7 @@ To use the [DefaultAzureCredential][DefaultAzureCredential] provider shown below
Set the values of the client ID, tenant ID, and client secret of the AAD application as environment variables: AZURE_CLIENT_ID, AZURE_TENANT_ID, AZURE_CLIENT_SECRET.

##### Example
<!-- embedme ./src/samples/java/com/azure/data/confidentialledger/ReadmeSamples.java#L32-L56 -->
<!-- embedme ./src/samples/java/com/azure/security/confidentialledger/ReadmeSamples.java#L32-L56 -->
```java
ConfidentialLedgerIdentityServiceBaseClient identityServiceClient = new ConfidentialLedgerClientBuilder()
.ledgerUri(new URL("<confidential-ledger-url>"))
Expand Down Expand Up @@ -140,16 +140,16 @@ This project has adopted the [Microsoft Open Source Code of Conduct][coc]. For m
[ccf]: https://github.com/Microsoft/CCF
[azure_confidential_computing]: https://azure.microsoft.com/solutions/confidential-compute
[confidential_ledger_docs]: https://aka.ms/confidentialledger-servicedocs
[samples]: src/samples/java/com/azure/data/confidentialledger
[source_code]: https://github.com/Azure/azure-sdk-for-java/blob/master/sdk/confidentialledger/azure-data-confidentialledger/src
[samples_code]: https://github.com/Azure/azure-sdk-for-java/blob/master/sdk/confidentialledger/azure-data-confidentialledger/src/samples/
[samples]: src/samples/java/com/azure/security/confidentialledger
[source_code]: https://github.com/Azure/azure-sdk-for-java/blob/master/sdk/confidentialledger/azure-security-confidentialledger/src
[samples_code]: https://github.com/Azure/azure-sdk-for-java/blob/master/sdk/confidentialledger/azure-security-confidentialledger/src/samples/
[azure_subscription]: https://azure.microsoft.com/free/
[product_documentation]: https://aka.ms/confidentialledger-servicedocs
[ledger_base_client_class]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/confidentialledger/azure-data-confidentialledger/src/main/java/com/azure/data/confidentialledger/LedgerBaseClient.java
[ledger_base_client_class]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/confidentialledger/azure-security-confidentialledger/src/main/java/com/azure/security/confidentialledger/LedgerBaseClient.java
[azure_portal]: https://portal.azure.com
[jdk_link]: https://docs.microsoft.com/java/azure/jdk/?view=azure-java-stable
[package]: https://mvnrepository.com/artifact/com.azure/azure-data-confidentialledger
[samples_readme]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/confidentialledger/azure-data-confidentialledger/src/samples/README.md
[package]: https://mvnrepository.com/artifact/com.azure/azure-security-confidentialledger
[samples_readme]: https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/confidentialledger/azure-security-confidentialledger/src/samples/README.md


![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-java%2Fsdk%2Fconfidentialledger%2Fazure-data-confidentialledger%2FREADME.png)
![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-java%2Fsdk%2Fconfidentialledger%2Fazure-security-confidentialledger%2FREADME.png)
4 changes: 2 additions & 2 deletions ...ger/azure-data-confidentialledger/pom.xml → ...azure-security-confidentialledger/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
</parent>

<groupId>com.azure</groupId>
<artifactId>azure-data-confidentialledger</artifactId>
<version>1.0.0-beta.2</version> <!-- {x-version-update;com.azure:azure-data-confidentialledger;current} -->
<artifactId>azure-security-confidentialledger</artifactId>
<version>1.0.0-beta.2</version> <!-- {x-version-update;com.azure:azure-security-confidentialledger;current} -->

<name>Microsoft Azure client library for Confidential Ledger</name>
<description>This package contains Microsoft Azure Confidential Ledger client library.</description>
Expand Down
2 changes: 1 addition & 1 deletion ...lledger/ConfidentialLedgerBaseClient.java → ...lledger/ConfidentialLedgerBaseClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.
// Code generated by Microsoft (R) AutoRest Code Generator.

package com.azure.data.confidentialledger;
package com.azure.security.confidentialledger;

import com.azure.core.annotation.ReturnType;
import com.azure.core.annotation.ServiceClient;
Expand Down
2 changes: 1 addition & 1 deletion ...dger/ConfidentialLedgerClientBuilder.java → ...dger/ConfidentialLedgerClientBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.
// Code generated by Microsoft (R) AutoRest Code Generator.

package com.azure.data.confidentialledger;
package com.azure.security.confidentialledger;

import com.azure.core.annotation.ServiceClientBuilder;
import com.azure.core.credential.TokenCredential;
Expand Down
2 changes: 1 addition & 1 deletion ...ntialLedgerIdentityServiceBaseClient.java → ...ntialLedgerIdentityServiceBaseClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the MIT License.
// Code generated by Microsoft (R) AutoRest Code Generator.

package com.azure.data.confidentialledger;
package com.azure.security.confidentialledger;

import com.azure.core.annotation.ReturnType;
import com.azure.core.annotation.ServiceClient;
Expand Down
2 changes: 1 addition & 1 deletion ...data/confidentialledger/package-info.java → ...rity/confidentialledger/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
* Package containing the classes for ConfidentialLedgerClient. The ConfidentialLedgerClient writes and retrieves ledger
* entries against the Confidential Ledger service.
*/
package com.azure.data.confidentialledger;
package com.azure.security.confidentialledger;
4 changes: 2 additions & 2 deletions ...tialledger/src/main/java/module-info.java → ...tialledger/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
// Licensed under the MIT License.
// Code generated by Microsoft (R) AutoRest Code Generator.

module com.azure.data.confidentialledger {
module com.azure.security.confidentialledger {
requires transitive com.azure.core;
requires transitive com.azure.core.experimental;

exports com.azure.data.confidentialledger;
exports com.azure.security.confidentialledger;
}
0 ...-confidentialledger/src/samples/README.md → ...-confidentialledger/src/samples/README.md
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion .../confidentialledger/GetLedgerEntries.java → .../confidentialledger/GetLedgerEntries.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

package com.azure.data.confidentialledger;
package com.azure.security.confidentialledger;

import com.azure.core.experimental.http.DynamicResponse;
import com.azure.core.http.HttpClient;
Expand Down
2 changes: 1 addition & 1 deletion ...ata/confidentialledger/ReadmeSamples.java → ...ity/confidentialledger/ReadmeSamples.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

package com.azure.data.confidentialledger;
package com.azure.security.confidentialledger;

import com.azure.core.experimental.http.DynamicResponse;
import com.azure.core.http.HttpClient;
Expand Down
2 changes: 1 addition & 1 deletion ...er/ConfidentialLedgerBaseClientTests.java → ...er/ConfidentialLedgerBaseClientTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

package com.azure.data.confidentialledger;
package com.azure.security.confidentialledger;

import com.azure.core.experimental.http.DynamicResponse;
import org.junit.jupiter.api.Test;
Expand Down
2 changes: 1 addition & 1 deletion ...ger/ConfidentialLedgerClientTestBase.java → ...ger/ConfidentialLedgerClientTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

package com.azure.data.confidentialledger;
package com.azure.security.confidentialledger;

import com.azure.core.credential.TokenCredential;
import com.azure.core.http.HttpClient;
Expand Down
0 ...dgerBaseClientTests.getLedgerEntries.json → ...dgerBaseClientTests.getLedgerEntries.json
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...data-confidentialledger/swagger/README.md → ...rity-confidentialledger/swagger/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ input-file:
- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/master/specification/confidentialledger/data-plane/Microsoft.ConfidentialLedger/preview/0.1-preview/identityservice.json
java: true
output-folder: ../
namespace: com.azure.data.confidentialledger
namespace: com.azure.security.confidentialledger
generate-client-interfaces: false
sync-methods: none
license-header: MICROSOFT_MIT_SMALL
Expand Down
4 changes: 2 additions & 2 deletions sdk/confidentialledger/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ extends:
parameters:
ServiceDirectory: confidentialledger
Artifacts:
- name: azure-data-confidentialledger
- name: azure-security-confidentialledger
groupId: com.azure
safeName: azuredataconfidentialledger
safeName: azuresecurityconfidentialledger
8 changes: 4 additions & 4 deletions sdk/confidentialledger/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
<profile>
<id>coverage</id>
<modules>
<module>azure-data-confidentialledger</module>
<module>azure-security-confidentialledger</module>
</modules>

<dependencies>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-data-confidentialledger</artifactId>
<version>1.0.0-beta.2</version> <!-- {x-version-update;com.azure:azure-data-confidentialledger;current} -->
<artifactId>azure-security-confidentialledger</artifactId>
<version>1.0.0-beta.2</version> <!-- {x-version-update;com.azure:azure-security-confidentialledger;current} -->
</dependency>
</dependencies>

Expand Down Expand Up @@ -51,7 +51,7 @@
<activeByDefault>true</activeByDefault>
</activation>
<modules>
<module>azure-data-confidentialledger</module>
<module>azure-security-confidentialledger</module>
</modules>
</profile>
</profiles>
Expand Down