Skip to content

Commit 1930c20

Browse files
Avery-DunnAvery-Dunn
authored
Merge pull request #962 from AzureAD/avdunn/cleanup-pom
Update dependencies and improve formatting of pom.xml
2 parents d6ecdb3 + d79cd6b commit 1930c20

File tree

1 file changed

+51
-60
lines changed

1 file changed

+51
-60
lines changed

‎msal4j-sdk/pom.xml‎

Lines changed: 51 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,37 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
4-
<groupId>com.microsoft.azure</groupId>
5-
<artifactId>msal4j</artifactId>
6-
<version>1.20.1</version>
7-
<packaging>jar</packaging>
8-
<name>msal4j</name>
9-
<description>
10-
Microsoft Authentication Library for Java gives you the ability to obtain tokens from Azure AD v2 (work and school
11-
accounts, MSA) and Azure AD B2C, gaining access to Microsoft Cloud API and any other API secured by Microsoft
12-
identities
13-
</description>
14-
<url>https://github.com/AzureAD/microsoft-authentication-library-for-java</url>
15-
<developers>
16-
<developer>
17-
<id>msopentech</id>
18-
<name>Microsoft Open Technologies, Inc.</name>
19-
</developer>
20-
</developers>
21-
<licenses>
22-
<license>
23-
<name>MIT License</name>
24-
</license>
25-
</licenses>
26-
<inceptionYear>2013</inceptionYear>
27-
<scm>
28-
<url>https://github.com/AzureAD/microsoft-authentication-library-for-java</url>
29-
</scm>
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>com.microsoft.azure</groupId>
5+
<artifactId>msal4j</artifactId>
6+
<version>1.20.1</version>
7+
<packaging>jar</packaging>
8+
<name>msal4j</name>
9+
<description>
10+
Microsoft Authentication Library for Java gives you the ability to obtain tokens from Microsoft Entra (work and
11+
school accounts, MSA) and Azure AD B2C, gaining access to Microsoft Cloud API and any other API secured by Microsoft
12+
identities
13+
</description>
14+
<url>https://github.com/AzureAD/microsoft-authentication-library-for-java</url>
15+
<developers>
16+
<developer>
17+
<id>msopentech</id>
18+
<name>Microsoft Open Technologies, Inc.</name>
19+
</developer>
20+
</developers>
21+
<licenses>
22+
<license>
23+
<name>MIT License</name>
24+
</license>
25+
</licenses>
26+
<inceptionYear>2013</inceptionYear>
27+
<scm>
28+
<url>https://github.com/AzureAD/microsoft-authentication-library-for-java</url>
29+
</scm>
3030

3131
<properties>
3232
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
33+
<skip.unit.tests>false</skip.unit.tests>
34+
<skip.integration.tests>false</skip.integration.tests>
3335
</properties>
3436

3537
<dependencies>
@@ -72,40 +74,34 @@
7274
</dependency>
7375

