Merge pull request #69 from adobe/development

Development
adobe · Dec 19, 2019 · 01b6ad0 · 01b6ad0
2 parents 73fa8bf + 7846402
commit 01b6ad0
Show file tree

Hide file tree

Showing 10 changed files with 2 additions and 3,192 deletions.
diff --git a/angular-app/package-lock.json b/angular-app/package-lock.json
diff --git a/angular-app/package.json b/angular-app/package.json
@@ -47,7 +47,6 @@
     "chart.js": "^2.7.2",
     "core-js": "^2.5.4",
     "node-fetch": "^2.2.0",
-    "npm": "^6.4.1",
     "request": "^2.87.0",
     "rxjs": "^6.0.0",
     "ts-loader": "^4.4.2",

diff --git a/bundles/commons/pom.xml b/bundles/commons/pom.xml
@@ -161,13 +161,6 @@
             <artifactId>annotations</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <version>2.8.4</version>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>com.adobe.aem</groupId>
             <artifactId>uber-jar</artifactId>

diff --git a/bundles/core/pom.xml b/bundles/core/pom.xml
@@ -343,18 +343,6 @@
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.commons.osgi</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.i18n</artifactId>

diff --git a/bundles/core/src/test/resources/findbugs-exclude.xml b/bundles/core/src/test/resources/findbugs-exclude.xml
diff --git a/bundles/ssr/pom.xml b/bundles/ssr/pom.xml
@@ -307,14 +307,6 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.adobe.aem</groupId>
             <artifactId>uber-jar</artifactId>

diff --git a/bundles/ssr/src/test/resources/findbugs-exclude.xml b/bundles/ssr/src/test/resources/findbugs-exclude.xml
diff --git a/pom.xml b/pom.xml
@@ -661,26 +661,6 @@
                 <scope>provided</scope>
             </dependency>
 
-            <!-- Jackson -->
-            <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-annotations</artifactId>
-                <version>2.8.4</version>
-                <scope>provided</scope>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-databind</artifactId>
-                <version>2.8.4</version>
-                <scope>provided</scope>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-core</artifactId>
-                <version>2.8.4</version>
-                <scope>provided</scope>
-            </dependency>
-
             <!-- Servlet API -->
             <dependency>
                 <groupId>javax.servlet</groupId>

diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml
@@ -188,7 +188,7 @@
                                     <goal>install</goal>
                                 </goals>
                                 <configuration>
-                                    <targetURL>${quickstart.url}/crx/packmgr/service.jsp</targetURL>
+                                    <targetURL>${quickstart.publish.url}/crx/packmgr/service.jsp</targetURL>
                                     <failOnError>true</failOnError>
                                 </configuration>
                             </execution>

diff --git a/ui.content/pom.xml b/ui.content/pom.xml
@@ -188,7 +188,7 @@
                                     <goal>install</goal>
                                 </goals>
                                 <configuration>
-                                    <targetURL>${quickstart.url}/crx/packmgr/service.jsp</targetURL>
+                                    <targetURL>${quickstart.publish.url}/crx/packmgr/service.jsp</targetURL>
                                     <failOnError>true</failOnError>
                                 </configuration>
                             </execution>