Skip to content
This repository was archived by the owner on Oct 12, 2023. It is now read-only.

Commit 6eaf61a

Browse files
tiffanyachentiffanyachen
committed
Updates to JsonWebKey to accomodate EC keys
1 parent 9230218 commit 6eaf61a

12 files changed

Lines changed: 648 additions & 151 deletions

File tree

‎azure-keyvault-core/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>com.microsoft.azure</groupId>
1010
<artifactId>azure-keyvault-parent</artifactId>
11-
<version>1.1-alpha-2</version>
11+
<version>1.1-beta-1</version>
1212
<relativePath>../pom.xml</relativePath>
1313
</parent>
1414

‎azure-keyvault-cryptography/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>com.microsoft.azure</groupId>
1111
<artifactId>azure-keyvault-parent</artifactId>
12-
<version>1.1-alpha-2</version>
12+
<version>1.1-beta-1</version>
1313
<relativePath>../pom.xml</relativePath>
1414
</parent>
1515

@@ -57,12 +57,12 @@
5757
<dependency>
5858
<groupId>com.microsoft.azure</groupId>
5959
<artifactId>azure-keyvault-core</artifactId>
60-
<version>1.1-alpha-2</version>
60+
<version>1.1-beta-1</version>
6161
</dependency>
6262
<dependency>
6363
<groupId>com.microsoft.azure</groupId>
6464
<artifactId>azure-keyvault-webkey</artifactId>
65-
<version>1.1-alpha-2</version>
65+
<version>1.1-beta-1</version>
6666
</dependency>
6767
</dependencies>
6868
</project>

‎azure-keyvault-extensions/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>com.microsoft.azure</groupId>
1010
<artifactId>azure-keyvault-parent</artifactId>
11-
<version>1.1-alpha-2</version>
11+
<version>1.1-beta-1</version>
1212
<relativePath>../pom.xml</relativePath>
1313
</parent>
1414

@@ -68,22 +68,22 @@
6868
<dependency>
6969
<groupId>com.microsoft.azure</groupId>
7070
<artifactId>azure-keyvault-core</artifactId>
71-
<version>1.1-alpha-2</version>
71+
<version>1.1-beta-1</version>
7272
</dependency>
7373
<dependency>
7474
<groupId>com.microsoft.azure</groupId>
7575
<artifactId>azure-keyvault-cryptography</artifactId>
76-
<version>1.1-alpha-2</version>
76+
<version>1.1-beta-1</version>
7777
</dependency>
7878
<dependency>
7979
<groupId>com.microsoft.azure</groupId>
8080
<artifactId>azure-keyvault</artifactId>
81-
<version>1.1-alpha-2</version>
81+
<version>1.1-beta-1</version>
8282
</dependency>
8383
<dependency>
8484
<groupId>com.microsoft.azure</groupId>
8585
<artifactId>azure-keyvault-webkey</artifactId>
86-
<version>1.1-alpha-2</version>
86+
<version>1.1-beta-1</version>
8787
</dependency>
8888
<dependency>
8989
<groupId>com.microsoft.azure</groupId>

‎azure-keyvault-webkey/pom.xml‎

Lines changed: 113 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -1,117 +1,127 @@
1-
<!--
2-
Copyright (c) Microsoft Corporation. All rights reserved.
3-
Licensed under the MIT License. See License.txt in the project root for
4-
license information.
5-
-->
6-
<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">
7-
<modelVersion>4.0.0</modelVersion>
8-
<parent>
9-
<groupId>com.microsoft.azure</groupId>
10-
<artifactId>azure-keyvault-parent</artifactId>
11-
<version>1.1-alpha-2</version>
12-
<relativePath>../pom.xml</relativePath>
13-
</parent>
1+
<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under
2+
the MIT License. See License.txt in the project root for license information. -->
3+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
<parent>
7+
<groupId>com.microsoft.azure</groupId>
8+
<artifactId>azure-keyvault-parent</artifactId>
9+
<version>1.1-beta-1</version>
10+
<relativePath>../pom.xml</relativePath>
11+
</parent>
1412

