Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions eng/pipelines/templates/jobs/archetype-sdk-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,7 @@ jobs:

- task: Maven@3
displayName: 'Start Jetty'
condition: ne(variables['SdkType'], 'client')
inputs:
mavenPomFile: pom.client.xml
options: '$(DefaultOptions) $(ProfileFlag)'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestName;
Expand Down Expand Up @@ -110,21 +111,25 @@ public void beforeMethod() throws Exception {
}

@Test
@Ignore("https://github.com/Azure/azure-sdk-for-java/issues/4993")
public void testSignVerifyIntegrationES256() throws Exception {
validateSignVerifyInterop(importTestKey("itwkk-p256", P256TestKey()), JsonWebKeySignatureAlgorithm.ES256, "SHA-256");
}

@Test
@Ignore("https://github.com/Azure/azure-sdk-for-java/issues/4993")
public void testSignVerifyIntegrationES256K() throws Exception {
validateSignVerifyInterop(importTestKey("itwkk-p256k", P256KTestKey()), JsonWebKeySignatureAlgorithm.ES256K, "SHA-256");
}

@Test
@Ignore("https://github.com/Azure/azure-sdk-for-java/issues/4993")
public void testSignVerifyIntegrationES384() throws Exception {
validateSignVerifyInterop(importTestKey("itwkk-p384", P384TestKey()), JsonWebKeySignatureAlgorithm.ES384, "SHA-384");
}

@Test
@Ignore("https://github.com/Azure/azure-sdk-for-java/issues/4993")
public void testSignVerifyIntegrationES521() throws Exception {
validateSignVerifyInterop(importTestKey("itwkk-p521", P521TestKey()), JsonWebKeySignatureAlgorithm.ES512, "SHA-512");
}
Expand Down
62 changes: 39 additions & 23 deletions sdk/keyvault/pom.service.xml
Original file line number Diff line number Diff line change
@@ -1,30 +1,46 @@
<!-- Copyright (c) Microsoft Corporation. All rights reserved.
Licensed under the MIT License. -->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.azure</groupId>
<artifactId>azure-keyvault-service</artifactId>
<packaging>pom</packaging>
<version>1.0.0</version><!-- Need not change for every release-->
<modules>

<!-- Track 1 -->
<module>microsoft-azure-keyvault</module>
<module>microsoft-azure-keyvault-core</module>
<module>microsoft-azure-keyvault-webkey</module>
<module>microsoft-azure-keyvault-cryptography</module>
<module>microsoft-azure-keyvault-extensions</module>
<module>microsoft-azure-keyvault-complete</module>

<!-- Track 2 -->
<module>../core/azure-core</module> <!-- NOTE: We need to build core so we can build against the version in the repo. -->
<module>../core/azure-core-test</module> <!-- NOTE: We need to build core so we can build against the version in the repo. -->
<module>../identity/azure-identity</module> <!-- NOTE: We need to build identity so we can build against the version in the repo. -->
<module>azure-keyvault-keys</module>
<module>azure-keyvault-secrets</module>

</modules>

<version>1.0.0</version> <!-- Need not change for every release-->
<profiles>
<profile>
<id>data</id>
<activation>
<property>
<name>env.SDKTYPE</name>
<value>data</value>
</property>
</activation>
<modules>
<module>microsoft-azure-keyvault</module>
<module>microsoft-azure-keyvault-complete</module>
<module>microsoft-azure-keyvault-core</module>
<module>microsoft-azure-keyvault-cryptography</module>
<module>microsoft-azure-keyvault-extensions</module>
<module>microsoft-azure-keyvault-test</module>
<module>microsoft-azure-keyvault-webkey</module>
</modules>
</profile>
<profile>
<id>client</id>
<activation>
<property>
<name>env.SDKTYPE</name>
<value>!data</value>
</property>
</activation>
<modules>
<module>../core/azure-core</module> <!-- NOTE: We need to build core so we can build against the version in the repo. -->
<module>../core/azure-core-test</module> <!-- NOTE: We need to build core so we can build against the version in the repo. -->
<module>../identity/azure-identity</module> <!-- NOTE: We need to build identity so we can build against the version in the repo. -->
<module>azure-keyvault-keys</module>
<module>azure-keyvault-secrets</module>
</modules>
</profile>
</profiles>
</project>