You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2018/03/17 22:54:40 UTC
[sling-org-apache-sling-karaf-distribution] branch master updated
(bbe7558 -> 6f16ffb)
This is an automated email from the ASF dual-hosted git repository.
olli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-distribution.git.
from bbe7558 SLING-7532 Replace feature sling-launchpad-content by sling-starter-content
new 21b17f2 remove version property
new 6f16ffb decouple versions
The 2 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:
pom.xml | 84 +++++++++++++++++++++++++++++++----------------------------------
1 file changed, 40 insertions(+), 44 deletions(-)
--
To stop receiving notification emails like this one, please contact
olli@apache.org.
[sling-org-apache-sling-karaf-distribution] 02/02: decouple versions
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-distribution.git
commit 6f16ffb0e3beea4a7df9624ccff0b66ad54c82d2
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Mar 17 21:49:13 2018 +0100
decouple versions
---
pom.xml | 74 ++++++++++++++++++++++++++++++++---------------------------------
1 file changed, 37 insertions(+), 37 deletions(-)
diff --git a/pom.xml b/pom.xml
index ddbcfd8..ccb9bbf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.karaf-features</artifactId>
- <version>${project.version}</version>
+ <version>0.1.1-SNAPSHOT</version>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
@@ -69,7 +69,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.karaf-configs</artifactId>
- <version>${project.version}</version>
+ <version>0.1.1-SNAPSHOT</version>
<classifier>org.apache.felix.jaas.Configuration.factory-GuestLoginModule</classifier>
<type>config</type>
<scope>runtime</scope>
@@ -77,7 +77,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.karaf-configs</artifactId>
- <version>${project.version}</version>
+ <version>0.1.1-SNAPSHOT</version>
<classifier>org.apache.felix.jaas.Configuration.factory-LoginModuleImpl</classifier>
<type>config</type>
<scope>runtime</scope>
@@ -85,7 +85,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.karaf-configs</artifactId>
- <version>${project.version}</version>
+ <version>0.1.1-SNAPSHOT</version>
<classifier>org.apache.felix.jaas.Configuration.factory-TokenLoginModule</classifier>
<type>config</type>
<scope>runtime</scope>
@@ -93,7 +93,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.karaf-configs</artifactId>
- <version>${project.version}</version>
+ <version>0.1.1-SNAPSHOT</version>
<classifier>org.apache.felix.jaas.ConfigurationSpi</classifier>
<type>config</type>
<scope>runtime</scope>
@@ -101,7 +101,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.karaf-configs</artifactId>
- <version>${project.version}</version>
+ <version>0.1.1-SNAPSHOT</version>
<classifier>org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService</classifier>
<type>config</type>
<scope>runtime</scope>
@@ -109,7 +109,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.karaf-configs</artifactId>
- <version>${project.version}</version>
+ <version>0.1.1-SNAPSHOT</version>
<classifier>org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService</classifier>
<type>config</type>
<scope>runtime</scope>
@@ -117,7 +117,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.karaf-configs</artifactId>
- <version>${project.version}</version>
+ <version>0.1.1-SNAPSHOT</version>
<classifier>org.apache.jackrabbit.oak.segment.SegmentNodeStoreService</classifier>
<type>config</type>
<scope>runtime</scope>
@@ -125,7 +125,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.karaf-configs</artifactId>
- <version>${project.version}</version>
+ <version>0.1.1-SNAPSHOT</version>
<classifier>org.apache.jackrabbit.oak.security.authentication.AuthenticationConfigurationImpl</classifier>
<type>config</type>
<scope>runtime</scope>
@@ -133,7 +133,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.karaf-configs</artifactId>
- <version>${project.version}</version>
+ <version>0.1.1-SNAPSHOT</version>
<classifier>org.apache.jackrabbit.oak.security.user.RandomAuthorizableNodeName</classifier>
<type>config</type>
<scope>runtime</scope>
@@ -141,7 +141,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.karaf-configs</artifactId>
- <version>${project.version}</version>
+ <version>0.1.1-SNAPSHOT</version>
<classifier>org.apache.jackrabbit.oak.security.user.UserConfigurationImpl</classifier>
<type>config</type>
<scope>runtime</scope>
@@ -149,7 +149,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.karaf-configs</artifactId>
- <version>${project.version}</version>
+ <version>0.1.1-SNAPSHOT</version>
<classifier>org.apache.jackrabbit.oak.spi.security.user.action.DefaultAuthorizableActionProvider</classifier>
<type>config</type>
<scope>runtime</scope>
@@ -157,7 +157,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.karaf-configs</artifactId>
- <version>${project.version}</version>
+ <version>0.1.1-SNAPSHOT</version>
<classifier>org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-composum</classifier>
<type>config</type>
<scope>runtime</scope>
@@ -165,7 +165,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.karaf-configs</artifactId>
- <version>${project.version}</version>
+ <version>0.1.1-SNAPSHOT</version>
<classifier>org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-sling</classifier>
<type>config</type>
<scope>runtime</scope>
@@ -173,7 +173,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.karaf-configs</artifactId>
- <version>${project.version}</version>
+ <version>0.1.1-SNAPSHOT</version>
<classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer-sling</classifier>
<type>config</type>
<scope>runtime</scope>
@@ -181,7 +181,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.karaf-configs</artifactId>
- <version>${project.version}</version>
+ <version>0.1.1-SNAPSHOT</version>
<classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_discovery</classifier>
<type>config</type>
<scope>runtime</scope>
@@ -189,7 +189,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.karaf-configs</artifactId>
- <version>${project.version}</version>
+ <version>0.1.1-SNAPSHOT</version>
<classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_event</classifier>
<type>config</type>
<scope>runtime</scope>
@@ -197,7 +197,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.karaf-configs</artifactId>
- <version>${project.version}</version>
+ <version>0.1.1-SNAPSHOT</version>
<classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_i18n</classifier>
<type>config</type>
<scope>runtime</scope>
@@ -205,7 +205,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.karaf-configs</artifactId>
- <version>${project.version}</version>
+ <version>0.1.1-SNAPSHOT</version>
<classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_installer_jcr</classifier>
<type>config</type>
<scope>runtime</scope>
@@ -213,7 +213,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.karaf-configs</artifactId>
- <version>${project.version}</version>
+ <version>0.1.1-SNAPSHOT</version>
<classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_scripting</classifier>
<type>config</type>
<scope>runtime</scope>
@@ -221,7 +221,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.karaf-configs</artifactId>
- <version>${project.version}</version>
+ <version>0.1.1-SNAPSHOT</version>
<classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_validation</classifier>
<type>config</type>
<scope>runtime</scope>
@@ -229,7 +229,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.karaf-configs</artifactId>
- <version>${project.version}</version>
+ <version>0.1.1-SNAPSHOT</version>
<classifier>org.apache.sling.jcr.repoinit.RepositoryInitializer-sling_xss</classifier>
<type>config</type>
<scope>runtime</scope>
@@ -237,7 +237,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.karaf-configs</artifactId>
- <version>${project.version}</version>
+ <version>0.1.1-SNAPSHOT</version>
<classifier>org.apache.sling.nosql.couchbase.client.CouchbaseClient.factory.config-default</classifier>
<type>config</type>
<scope>runtime</scope>
@@ -245,7 +245,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.karaf-configs</artifactId>
- <version>${project.version}</version>
+ <version>0.1.1-SNAPSHOT</version>
<classifier>org.apache.sling.nosql.couchbase.resourceprovider.CouchbaseNoSqlResourceProviderFactory.factory.config-default</classifier>
<type>config</type>
<scope>runtime</scope>
@@ -253,7 +253,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.karaf-configs</artifactId>
- <version>${project.version}</version>
+ <version>0.1.1-SNAPSHOT</version>
<classifier>org.apache.sling.nosql.mongodb.resourceprovider.MongoDBNoSqlResourceProviderFactory.factory.config-default</classifier>
<type>config</type>
<scope>runtime</scope>
@@ -261,7 +261,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.karaf-configs</artifactId>
- <version>${project.version}</version>
+ <version>0.1.1-SNAPSHOT</version>
<classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-discovery</classifier>
<type>config</type>
<scope>runtime</scope>
@@ -269,7 +269,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.karaf-configs</artifactId>
- <version>${project.version}</version>
+ <version>0.1.1-SNAPSHOT</version>
<classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-event</classifier>
<type>config</type>
<scope>runtime</scope>
@@ -277,7 +277,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.karaf-configs</artifactId>
- <version>${project.version}</version>
+ <version>0.1.1-SNAPSHOT</version>
<classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-i18n</classifier>
<type>config</type>
<scope>runtime</scope>
@@ -285,7 +285,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.karaf-configs</artifactId>
- <version>${project.version}</version>
+ <version>0.1.1-SNAPSHOT</version>
<classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-installer_jcr</classifier>
<type>config</type>
<scope>runtime</scope>
@@ -293,7 +293,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.karaf-configs</artifactId>
- <version>${project.version}</version>
+ <version>0.1.1-SNAPSHOT</version>
<classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-jcr_resource</classifier>
<type>config</type>
<scope>runtime</scope>
@@ -301,7 +301,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.karaf-configs</artifactId>
- <version>${project.version}</version>
+ <version>0.1.1-SNAPSHOT</version>
<classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-resourceresolver</classifier>
<type>config</type>
<scope>runtime</scope>
@@ -309,7 +309,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.karaf-configs</artifactId>
- <version>${project.version}</version>
+ <version>0.1.1-SNAPSHOT</version>
<classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting_sightly</classifier>
<type>config</type>
<scope>runtime</scope>
@@ -317,7 +317,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.karaf-configs</artifactId>
- <version>${project.version}</version>
+ <version>0.1.1-SNAPSHOT</version>
<classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting_thymeleaf</classifier>
<type>config</type>
<scope>runtime</scope>
@@ -325,7 +325,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.karaf-configs</artifactId>
- <version>${project.version}</version>
+ <version>0.1.1-SNAPSHOT</version>
<classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-scripting</classifier>
<type>config</type>
<scope>runtime</scope>
@@ -333,7 +333,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.karaf-configs</artifactId>
- <version>${project.version}</version>
+ <version>0.1.1-SNAPSHOT</version>
<classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-servlets</classifier>
<type>config</type>
<scope>runtime</scope>
@@ -341,7 +341,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.karaf-configs</artifactId>
- <version>${project.version}</version>
+ <version>0.1.1-SNAPSHOT</version>
<classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-validation</classifier>
<type>config</type>
<scope>runtime</scope>
@@ -349,7 +349,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.karaf-configs</artifactId>
- <version>${project.version}</version>
+ <version>0.1.1-SNAPSHOT</version>
<classifier>org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-xss</classifier>
<type>config</type>
<scope>runtime</scope>
--
To stop receiving notification emails like this one, please contact
olli@apache.org.
[sling-org-apache-sling-karaf-distribution] 01/02: remove version
property
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-distribution.git
commit 21b17f2b4e96a6bc089bc349208df15327aa4278
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Mar 17 21:45:10 2018 +0100
remove version property
---
pom.xml | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index decbf91..ddbcfd8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,21 +43,17 @@
<!-- https://github.com/apache/karaf/blob/master/assemblies/apache-karaf/pom.xml -->
- <properties>
- <org.apache.karaf.version>4.2.0.M2</org.apache.karaf.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>framework</artifactId>
- <version>${org.apache.karaf.version}</version>
+ <version>4.2.0.M2</version>
<type>kar</type>
</dependency>
<dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>standard</artifactId>
- <version>${org.apache.karaf.version}</version>
+ <version>4.2.0.M2</version>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
@@ -378,7 +374,7 @@
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId>
- <version>${org.apache.karaf.version}</version>
+ <version>4.2.0.M2</version>
<extensions>true</extensions>
<executions>
<execution>
--
To stop receiving notification emails like this one, please contact
olli@apache.org.