15-
<artifactId>azure-keyvault-webkey</artifactId>
16-
<packaging>jar</packaging>
13+
<artifactId>azure-keyvault-webkey</artifactId>
14+
<packaging>jar</packaging>
1715

18-
<name>Microsoft Azure SDK for Key Vault WebKey</name>
19-
<description>This package contains Microsoft Azure Key Vault WebKey library.</description>
20-
<url>https://github.com/Azure/azure-sdk-for-java</url>
16+
<name>Microsoft Azure SDK for Key Vault WebKey</name>
17+
<description>This package contains Microsoft Azure Key Vault WebKey library.</description>
18+
<url>https://github.com/Azure/azure-sdk-for-java</url>
2119

22-
<licenses>
23-
<license>
24-
<name>The MIT License (MIT)</name>
25-
<url>http://opensource.org/licenses/MIT</url>
26-
<distribution>repo</distribution>
27-
</license>
28-
</licenses>
20+
<licenses>
21+
<license>
22+
<name>The MIT License (MIT)</name>
23+
<url>http://opensource.org/licenses/MIT</url>
24+
<distribution>repo</distribution>
25+
</license>
26+
</licenses>
2927

30-
<scm>
31-
<url>scm:git:https://github.com/Azure/azure-sdk-for-java</url>
32-
<connection>scm:git:git@github.com:Azure/azure-sdk-for-java.git</connection>
33-
<tag>HEAD</tag>
34-
</scm>
28+
<scm>
29+
<url>scm:git:https://github.com/Azure/azure-sdk-for-java</url>
30+
<connection>scm:git:git@github.com:Azure/azure-sdk-for-java.git</connection>
31+
<tag>HEAD</tag>
32+
</scm>
3533

36-
<properties>
37-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
38-
<legal><![CDATA[[INFO] Any downloads listed may be third party software. Microsoft grants you no rights for third party software.]]></legal>
39-
</properties>
34+
<properties>
35+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
36+
<legal><![CDATA[[INFO] Any downloads listed may be third party software. Microsoft grants you no rights for third party software.]]></legal>
37+
</properties>
4038

41-
<developers>
42-
<developer>
43-
<id>microsoft</id>
44-
<name>Microsoft</name>
45-
</developer>
46-
</developers>
39+
<developers>
40+
<developer>
41+
<id>microsoft</id>
42+
<name>Microsoft</name>
43+
</developer>
44+
</developers>
4745

46+
<dependencies>
47+
<dependency>
48+
<groupId>com.fasterxml.jackson.core</groupId>
49+
<artifactId>jackson-databind</artifactId>
50+
</dependency>
51+
<dependency>
52+
<groupId>commons-codec</groupId>
53+
<artifactId>commons-codec</artifactId>
54+
</dependency>
55+
<dependency>
56+
<groupId>com.google.guava</groupId>
57+
<artifactId>guava</artifactId>
58+
</dependency>
59+
<dependency>
60+
<groupId>com.microsoft.rest</groupId>
61+
<artifactId>client-runtime</artifactId>
62+
<version>1.3.0</version>
63+
</dependency>
64+
<dependency>
65+
<groupId>com.microsoft.azure</groupId>
66+
<artifactId>azure-client-authentication</artifactId>
67+
<version>1.3.0</version>
68+
</dependency>
69+
<dependency>
70+
<groupId>com.microsoft.azure</groupId>
71+
<artifactId>azure-keyvault</artifactId>
72+
<version>1.1-beta-1</version>
73+
</dependency>
74+
<!-- Test dependencies -->
75+
<dependency>
76+
<groupId>junit</groupId>
77+
<artifactId>junit</artifactId>
78+
<scope>test</scope>
79+
</dependency>
80+
</dependencies>
81+
<build>
82+
<plugins>
83+
<plugin>
84+
<groupId>org.apache.maven.plugins</groupId>
85+
<artifactId>maven-jar-plugin</artifactId>
86+
<version>3.0.2</version>
87+
<configuration>
88+
<archive>
89+
<manifest>
90+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
91+
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
92+
</manifest>
93+
</archive>
94+
</configuration>
95+
</plugin>
96+
<plugin>
97+
<groupId>org.codehaus.mojo</groupId>
98+
<artifactId>build-helper-maven-plugin</artifactId>
99+
<version>1.12</version>
100+
</plugin>
48101

