You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 10:23:50 UTC

[sling-org-apache-sling-tooling-support-install] annotated tag org.apache.sling.tooling.support.install-1.0.4 created (now dbe2d97)

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a change to annotated tag org.apache.sling.tooling.support.install-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-tooling-support-install.git.


      at dbe2d97  (tag)
 tagging 71f68cf40cddb3e8dda7574b13cb8ae1331e35bb (commit)
      by Karl Pauls
      on Fri Jun 2 21:38:58 2017 +0000

- Log -----------------------------------------------------------------
org.apache.sling.tooling.support.install-1.0.4
-----------------------------------------------------------------------

This annotated tag includes the following new commits:

     new 95d0a15  SLING-3019 :  Provide a mechanism to install a bundle based on a directory
     new ddb53ae  SLING-3019 - Provide a mechanism to install a bundle based on a directory
     new 598b744  SLING-3019 - Provide a mechanism to install a bundle based on a directory
     new 3116ce4  SLING-3019 - Provide a mechanism to install a bundle based on a directory
     new c309ada  SLING-3019 - Provide a mechanism to install a bundle based on a directory
     new 030c09e  [maven-release-plugin] prepare release org.apache.sling.tooling.support.install-1.0.0
     new 7c29e7d  [maven-release-plugin] prepare for next development iteration
     new 97615d0  no-jira : typo in error message
     new 5fe1011  Removed .settings dir
     new a290e88  SLING-4405 - Unable to install new bundle using the jar upload mechanism
     new 76d4257  [maven-release-plugin] prepare release org.apache.sling.tooling.support.install-1.0.2
     new f5d29d3  [maven-release-plugin] prepare for next development iteration
     new 01a5b1c  Update the main reactor to parent 25
     new 6bd0b58  Switch to parent pom 26
     new d0f8b73  SLING-6907: Remove commons.json from Tooling Support Install
     new 0e6178e  [maven-release-plugin] prepare release org.apache.sling.tooling.support.install-1.0.4
     new 71f68cf  [maven-release-plugin] copy for tag org.apache.sling.tooling.support.install-1.0.4

The 17 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


-- 
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].

[sling-org-apache-sling-tooling-support-install] 05/06: [maven-release-plugin] prepare release org.apache.sling.tooling.support.install-1.0.4

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.tooling.support.install-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-tooling-support-install.git

commit 0e6178ea8f153dcb3ec82a8b451c5e184b4f00d6
Author: Karl Pauls <pa...@apache.org>
AuthorDate: Fri Jun 2 21:38:43 2017 +0000

    [maven-release-plugin] prepare release org.apache.sling.tooling.support.install-1.0.4
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/support/install@1797457 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index d28e5ce..1369c62 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,15 +27,15 @@
     </parent>
 
     <artifactId>org.apache.sling.tooling.support.install</artifactId>
-    <version>1.0.3-SNAPSHOT</version>
+    <version>1.0.4</version>
     <packaging>bundle</packaging>
 
     <name>Apache Sling Tooling Support Install</name>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/tooling/support/install</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/support/install</developerConnection>
-        <url>http://svn.apache.org/viewvc/sling/trunk/tooling/support/install</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.tooling.support.install-1.0.4</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.tooling.support.install-1.0.4</developerConnection>
+        <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.tooling.support.install-1.0.4</url>
     </scm>
 
     <build>

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-tooling-support-install] 02/06: Update the main reactor to parent 25

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.tooling.support.install-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-tooling-support-install.git

commit 01a5b1c55fe52f89f4de9c1611143751007703a4
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Mon Oct 5 10:03:45 2015 +0000

    Update the main reactor to parent 25
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/support/install@1706780 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6949941..f1f01dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>17</version>
+        <version>25</version>
     </parent>
 
     <groupId>org.apache.sling</groupId>

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-tooling-support-install] 03/06: Switch to parent pom 26

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.tooling.support.install-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-tooling-support-install.git

commit 6bd0b583cde37a01e6962ee5023554b7b00fea80
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Sun Jan 3 14:07:46 2016 +0000

    Switch to parent pom 26
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/support/install@1722720 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f1f01dc..2615b24 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>25</version>
+        <version>26</version>
     </parent>
 
     <groupId>org.apache.sling</groupId>

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-tooling-support-install] 06/06: [maven-release-plugin] copy for tag org.apache.sling.tooling.support.install-1.0.4

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.tooling.support.install-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-tooling-support-install.git

