You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by pa...@apache.org on 2019/08/15 10:55:14 UTC

[sling-org-apache-sling-feature-modelconverter] branch master updated (597cd4d -> d0f6153)

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

pauls pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-modelconverter.git.


    from 597cd4d  Merge pull request #4 from apache/SLING-8633
     new 3f2cece  [maven-release-plugin] prepare release org.apache.sling.feature.modelconverter-1.0.8
     new da79899  Merge branch 'master' of https://github.com/apache/sling-org-apache-sling-feature-modelconverter
     new d0f6153  [maven-release-plugin] rollback the release of org.apache.sling.feature.modelconverter-1.0.8

The 3 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.


Summary of changes:


[sling-org-apache-sling-feature-modelconverter] 03/03: [maven-release-plugin] rollback the release of org.apache.sling.feature.modelconverter-1.0.8

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

pauls pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-modelconverter.git

commit d0f6153f91392c5ae9bd1c8d0f4b3a0098983298
Author: Karl Pauls <ka...@gmail.com>
AuthorDate: Thu Aug 15 12:55:10 2019 +0200

    [maven-release-plugin] rollback the release of org.apache.sling.feature.modelconverter-1.0.8
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 45e5371..6109a87 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
     </parent>
 
     <artifactId>org.apache.sling.feature.modelconverter</artifactId>
-    <version>1.0.8</version>
+    <version>1.0.7-SNAPSHOT</version>
 
     <name>Apache Sling Feature Model Converter</name>
     <description>
@@ -37,7 +37,7 @@
         <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-modelconverter.git</connection>
         <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-modelconverter.git</developerConnection>
         <url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-feature-modelconverter.git</url>
-      <tag>org.apache.sling.feature.modelconverter-1.0.8</tag>
+      <tag>HEAD</tag>
   </scm>
 
     <build>


[sling-org-apache-sling-feature-modelconverter] 01/03: [maven-release-plugin] prepare release org.apache.sling.feature.modelconverter-1.0.8

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

pauls pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-modelconverter.git

commit 3f2cece1b1ac90cb9cc437acd7b9dc1db8349651
Author: Karl Pauls <ka...@gmail.com>
AuthorDate: Thu Aug 15 12:54:27 2019 +0200

    [maven-release-plugin] prepare release org.apache.sling.feature.modelconverter-1.0.8
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6109a87..45e5371 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
     </parent>
 
     <artifactId>org.apache.sling.feature.modelconverter</artifactId>
-    <version>1.0.7-SNAPSHOT</version>
+    <version>1.0.8</version>
 
     <name>Apache Sling Feature Model Converter</name>
     <description>
@@ -37,7 +37,7 @@
         <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-modelconverter.git</connection>
         <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-modelconverter.git</developerConnection>
         <url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-feature-modelconverter.git</url>
-      <tag>HEAD</tag>
+      <tag>org.apache.sling.feature.modelconverter-1.0.8</tag>
   </scm>
 
     <build>


[sling-org-apache-sling-feature-modelconverter] 02/03: Merge branch 'master' of https://github.com/apache/sling-org-apache-sling-feature-modelconverter

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

pauls pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-modelconverter.git

commit da79899a15a296368f3982ef084e0ebab2fa9d97
Merge: 3f2cece 597cd4d
Author: Karl Pauls <ka...@gmail.com>
AuthorDate: Thu Aug 15 12:54:41 2019 +0200

    Merge branch 'master' of https://github.com/apache/sling-org-apache-sling-feature-modelconverter

 .../modelconverter/FeatureToProvisioning.java      | 13 +++++---
 .../modelconverter/ProvisioningToFeature.java      |  2 +-
 src/test/resources/boot.json                       | 36 +++++++++++-----------
 src/test/resources/boot_gav.json                   | 36 +++++++++++-----------
 src/test/resources/launchpad.json                  |  4 +--
 src/test/resources/oak.json                        | 20 ++++++------
 src/test/resources/repoinit.json                   |  6 ++--
 src/test/resources/simple.json                     |  2 +-
 src/test/resources/simple2.json                    |  2 +-
 9 files changed, 62 insertions(+), 59 deletions(-)