From 8775fd0495f6636a8e0e586c3a493659de8f9c4b Mon Sep 17 00:00:00 2001 From: Melissa Ahn Date: Fri, 31 May 2024 16:15:34 -0700 Subject: [PATCH 1/3] Editing pom task --- adal/build.gradle | 73 +++++++++++++++-------------------------------- common | 2 +- 2 files changed, 24 insertions(+), 51 deletions(-) diff --git a/adal/build.gradle b/adal/build.gradle index 7cfa90b16..8fa60ac8a 100644 --- a/adal/build.gradle +++ b/adal/build.gradle @@ -224,60 +224,33 @@ 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 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) diff --git a/common b/common index a54a1f840..877fb16b0 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit a54a1f840b952967a3afa18336fad372d9fc4278 +Subproject commit 877fb16b066ab0b86a903b4822e1230364b5d136 From 966c7173151979968c6e59845ecda945ca62e6a1 Mon Sep 17 00:00:00 2001 From: Melissa Ahn Date: Fri, 31 May 2024 16:43:21 -0700 Subject: [PATCH 2/3] changelog --- changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.txt b/changelog.txt index a8bae4427..3b7ad692d 100644 --- a/changelog.txt +++ b/changelog.txt @@ -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 --------- From 7903f0e66a263671c51bb43750f108c8915fdfef Mon Sep 17 00:00:00 2001 From: Melissa Ahn Date: Sat, 1 Jun 2024 21:40:45 -0700 Subject: [PATCH 3/3] removed artifacts lines --- adal/build.gradle | 4 ---- 1 file changed, 4 deletions(-) diff --git a/adal/build.gradle b/adal/build.gradle index 8fa60ac8a..9b990a2ee 100644 --- a/adal/build.gradle +++ b/adal/build.gradle @@ -252,10 +252,6 @@ publishing { version: project.version ] } - - artifact(sourcesJar) - artifact(javadocJar) - artifact("$buildDir/outputs/aar/adal-${project.version}.aar") } }