From 3d4b3f0825df91d8591057694ca4ad5b6f6ae8c9 Mon Sep 17 00:00:00 2001
From: Mitch Denny <midenn@microsoft.com>
Date: Mon, 12 Aug 2019 21:58:01 -0700
Subject: [PATCH 1/5] Disable Jetty by default.

---
 eng/pipelines/templates/jobs/archetype-sdk-client.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
index 06ce79cd972cf..4a819441114a8 100644
--- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml
+++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
@@ -228,6 +228,7 @@ jobs:
 
       - task: Maven@3
         displayName: 'Start Jetty'
+        condition: eq(variables['EnableJetty'], 'true')
         inputs:
           mavenPomFile: pom.client.xml
           options: '$(DefaultOptions) $(ProfileFlag)'

From 9ebd5919abe568b7f7a0331f5e56732623a1b691 Mon Sep 17 00:00:00 2001
From: Mitch Denny <midenn@microsoft.com>
Date: Mon, 12 Aug 2019 22:00:30 -0700
Subject: [PATCH 2/5] Whitespace change to trigger pipeline.

---
 sdk/keyvault/ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sdk/keyvault/ci.yml b/sdk/keyvault/ci.yml
index 717c64343987e..1b95e596931bf 100644
--- a/sdk/keyvault/ci.yml
+++ b/sdk/keyvault/ci.yml
@@ -29,6 +29,7 @@ pr:
     include:
       - sdk/keyvault/
 
+
 stages:
   - template: ../../eng/pipelines/templates/stages/archetype-sdk-client.yml
     parameters:

From 17e2e8235771a9f85ab4b10a168c89e71998e355 Mon Sep 17 00:00:00 2001
From: Mitch Denny <midenn@microsoft.com>
Date: Mon, 12 Aug 2019 22:05:56 -0700
Subject: [PATCH 3/5] Remove track 1 from the build.

---
 sdk/keyvault/pom.service.xml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/sdk/keyvault/pom.service.xml b/sdk/keyvault/pom.service.xml
index 956a21dfe3d7d..771b50dac3037 100644
--- a/sdk/keyvault/pom.service.xml
+++ b/sdk/keyvault/pom.service.xml
@@ -9,22 +9,10 @@
   <packaging>pom</packaging>
   <version>1.0.0</version><!-- Need not change for every release-->
   <modules>
-
-    <!-- Track 1 -->
-    <module>microsoft-azure-keyvault</module>
-    <module>microsoft-azure-keyvault-core</module>
-    <module>microsoft-azure-keyvault-webkey</module>
-    <module>microsoft-azure-keyvault-cryptography</module>
-    <module>microsoft-azure-keyvault-extensions</module>
-    <module>microsoft-azure-keyvault-complete</module>
-    
-    <!-- Track 2 -->
     <module>../core/azure-core</module> <!-- NOTE: We need to build core so we can build against the version in the repo. -->
     <module>../core/azure-core-test</module> <!-- NOTE: We need to build core so we can build against the version in the repo. -->
     <module>../identity/azure-identity</module> <!-- NOTE: We need to build identity so we can build against the version in the repo. -->
     <module>azure-keyvault-keys</module>
     <module>azure-keyvault-secrets</module>
-    
   </modules>
-
 </project>

From 609d691818d5d03b2a889bfffc737773b89c2699 Mon Sep 17 00:00:00 2001
From: Mitch Denny <midenn@microsoft.com>
Date: Tue, 13 Aug 2019 22:14:39 -0700
Subject: [PATCH 4/5] Make jetty enabled the default (for now).

---
 eng/pipelines/templates/jobs/archetype-sdk-client.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
index 4a819441114a8..1a6b5507ede7f 100644
--- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml
+++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
@@ -228,7 +228,7 @@ jobs:
 
       - task: Maven@3
         displayName: 'Start Jetty'
-        condition: eq(variables['EnableJetty'], 'true')
+        condition: ne(variables['EnableJetty'], 'false')
         inputs:
           mavenPomFile: pom.client.xml
           options: '$(DefaultOptions) $(ProfileFlag)'

From 85895de9022d4933658d290a4b7ed398d89e7c2b Mon Sep 17 00:00:00 2001
From: Mitch Denny <midenn@microsoft.com>
Date: Tue, 13 Aug 2019 22:43:12 -0700
Subject: [PATCH 5/5] Adds pom.service.xml with profiles.

---
 sdk/keyvault/pom.service.xml | 50 ++++++++++++++++++++++++++++--------
 1 file changed, 39 insertions(+), 11 deletions(-)

diff --git a/sdk/keyvault/pom.service.xml b/sdk/keyvault/pom.service.xml
index 771b50dac3037..6aaf0c69b41fd 100644
--- a/sdk/keyvault/pom.service.xml
+++ b/sdk/keyvault/pom.service.xml
@@ -1,18 +1,46 @@
 <!-- Copyright (c) Microsoft Corporation. All rights reserved.
      Licensed under the MIT License. -->
-<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">
+<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">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.azure</groupId>
   <artifactId>azure-keyvault-service</artifactId>
   <packaging>pom</packaging>
-  <version>1.0.0</version><!-- Need not change for every release-->
-  <modules>
-    <module>../core/azure-core</module> <!-- NOTE: We need to build core so we can build against the version in the repo. -->
-    <module>../core/azure-core-test</module> <!-- NOTE: We need to build core so we can build against the version in the repo. -->
-    <module>../identity/azure-identity</module> <!-- NOTE: We need to build identity so we can build against the version in the repo. -->
-    <module>azure-keyvault-keys</module>
-    <module>azure-keyvault-secrets</module>
-  </modules>
+  <version>1.0.0</version>  <!-- Need not change for every release-->
+  <profiles>
+    <profile>
+      <id>data</id>
+      <activation>
+        <property>
+          <name>env.ENABLEJETTY</name>
+          <value>true</value>
+        </property>
+      </activation>
+      <modules>
+        <module>microsoft-azure-keyvault</module>
+        <module>microsoft-azure-keyvault-complete</module>
+        <module>microsoft-azure-keyvault-core</module>
+        <module>microsoft-azure-keyvault-cryptography</module>
+        <module>microsoft-azure-keyvault-extensions</module>
+        <module>microsoft-azure-keyvault-test</module>
+        <module>microsoft-azure-keyvault-webkey</module>
+      </modules>
+    </profile>
+    <profile>
+      <id>client</id>
+      <activation>
+        <property>
+          <name>env.ENABLEJETTY</name>
+          <value>!true</value>
+        </property>
+      </activation>
+      <modules>
+        <module>../core/azure-core</module>        <!-- NOTE: We need to build core so we can build against the version in the repo. -->
+        <module>../core/azure-core-test</module>        <!-- NOTE: We need to build core so we can build against the version in the repo. -->
+        <module>../identity/azure-identity</module>        <!-- NOTE: We need to build identity so we can build against the version in the repo. -->
+        <module>azure-keyvault-keys</module>
+        <module>azure-keyvault-secrets</module>
+      </modules>
+    </profile>
+  </profiles>
 </project>