You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by an...@apache.org on 2020/09/13 01:57:45 UTC
[sling-org-apache-sling-kickstart] branch master updated: Updated
feature model files and removed the instruction on how to create the
feature model files as this is not needed anymore
This is an automated email from the ASF dual-hosted git repository.
andysch pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-kickstart.git
The following commit(s) were added to refs/heads/master by this push:
new 863e9e5 Updated feature model files and removed the instruction on how to create the feature model files as this is not needed anymore
new 62f3829 Merge branch 'master' of github.com:apache/sling-org-apache-sling-kickstart
863e9e5 is described below
commit 863e9e5f2c1a48bf99ed83b9f02321c706b42c77
Author: Andreas Schaefer <sc...@iMac.local>
AuthorDate: Sat Sep 12 18:52:21 2020 -0700
Updated feature model files and removed the instruction on how to create the feature model files as this is not needed anymore
---
Readme.md | 21 ++--
pom.xml | 48 +--------
sling-fm-pom.xml | 187 ----------------------------------
src/main/resources/features/base.json | 4 +-
src/main/resources/features/boot.json | 3 +
5 files changed, 16 insertions(+), 247 deletions(-)
diff --git a/Readme.md b/Readme.md
index 24901ac..e15577b 100644
--- a/Readme.md
+++ b/Readme.md
@@ -25,21 +25,10 @@ This plugin depends on the **Sling Kickstart Maven Plugin** which is then used t
## Update to the Latest Sling
-This project ships with a Sling 12 Feature Model that is pretty soon outdated
-and will only be updated on the next release.
-That said this project contains the means to update that file if you need to do so:
-
-1. Checkout the **Sling Starter Project** (sling-org-apache-sling-starter
-2. Run the **sling-fm-pom.xml** build with the sling starter path as property
-```
-mvn -f sling-fm-pom.xml clean package -Dsling.starter.folder=<path to the sling starter folder> -P create-far
-```
-3. Copy the Sling12 Feature File: **target/slingfeature-tmp/feature-sling12.json** into the
-**src/main/resources/standalone/fm** folder replacing the old one
-4. Copy the Sling12 Feature File: **target/org.apache.sling.kickstart-\*.far** into the
-**src/main/resources/standalone/far** folder replacing the old one by renaming it to
-**org.apache.sling.kickstart.far**.
-5. Build the Kickstart project (see above in **Build**) and then run it (see below in **Usage**)
+This project contains a copy of the Sling Starter features models and uses the **oak-tar**
+configuration for its internal Sling 12 Feature Archive.
+To update you just need to copy all available feature models from the Sling Starter module
+and place it into the **src/main/resources/features** folder.
## Usage
@@ -142,6 +131,8 @@ If no other Feature Module file is provided this launch aborts.
The Kickstart project also comes with the Feature Models and the scripts to run
a Sling Composite Node Store as well having the option to upgrade a Sling instance
afterwards.
+**Note**: keep in mind that these feature model files are not based on the latest
+Sling 12 feature models.
#### Feature Models
diff --git a/pom.xml b/pom.xml
index 916ff36..ac44dd3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
<sling-kickstart-maven-plugin.version>0.0.6</sling-kickstart-maven-plugin.version>
<slingfeature-maven-plugin.version>1.3.14</slingfeature-maven-plugin.version>
- <picocli.version>3.9.6</picocli.version>
+ <picocli.version>4.5.1</picocli.version>
<org.apache.sling.feature.launcher.version>1.1.4</org.apache.sling.feature.launcher.version>
<org.apache.sling.feature.extension.content.version>1.0.6</org.apache.sling.feature.extension.content.version>
<org.apache.felix.framework.version>6.0.3</org.apache.felix.framework.version>
@@ -50,8 +50,8 @@
<commons-lang.version>2.6</commons-lang.version>
<osgi.core.version>7.0.0</osgi.core.version>
- <org.apache.felix.utils.version>1.11.2</org.apache.felix.utils.version>
- <httpclient.version>4.5.10</httpclient.version>
+ <org.apache.felix.utils.version>1.11.4</org.apache.felix.utils.version>
+ <httpclient.version>4.5.12</httpclient.version>
<IT.expected.bundles.count>126</IT.expected.bundles.count>
<block.sling.at.the.end>false</block.sling.at.the.end>
@@ -189,46 +189,6 @@
</goals>
</execution>
</executions>
-<!-- <executions>-->
-<!-- <execution>-->
-<!-- <id>aggregate-base-sling-feature</id>-->
-<!-- <phase>compile</phase>-->
-<!-- <goals>-->
-<!-- <goal>aggregate-features</goal>-->
-<!-- </goals>-->
-<!-- <configuration>-->
-<!-- <aggregates>-->
-<!-- <aggregate>-->
-<!-- <classifier>sling12</classifier>-->
-<!-- <filesInclude>**/*.json</filesInclude>-->
-<!-- <title>Sling 12 Feature Model</title>-->
-<!-- </aggregate>-->
-<!-- </aggregates>-->
-<!-- </configuration>-->
-<!-- </execution>-->
-<!-- <execution>-->
-<!-- <id>install-feature</id>-->
-<!-- <phase>compile</phase>-->
-<!-- <goals>-->
-<!-- <goal>attach-features</goal>-->
-<!-- </goals>-->
-<!-- </execution>-->
-<!-- <execution>-->
-<!-- <id>create-sling-feature-archives</id>-->
-<!-- <phase>compile</phase>-->
-<!-- <goals>-->
-<!-- <goal>attach-featurearchives</goal>-->
-<!-- </goals>-->
-<!-- <configuration>-->
-<!-- <archives>-->
-<!-- <archive>-->
-<!-- <classifier>sling12far</classifier>-->
-<!-- <includeClassifier>sling12</includeClassifier>-->
-<!-- </archive>-->
-<!-- </archives>-->
-<!-- </configuration>-->
-<!-- </execution>-->
-<!-- </executions>-->
</plugin>
<!-- Take out the version to avoid having to update that in the code -->
<plugin>
@@ -279,6 +239,8 @@
<exclude>conf/**</exclude>
<exclude>launcher/**</exclude>
<exclude>bin/**.sh</exclude>
+ <exclude>bin/**.sh</exclude>
+ <exclude>src/main/resources/default/.keep.folder.alive</exclude>
</excludes>
</configuration>
</plugin>
diff --git a/sling-fm-pom.xml b/sling-fm-pom.xml
deleted file mode 100644
index e2ccfac..0000000
--- a/sling-fm-pom.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the 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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>39</version>
- <relativePath />
- </parent>
-
- <artifactId>org.apache.sling.kickstart</artifactId>
- <version>0.0.6</version>
- <name>Sling Kickstart Conversion</name>
- <description>Complete Sling 12 Feature Model</description>
- <packaging>slingosgifeature</packaging>
-
- <properties>
- <slingfeature-maven-plugin.version>1.3.4</slingfeature-maven-plugin.version>
- <sling-feature-converter-maven-plugin.version>1.0.4</sling-feature-converter-maven-plugin.version>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.sling</groupId>
- <artifactId>sling-feature-converter-maven-plugin</artifactId>
- <version>${sling-feature-converter-maven-plugin.version}</version>
- <extensions>true</extensions>
- <executions>
- <execution>
- <id>convert-pm</id>
- <phase>process-classes</phase>
- <goals>
- <goal>convert-pm</goal>
- </goals>
- <configuration>
- <inputFolder>${sling.starter.folder}/src/main/provisioning</inputFolder>
- <outputFolder>target/fm</outputFolder>
- <groupId>${{project.groupId}}</groupId>
- <artifactId>${{project.artifactId}}</artifactId>
- <version>${{project.version}}</version>
- <frameworkProperties>
- launchpad:felix.systempackages.substitution=true,
- launchpad:felix.systempackages.calculate.uses=true
- </frameworkProperties>
- <excludeBundles>
- org.apache.sling.launchpad.installer,
- org.apache.sling.jcr.repoinit.impl.RepositoryInitializer
- </excludeBundles>
- <runModes>
- oak_tar,
- :standalone
- </runModes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.sling</groupId>
- <artifactId>slingfeature-maven-plugin</artifactId>
- <version>${slingfeature-maven-plugin.version}</version>
- <extensions>true</extensions>
- <configuration>
- <features>target/fm</features>
- <generatedFeatures>${basedir}/target/fm</generatedFeatures>
- </configuration>
- <executions>
- <execution>
- <id>aggregate-base-sling-feature</id>
- <phase>package</phase>
- <goals>
- <goal>aggregate-features</goal>
- </goals>
- <configuration>
- <aggregates>
- <aggregate>
- <classifier>sling12</classifier>
- <filesInclude>**/*.json</filesInclude>
- <title>Sling 12 Feature Model</title>
- </aggregate>
- </aggregates>
- </configuration>
- </execution>
- <execution>
- <id>install-feature</id>
- <phase>package</phase>
- <goals>
- <goal>attach-features</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>Readme.md</exclude>
- <exclude>src/main/resources/META-INF/services/**</exclude>
- <exclude>**/*.properties</exclude>
- <exclude>conf/**</exclude>
- <exclude>launcher/**</exclude>
- <exclude>bin/**.sh</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <version>3.0.0-M1</version>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>ianal-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>verify-legal-files</id>
- <goals>
- <goal>verify-legal-files</goal>
- </goals>
- <configuration>
- <!-- Fail the build if any artifacts are missing legal files -->
- <strict>false</strict>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-<!-- <profiles>-->
-<!-- <profile>-->
-<!-- <id>create-far</id>-->
-<!-- <build>-->
-<!-- <plugins>-->
-<!-- <plugin>-->
-<!-- <groupId>org.apache.sling</groupId>-->
-<!-- <artifactId>slingfeature-maven-plugin</artifactId>-->
-<!-- <version>${slingfeature-maven-plugin.version}</version>-->
-<!-- <extensions>true</extensions>-->
-<!-- <configuration>-->
-<!-- <features>target/fm</features>-->
-<!-- <generatedFeatures>${basedir}/target/fm</generatedFeatures>-->
-<!-- </configuration>-->
-<!-- <executions>-->
-<!-- <execution>-->
-<!-- <id>create-sling-feature-archives</id>-->
-<!-- <phase>package</phase>-->
-<!-- <goals>-->
-<!-- <goal>attach-featurearchives</goal>-->
-<!-- </goals>-->
-<!-- <configuration>-->
-<!-- <archives>-->
-<!-- <archive>-->
-<!-- <classifier>sling12far</classifier>-->
-<!-- <includeClassifier>sling12</includeClassifier>-->
-<!-- </archive>-->
-<!-- </archives>-->
-<!-- </configuration>-->
-<!-- </execution>-->
-<!-- </executions>-->
-<!-- </plugin>-->
-<!-- </plugins>-->
-<!-- </build>-->
-<!-- </profile>-->
-<!-- </profiles>-->
-</project>
diff --git a/src/main/resources/features/base.json b/src/main/resources/features/base.json
index eb88b40..4537744 100644
--- a/src/main/resources/features/base.json
+++ b/src/main/resources/features/base.json
@@ -98,7 +98,7 @@
"start-order":"20"
},
{
- "id":"org.apache.sling:org.apache.sling.resourceresolver:1.6.16",
+ "id":"org.apache.sling:org.apache.sling.resourceresolver:1.7.0",
"start-order":"20"
},
{
@@ -174,7 +174,7 @@
"start-order":"5"
},
{
- "id":"org.apache.sling:org.apache.sling.auth.core:1.4.8",
+ "id":"org.apache.sling:org.apache.sling.auth.core:1.5.0",
"start-order":"5"
},
{
diff --git a/src/main/resources/features/boot.json b/src/main/resources/features/boot.json
index ab52b1a..ca0c4ae 100644
--- a/src/main/resources/features/boot.json
+++ b/src/main/resources/features/boot.json
@@ -1,5 +1,8 @@
{
+ "variables": {
+ "sling.home": null
+ },
"bundles":[
{
"id":"org.apache.aries:org.apache.aries.util:1.1.3",