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.

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

Editing pom task #1794

Merged
merged 3 commits into from
Jun 3, 2024
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
77 changes: 23 additions & 54 deletions adal/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -224,65 +224,34 @@ publishing {
artifactId 'adal'
//Edit the 'version' here for VSTS RC build
version = project.version
afterEvaluate {
from components.distRelease
}

pom.withXml {
// Custom values

// Name
asNode().appendNode('name', 'adal')

// Description
asNode().appendNode(
'description',
'Azure active directory library for Android gives you the ability to add Windows Azure Active Directory authentication to your application with just a few lines of additional code. Using our ADAL SDKs you can quickly and easily extend your existing application to all the employees that use Windows Azure AD and Active Directory on-premises using Active Directory Federation Services, including Office365 customers.'
)

// URL
asNode().appendNode('url', 'https://github.com/AzureAD/azure-activedirectory-library-for-android')

// Inception Year
asNode().appendNode('inceptionYear', '2014')

// Licenses
asNode().appendNode('licenses').appendNode('license').appendNode('name', 'MIT License')

// Developers
def developerNode = asNode().appendNode('developers').appendNode('developer')
developerNode.appendNode('id', 'microsoft')
developerNode.appendNode('name', 'Microsoft')

// SCM
asNode().appendNode('scm').appendNode('url', 'https://github.com/AzureAD/azure-activedirectory-library-for-android/tree/master')

// Properties
def propertiesNode = asNode().appendNode('properties')
propertiesNode.appendNode('branch', 'master')
propertiesNode.appendNode('version', project.version)

def dependenciesNode = asNode().appendNode('dependencies')

def deps = configurations.implementation.allDependencies.asList()
if (project.version.toString().endsWith("SNAPSHOT")) {
deps.addAll(configurations.snapshotApi.allDependencies.asList())
} else {
deps.addAll(configurations.distApi.allDependencies.asList())
pom {
name = 'adal'
description = 'Azure active directory library for Android gives you the ability to add Windows Azure Active Directory authentication to your application with just a few lines of additional code. Using our ADAL SDKs you can quickly and easily extend your existing application to all the employees that use Windows Azure AD and Active Directory on-premises using Active Directory Federation Services, including Office365 customers.'
url = 'https://github.com/AzureAD/azure-activedirectory-library-for-android'
developers {
developer {
id = 'microsoft'
name = 'Microsoft'
}
}

//Iterate over the implementation dependencies (we don't want the test ones), adding a <dependency> node for each
deps.each {
if (it.group != null && it.name != null) {
def dependencyNode = dependenciesNode.appendNode('dependency')
dependencyNode.appendNode('groupId', it.group)
dependencyNode.appendNode('artifactId', it.name)
dependencyNode.appendNode('version', it.version)
licenses {
license {
name = 'MIT License'
}
}

inceptionYear = '2014'
scm {
url = 'https://github.com/AzureAD/azure-activedirectory-library-for-android/tree/master'
}
properties = [
branch : 'master',
version: project.version
]
}

artifact(sourcesJar)
artifact(javadocJar)
artifact("$buildDir/outputs/aar/adal-${project.version}.aar")
}

}
Expand Down
1 change: 1 addition & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
V.Next
---------
- [PATCH] YubiKit 2.5.0 and CredMan 1.2.2 (#1793)
- [PATCH] Editing pom task (#1794)

Version 4.8.9
---------
Expand Down
2 changes: 1 addition & 1 deletion common
Submodule common updated 45 files
+1 −1 LabApiUtilities/src/main/com/microsoft/identity/labapi/utilities/constants/LabConstants.java
+1 −1 LabApiUtilities/src/main/com/microsoft/identity/labapi/utilities/constants/UserType.java
+0 −4 azure-pipelines/continuous-delivery/common-cd.yml
+4 −1 azure-pipelines/templates/steps/continuous-delivery/assemble-publish-projversion.yml
+1 −0 .../src/main/java/com/microsoft/identity/common/nativeauth/internal/commands/ResetPasswordResendCodeCommand.kt
+1 −0 common/src/main/java/com/microsoft/identity/common/nativeauth/internal/commands/ResetPasswordStartCommand.kt
+1 −0 .../src/main/java/com/microsoft/identity/common/nativeauth/internal/commands/ResetPasswordSubmitCodeCommand.kt
+1 −0 ...in/java/com/microsoft/identity/common/nativeauth/internal/commands/ResetPasswordSubmitNewPasswordCommand.kt
+1 −0 common/src/main/java/com/microsoft/identity/common/nativeauth/internal/commands/SignInResendCodeCommand.kt
+1 −0 common/src/main/java/com/microsoft/identity/common/nativeauth/internal/commands/SignInStartCommand.kt
+1 −0 common/src/main/java/com/microsoft/identity/common/nativeauth/internal/commands/SignInSubmitCodeCommand.kt
+1 −0 common/src/main/java/com/microsoft/identity/common/nativeauth/internal/commands/SignInSubmitPasswordCommand.kt
+1 −0 .../main/java/com/microsoft/identity/common/nativeauth/internal/commands/SignInWithContinuationTokenCommand.kt
+1 −0 common/src/main/java/com/microsoft/identity/common/nativeauth/internal/commands/SignUpResendCodeCommand.kt
+1 −0 common/src/main/java/com/microsoft/identity/common/nativeauth/internal/commands/SignUpStartCommand.kt
+1 −0 common/src/main/java/com/microsoft/identity/common/nativeauth/internal/commands/SignUpSubmitCodeCommand.kt
+1 −0 common/src/main/java/com/microsoft/identity/common/nativeauth/internal/commands/SignUpSubmitPasswordCommand.kt
+0 −1 common/src/main/java/com/microsoft/identity/common/nativeauth/internal/controllers/BaseNativeAuthController.kt
+25 −0 common/src/main/java/com/microsoft/identity/common/nativeauth/internal/controllers/NativeAuthMsalController.kt
+4 −2 common4j/src/main/com/microsoft/identity/common/java/nativeauth/authorities/NativeAuthCIAMAuthority.kt
+0 −62 common4j/src/main/com/microsoft/identity/common/java/nativeauth/providers/NativeAuthOAuth2Configuration.kt
+0 −76 common4j/src/main/com/microsoft/identity/common/java/nativeauth/providers/NativeAuthOAuth2Strategy.kt
+0 −91 common4j/src/main/com/microsoft/identity/common/java/nativeauth/providers/NativeAuthRequestProvider.kt
+0 −2 common4j/src/main/com/microsoft/identity/common/java/nativeauth/providers/NativeAuthResponseHandler.kt
+140 −11 ...n4j/src/main/com/microsoft/identity/common/java/nativeauth/providers/interactors/ResetPasswordInteractor.kt
+101 −10 common4j/src/main/com/microsoft/identity/common/java/nativeauth/providers/interactors/SignInInteractor.kt
+121 −5 common4j/src/main/com/microsoft/identity/common/java/nativeauth/providers/interactors/SignUpInteractor.kt
+0 −6 ...soft/identity/common/java/nativeauth/providers/responses/resetpassword/ResetPasswordChallengeApiResponse.kt
+0 −5 ...osoft/identity/common/java/nativeauth/providers/responses/resetpassword/ResetPasswordContinueApiResponse.kt
+0 −6 ...identity/common/java/nativeauth/providers/responses/resetpassword/ResetPasswordPollCompletionApiResponse.kt
+0 −6 ...icrosoft/identity/common/java/nativeauth/providers/responses/resetpassword/ResetPasswordStartApiResponse.kt
+0 −6 ...crosoft/identity/common/java/nativeauth/providers/responses/resetpassword/ResetPasswordSubmitApiResponse.kt
+0 −6 ...main/com/microsoft/identity/common/java/nativeauth/providers/responses/signin/SignInChallengeApiResponse.kt
+0 −6 .../main/com/microsoft/identity/common/java/nativeauth/providers/responses/signin/SignInInitiateApiResponse.kt
+0 −6 ...src/main/com/microsoft/identity/common/java/nativeauth/providers/responses/signin/SignInTokenApiResponse.kt
+0 −6 ...main/com/microsoft/identity/common/java/nativeauth/providers/responses/signup/SignUpChallengeApiResponse.kt
+0 −6 .../main/com/microsoft/identity/common/java/nativeauth/providers/responses/signup/SignUpContinueApiResponse.kt
+0 −6 ...src/main/com/microsoft/identity/common/java/nativeauth/providers/responses/signup/SignUpStartApiResponse.kt
+2 −1 labapi/src/main/java/com/microsoft/identity/internal/test/labapi/api/CreateTempUserApi.java
+6 −2 uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/browser/BrowserChrome.java
+30 −6 ...ain/java/com/microsoft/identity/client/ui/automation/interaction/microsoftsts/AadLoginComponentHandler.java
+17 −5 ...in/java/com/microsoft/identity/client/ui/automation/interaction/microsoftsts/AdfsLoginComponentHandler.java
+1 −4 uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/rules/RulesHelper.java
+1 −0 uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/utils/CommonUtils.java
+33 −3 uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/utils/UiAutomatorUtils.java
Loading