7476
<!-- test dependencies -->
75-
<dependency>
76-
<groupId>org.apache.commons</groupId>
77-
<artifactId>commons-text</artifactId>
78-
<version>1.10.0</version>
79-
<scope>test</scope>
80-
</dependency>
8177
<dependency>
8278
<groupId>org.junit.jupiter</groupId>
8379
<artifactId>junit-jupiter-api</artifactId>
84-
<version>5.9.2</version>
80+
<version>5.13.0</version>
8581
<scope>test</scope>
8682
</dependency>
8783
<dependency>
8884
<groupId>org.junit.jupiter</groupId>
8985
<artifactId>junit-jupiter-params</artifactId>
90-
<version>5.8.1</version>
86+
<version>5.13.0</version>
9187
<scope>test</scope>
9288
</dependency>
9389
<dependency>
9490
<groupId>org.junit.jupiter</groupId>
9591
<artifactId>junit-jupiter-engine</artifactId>
96-
<version>5.9.2</version>
92+
<version>5.13.0</version>
9793
<scope>test</scope>
9894
</dependency>
9995
<dependency>
10096
<groupId>org.mockito</groupId>
10197
<artifactId>mockito-inline</artifactId>
102-
<version>4.7.0</version>
98+
<version>4.11.0</version>
10399
<scope>test</scope>
104100
</dependency>
105101
<dependency>
106102
<groupId>org.mockito</groupId>
107103
<artifactId>mockito-junit-jupiter</artifactId>
108-
<version>4.7.0</version>
104+
<version>4.11.0</version>
109105
<scope>test</scope>
110106
</dependency>
111107
<dependency>
@@ -114,23 +110,16 @@
114110
<version>1.14.5</version>
115111
<scope>test</scope>
116112
</dependency>
117-
118113
<dependency>
119114
<groupId>org.skyscreamer</groupId>
120115
<artifactId>jsonassert</artifactId>
121-
<version>1.5.0</version>
122-
<scope>test</scope>
123-
</dependency>
124-
<dependency>
125-
<groupId>org.apache.httpcomponents</groupId>
126-
<artifactId>httpclient</artifactId>
127-
<version>4.5.13</version>
116+
<version>1.5.3</version>
128117
<scope>test</scope>
129118
</dependency>
130119
<dependency>
131120
<groupId>com.azure</groupId>
132121
<artifactId>azure-security-keyvault-secrets</artifactId>
133-
<version>4.3.5</version>
122+
<version>4.9.4</version>
134123
<scope>test</scope>
135124
</dependency>
136125
<dependency>
@@ -140,15 +129,9 @@
140129
<scope>test</scope>
141130
</dependency>
142131
<dependency>
143-
<groupId>com.google.guava</groupId>
144-
<artifactId>guava</artifactId>
145-
<version>32.1.1-jre</version>
146-
<scope>test</scope>
147-
</dependency>
148-
<dependency>
149-
<groupId>ch.qos.logback</groupId>
150-
<artifactId>logback-classic</artifactId>
151-
<version>1.3.12</version>
132+
<groupId>org.apache.commons</groupId>
133+
<artifactId>commons-text</artifactId>
134+
<version>1.13.1</version>
152135
<scope>test</scope>
153136
</dependency>
154137
<dependency>
@@ -205,7 +188,9 @@
205188
<executions>
206189
<execution>
207190
<id>check</id>
208-
<goals><goal>check</goal></goals>
191+
<goals>
192+
<goal>check</goal>
193+
</goals>
209194
</execution>
210195
</executions>
211196
</plugin>
@@ -233,7 +218,6 @@
233218
<addOutputDirectory>false</addOutputDirectory>
234219
</configuration>
235220
</plugin>
236-
237221
<plugin>
238222
<groupId>org.apache.maven.plugins</groupId>
239223
<artifactId>maven-jar-plugin</artifactId>
@@ -254,9 +238,9 @@
254238
<version>3.5.2</version>
255239
<configuration>
256240
<argLine>@{argLine} -noverify</argLine>
241+
<skipTests>${skip.unit.tests}</skipTests>
257242
</configuration>
258243
</plugin>
259-
260244
<plugin>
261245
<groupId>org.apache.maven.plugins</groupId>
262246
<artifactId>maven-javadoc-plugin</artifactId>
@@ -331,6 +315,9 @@
331315
</goals>
332316
</execution>
333317
</executions>
318+
<configuration>
319+
<skipTests>${skip.integration.tests}</skipTests>
320+
</configuration>
334321
</plugin>
335322
<plugin>
336323
<groupId>biz.aQute.bnd</groupId>
@@ -363,6 +350,10 @@
363350
</execution>
364351
</executions>
365352
</plugin>
353+
<plugin>
354+
<artifactId>maven-dependency-plugin</artifactId>
355+
<version>3.1.2</version>
356+
</plugin>
366357
</plugins>
367358
</build>
368359
</project>

0 commit comments

Comments
 (0)