Skip to content

Commit 37662cd

Browse files
siddhijainsiddhijain
committed
Resolve conflicts related to pom.xml
2 parents 9140de8 + 6fc7763 commit 37662cd

File tree

2 files changed

+10
-289
lines changed

2 files changed

+10
-289
lines changed

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Quick links:
1616
The library supports the following Java environments:
1717
- Java 8 (or higher)
1818

19-
Current version - 1.13.1
19+
Current version - 1.13.2
2020

2121
You can find the changes for each version in the [change log](https://github.com/AzureAD/microsoft-authentication-library-for-java/blob/master/changelog.txt).
2222

@@ -28,13 +28,13 @@ Find [the latest package in the Maven repository](https://mvnrepository.com/arti
2828
<dependency>
2929
<groupId>com.microsoft.azure</groupId>
3030
<artifactId>msal4j</artifactId>
31-
<version>1.13.1</version>
31+
<version>1.13.2</version>
3232
</dependency>
3333
```
3434
### Gradle
3535

3636
```gradle
37-
compile group: 'com.microsoft.azure', name: 'msal4j', version: '1.13.1'
37+
implementation group: 'com.microsoft.azure', name: 'com.microsoft.aad.msal4j', version: '1.13.2'
3838
```
3939

4040
## Usage

‎pom.xml

Lines changed: 7 additions & 286 deletions
Original file line numberDiff line numberDiff line change
@@ -2,290 +2,11 @@
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.microsoft.azure</groupId>
5-
<artifactId>msal4j</artifactId>
6-
<version>1.13.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>
30-
31-
<properties>
32-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
33-
</properties>
34-
35-
<dependencies>
36-
<dependency>
37-
<groupId>com.nimbusds</groupId>
38-
<artifactId>oauth2-oidc-sdk</artifactId>
39-
<version>9.35</version>
40-
</dependency>
41-
<dependency>
42-
<groupId>net.minidev</groupId>
43-
<artifactId>json-smart</artifactId>
44-
<version>2.4.8</version>
45-
</dependency>
46-
<dependency>
47-
<groupId>org.slf4j</groupId>
48-
<artifactId>slf4j-api</artifactId>
49-
<version>1.7.36</version>
50-
</dependency>
51-
<dependency>
52-
<groupId>org.projectlombok</groupId>
53-
<artifactId>lombok</artifactId>
54-
<version>1.18.6</version>
55-
<scope>provided</scope>
56-
</dependency>
57-
<dependency>
58-
<groupId>com.fasterxml.jackson.core</groupId>
59-
<artifactId>jackson-databind</artifactId>
60-
<version>2.13.2.1</version>
61-
</dependency>
62-
63-
<!-- test dependencies -->
64-
<dependency>
65-
<groupId>org.apache.commons</groupId>
66-
<artifactId>commons-text</artifactId>
67-
<version>1.7</version>
68-
<scope>test</scope>
69-
</dependency>
70-
<dependency>
71-
<groupId>org.testng</groupId>
72-
<artifactId>testng</artifactId>
73-
<version>7.1.0</version>
74-
<scope>test</scope>
75-
</dependency>
76-
<dependency>
77-
<groupId>org.powermock</groupId>
78-
<artifactId>powermock-module-testng</artifactId>
79-
<version>2.0.0</version>
80-
<scope>test</scope>
81-
</dependency>
82-
<dependency>
83-
<groupId>org.powermock</groupId>
84-
<artifactId>powermock-api-easymock</artifactId>
85-
<version>2.0.0</version>
86-
<scope>test</scope>
87-
</dependency>
88-
<dependency>
89-
<groupId>org.easymock</groupId>
90-
<artifactId>easymock</artifactId>
91-
<version>4.0.2</version>
92-
<scope>test</scope>
93-
</dependency>
94-
<dependency>
95-
<groupId>org.skyscreamer</groupId>
96-
<artifactId>jsonassert</artifactId>
97-
<version>1.5.0</version>
98-
<scope>test</scope>
99-
</dependency>
100-
<dependency>
101-
<groupId>org.apache.httpcomponents</groupId>
102-
<artifactId>httpclient</artifactId>
103-
<version>4.5.13</version>
104-
<scope>test</scope>
105-
</dependency>
106-
<dependency>
107-
<groupId>com.azure</groupId>
108-
<artifactId>azure-security-keyvault-secrets</artifactId>
109-
<version>4.3.5</version>
110-
<scope>test</scope>
111-
</dependency>
112-
<dependency>
113-
<groupId>org.seleniumhq.selenium</groupId>
114-
<artifactId>selenium-java</artifactId>
115-
<version>3.14.0</version>
116-
<scope>test</scope>
117-
</dependency>
118-
<dependency>
119-
<groupId>com.google.guava</groupId>
120-
<artifactId>guava</artifactId>
121-
<version>29.0-jre</version>
122-
<scope>test</scope>
123-
</dependency>
124-
<dependency>
125-
<groupId>ch.qos.logback</groupId>
126-
<artifactId>logback-classic</artifactId>
127-
<version>1.2.3</version>
128-
<scope>test</scope>
129-
</dependency>
130-
<dependency>
131-
<groupId>commons-io</groupId>
132-
<artifactId>commons-io</artifactId>
133-
<version>2.7</version>
134-
<scope>test</scope>
135-
</dependency>
136-
</dependencies>
137-
138-
<!-- force https -->
139-
<repositories>
140-
<repository>
141-
<id>central</id>
142-
<url>https://repo1.maven.org/maven2</url>
143-
<snapshots>
144-
<enabled>false</enabled>
145-
</snapshots>
146-
</repository>
147-
</repositories>
148-
<pluginRepositories>
149-
<pluginRepository>
150-
<id>central</id>
151-
<url>https://repo1.maven.org/maven2</url>
152-
<snapshots>
153-
<enabled>false</enabled>
154-
</snapshots>
155-
</pluginRepository>
156-
</pluginRepositories>
157-
158-
<build>
159-
<sourceDirectory>${project.build.directory}/delombok</sourceDirectory>
160-
<plugins>
161-
<plugin>
162-
<groupId>org.projectlombok</groupId>
163-
<artifactId>lombok-maven-plugin</artifactId>
164-
<version>1.18.2.0</version>
165-
<executions>
166-
<execution>
167-
<goals>
168-
<goal>delombok</goal>
169-
</goals>
170-
</execution>
171-
</executions>
172-
<configuration>
173-
<sourceDirectory>src/main/java</sourceDirectory>
174-
<outputDirectory>${project.build.directory}/delombok</outputDirectory>
175-
<addOutputDirectory>false</addOutputDirectory>
176-
</configuration>
177-
</plugin>
178-
179-
<plugin>
180-
<groupId>org.apache.maven.plugins</groupId>
181-
<artifactId>maven-jar-plugin</artifactId>
182-
<version>2.5</version>
183-
<configuration>
184-
<archive>
185-
<manifest>
186-
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
187-
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
188-
</manifest>
189-
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
190-
</archive>
191-
</configuration>
192-
</plugin>
193-
<plugin>
194-
<groupId>org.apache.maven.plugins</groupId>
195-
<artifactId>maven-surefire-plugin</artifactId>
196-
<version>2.10</version>
197-
<configuration>
198-
<argLine>-noverify</argLine>
199-
</configuration>
200-
</plugin>
201-
202-
<plugin>
203-
<groupId>org.apache.maven.plugins</groupId>
204-
<artifactId>maven-javadoc-plugin</artifactId>
205-
<version>3.1.0</version>
206-
<configuration>
207-
<sourcepath>${project.build.directory}/delombok</sourcepath>
208-
</configuration>
209-
<executions>
210-
<execution>
211-
<id>attach-javadocs</id>
212-
<goals>
213-
<goal>jar</goal>
214-
</goals>
215-
</execution>
216-
</executions>
217-
</plugin>
218-
<plugin>
219-
<groupId>org.apache.maven.plugins</groupId>
220-
<artifactId>maven-source-plugin</artifactId>
221-
<version>2.2.1</version>
222-
<executions>
223-
<execution>
224-
<id>attach-sources</id>
225-
<goals>
226-
<goal>jar</goal>
227-
</goals>
228-
</execution>
229-
</executions>
230-
</plugin>
231-
<plugin>
232-
<groupId>com.github.spotbugs</groupId>
233-
<artifactId>spotbugs-maven-plugin</artifactId>
234-
<version>3.1.11</version>
235-
</plugin>
236-
<plugin>
237-
<groupId>org.apache.maven.plugins</groupId>
238-
<artifactId>maven-compiler-plugin</artifactId>
239-
<version>3.7.0</version>
240-
<configuration>
241-
<source>8</source>
242-
<target>8</target>
243-
</configuration>
244-
</plugin>
245-
<plugin>
246-
<groupId>org.codehaus.mojo</groupId>
247-
<artifactId>build-helper-maven-plugin</artifactId>
248-
<version>1.10</version>
249-
<executions>
250-
<execution>
251-
<id>add-test-source</id>
252-
<phase>process-resources</phase>
253-
<goals>
254-
<goal>add-test-source</goal>
255-
</goals>
256-
<configuration>
257-
<sources>
258-
<source>src/integrationtest/java</source>
259-
</sources>
260-
</configuration>
261-
</execution>
262-
</executions>
263-
</plugin>
264-
<plugin>
265-
<groupId>org.apache.maven.plugins</groupId>
266-
<artifactId>maven-failsafe-plugin</artifactId>
267-
<version>2.22.1</version>
268-
<executions>
269-
<execution>
270-
<goals>
271-
<goal>integration-test</goal>
272-
<goal>verify</goal>
273-
</goals>
274-
</execution>
275-
</executions>
276-
</plugin>
277-
<plugin>
278-
<groupId>biz.aQute.bnd</groupId>
279-
<artifactId>bnd-maven-plugin</artifactId>
280-
<version>4.3.1</version>
281-
<executions>
282-
<execution>
283-
<goals>
284-
<goal>bnd-process</goal>
285-
</goals>
286-
</execution>
287-
</executions>
288-
</plugin>
289-
</plugins>
290-
</build>
5+
<artifactId>microsoft-authentication-library-for-java</artifactId>
6+
<version>1.0.0</version>
7+
<packaging>pom</packaging>
8+
<modules>
9+
<module>msal4j-brokers</module>
10+
<module>msal4j-sdk</module>
11+
</modules>
29112
</project>

0 commit comments

Comments
 (0)