commit 71f68cf40cddb3e8dda7574b13cb8ae1331e35bb
Author: Karl Pauls <pa...@apache.org>
AuthorDate: Fri Jun 2 21:38:58 2017 +0000

    [maven-release-plugin] copy for tag org.apache.sling.tooling.support.install-1.0.4
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.tooling.support.install-1.0.4@1797458 13f79535-47bb-0310-9956-ffa450edef68

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-tooling-support-install] 01/06: [maven-release-plugin] prepare for next development iteration

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.tooling.support.install-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-tooling-support-install.git

commit f5d29d334e9f6e3f40e8e9eb1398563be3295367
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu Feb 19 08:51:27 2015 +0000

    [maven-release-plugin] prepare for next development iteration
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/support/install@1660813 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 30248fd..6949941 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,15 +28,15 @@
 
     <groupId>org.apache.sling</groupId>
     <artifactId>org.apache.sling.tooling.support.install</artifactId>
-    <version>1.0.2</version>
+    <version>1.0.3-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>Apache Sling Tooling Support Install</name>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.tooling.support.install-1.0.2</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.tooling.support.install-1.0.2</developerConnection>
-        <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.tooling.support.install-1.0.2</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/tooling/support/install</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/support/install</developerConnection>
+        <url>http://svn.apache.org/viewvc/sling/trunk/tooling/support/install</url>
     </scm>
 
     <build>

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.

[sling-org-apache-sling-tooling-support-install] 04/06: SLING-6907: Remove commons.json from Tooling Support Install

Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.tooling.support.install-1.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-tooling-support-install.git

commit d0f8b73139d48f61e73a3927099f4c62ac00081f
Author: Karl Pauls <pa...@apache.org>
AuthorDate: Thu Jun 1 20:04:44 2017 +0000

    SLING-6907: Remove commons.json from Tooling Support Install
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/support/install@1797257 13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml                                                  | 16 +++++++++-------
 .../tooling/support/install/impl/InstallationResult.java |  6 +++---
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2615b24..d28e5ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,6 @@
         <version>26</version>
     </parent>
 
-    <groupId>org.apache.sling</groupId>
     <artifactId>org.apache.sling.tooling.support.install</artifactId>
     <version>1.0.3-SNAPSHOT</version>
     <packaging>bundle</packaging>
@@ -54,6 +53,9 @@
                         <Private-Package>
                             org.apache.sling.tooling.support.install.impl
                         </Private-Package>
+                        <Embed-Dependency>
+                                org.apache.felix.utils;inline=org/apache/felix/utils/json/JSONWriter.class
+                        </Embed-Dependency>
                     </instructions>
                 </configuration>
             </plugin>
@@ -82,12 +84,6 @@
             <artifactId>org.osgi.compendium</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.commons.json</artifactId>
-            <version>2.0.6</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
             <version>2.4</version>
@@ -105,5 +101,11 @@
             <version>1.2.2</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.utils</artifactId>
+            <version>1.9.0</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/src/main/java/org/apache/sling/tooling/support/install/impl/InstallationResult.java b/src/main/java/org/apache/sling/tooling/support/install/impl/InstallationResult.java
index c498d88..bd85870 100644
--- a/src/main/java/org/apache/sling/tooling/support/install/impl/InstallationResult.java
+++ b/src/main/java/org/apache/sling/tooling/support/install/impl/InstallationResult.java
@@ -16,11 +16,11 @@
  */
 package org.apache.sling.tooling.support.install.impl;
 
+import java.io.IOException;
 import java.io.Writer;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.sling.commons.json.JSONException;
-import org.apache.sling.commons.json.io.JSONWriter;
+import org.apache.felix.utils.json.JSONWriter;
 
 public class InstallationResult {
 
@@ -42,7 +42,7 @@ public class InstallationResult {
                 writer.key("message").value(message);
             }
             writer.endObject();
-        } catch (JSONException e) {
+        } catch (IOException e) {
             // never happens
             throw new RuntimeException(e);
         }

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.