49-
<dependencies>
50-
<dependency>
51-
<groupId>com.fasterxml.jackson.core</groupId>
52-
<artifactId>jackson-databind</artifactId>
53-
</dependency>
54-
<dependency>
55-
<groupId>commons-codec</groupId>
56-
<artifactId>commons-codec</artifactId>
57-
</dependency>
58-
<dependency>
59-
<groupId>com.google.guava</groupId>
60-
<artifactId>guava</artifactId>
61-
<version>20.0</version>
62-
</dependency>
63-
64-
<!-- Test dependencies -->
65-
<dependency>
66-
<groupId>junit</groupId>
67-
<artifactId>junit</artifactId>
68-
<scope>test</scope>
69-
</dependency>
70-
</dependencies>
71-
<build>
72-
<plugins>
73-
<plugin>
74-
<groupId>org.apache.maven.plugins</groupId>
75-
<artifactId>maven-jar-plugin</artifactId>
76-
<version>3.0.2</version>
77-
<configuration>
78-
<archive>
79-
<manifest>
80-
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
81-
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
82-
</manifest>
83-
</archive>
84-
</configuration>
85-
</plugin>
86-
<plugin>
87-
<groupId>org.codehaus.mojo</groupId>
88-
<artifactId>build-helper-maven-plugin</artifactId>
89-
<version>1.12</version>
90-
</plugin>
102+
<plugin>
103+
<groupId>org.apache.maven.plugins</groupId>
104+
<artifactId>maven-compiler-plugin</artifactId>
105+
<version>3.1</version>
106+
<configuration>
107+
<source>1.7</source>
108+
<target>1.7</target>
109+
</configuration>
110+
</plugin>
91111

92-
<plugin>
93-
<groupId>org.apache.maven.plugins</groupId>
94-
<artifactId>maven-compiler-plugin</artifactId>
95-
<version>3.1</version>
96-
<configuration>
97-
<source>1.7</source>
98-
<target>1.7</target>
99-
</configuration>
100-
</plugin>
101-
102-
<plugin>
103-
<groupId>org.apache.maven.plugins</groupId>
104-
<artifactId>maven-javadoc-plugin</artifactId>
105-
<version>2.8</version>
106-
<configuration>
107-
<excludePackageNames>com.microsoft.schemas._2003._10.serialization;</excludePackageNames>
108-
<bottom><![CDATA[<code>/**
112+
<plugin>
113+
<groupId>org.apache.maven.plugins</groupId>
114+
<artifactId>maven-javadoc-plugin</artifactId>
115+
<version>2.8</version>
116+
<configuration>
117+
<excludePackageNames>com.microsoft.schemas._2003._10.serialization;</excludePackageNames>
118+
<bottom><![CDATA[<code>/**
109119
<br />* Copyright (c) Microsoft Corporation. All rights reserved.
110120
<br />* Licensed under the MIT License. See License.txt in the project root for
111121
<br />* license information.
112122
<br />*/</code>]]></bottom>
113-
</configuration>
114-
</plugin>
115-
</plugins>
116-
</build>
123+
</configuration>
124+
</plugin>
125+
</plugins>
126+
</build>
117127
</project>

0 commit comments

Comments
 (0)