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 2022/02/03 16:48:17 UTC
[sling-org-apache-sling-starter] branch master updated (f1979f5 -> fb83a84)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git.
from f1979f5 releng: Use Parent POM 47
new a082e11 SLING-9638 - Update Starter Docker image to be based on the feature model
new eeee699 SLING-9638 - Update Starter Docker image to be based on the feature model
new fcbb2f8 SLING-9638 - Update Starter Docker image to be based on the feature model
new c10369a SLING-9638 - Update Starter Docker image to be based on the feature model
new 9073012 SLING-9638 - Update Starter Docker image to be based on the feature model
new 4657556 SLING-9638 - Update Starter Docker image to be based on the feature model
new fb83a84 SLING-9638 - Update Starter Docker image to be based on the feature model
The 7 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:
scripts/oak-upgrade.sh => Dockerfile | 35 ++++++++---
README.md | 26 ++++++++
.../docker-compose-mongodb.yaml | 24 +++++---
.../docker-compose-tar.yaml | 20 +++---
scripts/oak-upgrade.sh => hooks/pre_build | 13 +---
pom.xml | 71 +++++++++++++++-------
.../main/container/bin/launch.sh | 28 ++++++---
src/main/features/boot.json | 7 ++-
src/main/features/docker/docker.json | 7 +++
.../oak/persistence/oak_persistence_mongods.json | 5 +-
10 files changed, 163 insertions(+), 73 deletions(-)
copy scripts/oak-upgrade.sh => Dockerfile (51%)
mode change 100755 => 100644
copy scripts/oak-upgrade.sh => docker/docker-compose-mongodb.yaml (66%)
mode change 100755 => 100644
copy scripts/oak-upgrade.sh => docker/docker-compose-tar.yaml (66%)
mode change 100755 => 100644
copy scripts/oak-upgrade.sh => hooks/pre_build (67%)
copy scripts/oak-upgrade.sh => src/main/container/bin/launch.sh (56%)
create mode 100644 src/main/features/docker/docker.json
[sling-org-apache-sling-starter] 01/07: SLING-9638 - Update Starter Docker image to be based on the feature model
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git
commit a082e11a008f64be79ccadf7624e6a9118ee73cf
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Nov 12 16:51:27 2021 +0100
SLING-9638 - Update Starter Docker image to be based on the feature model
Move docker skip warning to pre-integration-test phase. This way it is not flagged as an error by Eclipse and only printed when the actualy docker functionality would be used.
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 90d1df2..88f7dbd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <phase>compile</phase>
+ <phase>pre-integration-test</phase>
<goals>
<goal>run</goal>
</goals>
[sling-org-apache-sling-starter] 04/07: SLING-9638 - Update Starter Docker image to be based on the feature model
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git
commit c10369ae5931f5360ac69e6fa6ff75d40b5061e1
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Mon Nov 15 13:38:49 2021 +0100
SLING-9638 - Update Starter Docker image to be based on the feature model
Add a basic docker image + documentation.
---
Dockerfile | 44 ++++++++++++++++++++++++++++++++++++
README.md | 24 ++++++++++++++++++++
pom.xml | 31 ++++++++++++++++++++++++-
src/main/container/bin/launch.sh | 39 ++++++++++++++++++++++++++++++++
src/main/features/docker/docker.json | 7 ++++++
5 files changed, 144 insertions(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..2c2b22c
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,44 @@
+# 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.
+
+FROM docker.io/openjdk:17-slim
+
+LABEL org.opencontainers.image.authors="dev@sling.apache.org"
+
+EXPOSE 8080
+
+RUN mkdir -p /opt/sling/artifacts
+COPY src/main/container /opt/sling
+COPY target/dependency/org.apache.sling.feature.launcher.jar /opt/sling
+COPY target/artifacts/ /opt/sling/artifacts/
+
+RUN groupadd -r sling && \
+ useradd --no-log-init -r -g sling sling && \
+ mkdir /opt/sling/launcher && \
+ chown sling:sling /opt/sling/launcher
+
+# ensure all files are readable by the sling user
+# for some reason some jar files are 0600 and others are 0644
+RUN find /opt/sling/artifacts -type f | xargs chmod 0644
+
+VOLUME /opt/sling/launcher
+
+USER sling:sling
+
+WORKDIR /opt/sling
+ENTRYPOINT [ "/opt/sling/bin/launch.sh" ]
+CMD ["oak_tar"]
diff --git a/README.md b/README.md
index bf7ccb5..24b6570 100644
--- a/README.md
+++ b/README.md
@@ -56,6 +56,30 @@ For instance, launching an empty Sling Starter with segment persistence can be a
Your own feature files can be added to the feature list.
+## Docker image
+
+This module can optionally build a Docker image. This is achieved by running a build with the `-Ddocker.skip=false` argument. By default, the image is built as `apache/sling:snapshot`. The tag can be overrriden using the `docker.label` Maven property.
+
+```
+$ mvn clean package -Ddocker.skip=false -Ddocker.label=local
+$ docker run --rm -p 8080 apache/sling:local
+```
+
+By default the iamge launches the `oak_tar` aggregate. The aggregate to launch can be selected by passing an additional argument to the image, e.g.:
+
+```
+$ docker run --rm -p 8080 apache/sling:snapshot oak_mongo
+```
+
+Currently only the `oak_tar` and `oak_mongo` aggregates are supported.
+
+For persisting the runtime data is is recommended to mount `/opt/sling/launcher` as a volume, for instance:
+
+```
+$ docker volume create sling-launcher
+$ docker run --rm -p 8080 -v sling-launcher:/opt/sling/launcher apache/sling:snapshot
+```
+
## Helper scripts
The `scripts` directory contains helper scripts that will aid with local development by simplifying the use of tools external to the Sling Starter.
diff --git a/pom.xml b/pom.xml
index b233a2a..7f50ffe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,6 +51,7 @@
<!-- skip index generation for all builds except for CI and release -->
<bnd.index.generation.skip>true</bnd.index.generation.skip>
<docker.skip>true</docker.skip>
+ <docker.label>snapshot</docker.label>
<mongo.container.image>mongo:4.4.6</mongo.container.image>
<it.startTimeoutSeconds>60</it.startTimeoutSeconds>
<!-- used for reproducible builds (https://maven.apache.org/guides/mini/guide-reproducible-builds.htm), automatically updated during release -->
@@ -121,7 +122,14 @@
<classifier>oak_mongo_far</classifier>
<includeClassifier>oak_mongo</includeClassifier>
</archive>
- </archives>
+ </archives>
+ <repositories>
+ <repository>
+ <includeClassifier>oak_tar</includeClassifier>
+ <includeClassifier>oak_mongo</includeClassifier>
+ <includeClassifier>docker</includeClassifier>
+ </repository>
+ </repositories>
</configuration>
<executions>
<execution>
@@ -134,6 +142,13 @@
<goal>attach-featurearchives</goal>
</goals>
</execution>
+ <execution>
+ <id>create-repository</id>
+ <phase>package</phase>
+ <goals>
+ <goal>repository</goal>
+ </goals>
+ </execution>
</executions>
</plugin>
<plugin>
@@ -234,6 +249,13 @@
</wait>
</run>
</image>
+ <image>
+ <name>apache/sling:${docker.label}</name>
+ <build>
+ <dockerFile>Dockerfile</dockerFile>
+ <contextDir>${project.basedir}</contextDir>
+ </build>
+ </image>
</images>
<stopMode>kill</stopMode>
</configuration>
@@ -254,6 +276,13 @@
<goal>stop</goal>
</goals>
</execution>
+ <execution>
+ <id>build-docker-image</id>
+ <phase>package</phase>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
</executions>
</plugin>
<!-- launch the Sling instances to test -->
diff --git a/src/main/container/bin/launch.sh b/src/main/container/bin/launch.sh
new file mode 100755
index 0000000..826d763
--- /dev/null
+++ b/src/main/container/bin/launch.sh
@@ -0,0 +1,39 @@
+#!/bin/bash -e
+
+# 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.
+
+
+feature_name="${1}"
+feature=$(find artifacts -name "*${feature_name}*.slingosgifeature")
+
+if [[ ! -f "${feature}" ]]; then
+ echo "[ERROR] Did not find any feature file matching name ${feature_name}. Aborting"
+ exit 1
+fi
+
+docker_feature=$(find artifacts -name "*docker.slingosgifeature")
+
+echo "[INFO] Selected ${feature} for launching"
+echo "[INFO] Automatically appended ${docker_feature}"
+
+feature="${feature},${docker_feature}"
+
+exec java -jar org.apache.sling.feature.launcher.jar \
+ -c artifacts \
+ -CC "org.apache.sling.commons.log.LogManager=MERGE_LATEST" \
+ -f ${feature}
\ No newline at end of file
diff --git a/src/main/features/docker/docker.json b/src/main/features/docker/docker.json
new file mode 100644
index 0000000..4fc79c0
--- /dev/null
+++ b/src/main/features/docker/docker.json
@@ -0,0 +1,7 @@
+{
+ "configurations":{
+ "org.apache.sling.commons.log.LogManager":{
+ "org.apache.sling.commons.log.file":""
+ }
+ }
+}
\ No newline at end of file
[sling-org-apache-sling-starter] 07/07: SLING-9638 - Update Starter Docker image to be based on the feature model
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git
commit fb83a841ee7473b55e855076392c216e157d1d6b
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Nov 26 17:19:55 2021 +0100
SLING-9638 - Update Starter Docker image to be based on the feature model
Add a couple of docker-compose samples showing how to run Sling with Docker.
---
README.md | 4 +++-
docker/docker-compose-mongodb.yaml | 31 +++++++++++++++++++++++++++++++
docker/docker-compose-tar.yaml | 27 +++++++++++++++++++++++++++
3 files changed, 61 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 24b6570..9d9910f 100644
--- a/README.md
+++ b/README.md
@@ -65,7 +65,7 @@ $ mvn clean package -Ddocker.skip=false -Ddocker.label=local
$ docker run --rm -p 8080 apache/sling:local
```
-By default the iamge launches the `oak_tar` aggregate. The aggregate to launch can be selected by passing an additional argument to the image, e.g.:
+By default the image launches the `oak_tar` aggregate. The aggregate to launch can be selected by passing an additional argument to the image, e.g.:
```
$ docker run --rm -p 8080 apache/sling:snapshot oak_mongo
@@ -80,6 +80,8 @@ $ docker volume create sling-launcher
$ docker run --rm -p 8080 -v sling-launcher:/opt/sling/launcher apache/sling:snapshot
```
+The [docker/](docker/) directory contains sample files related to container-based development.
+
## Helper scripts
The `scripts` directory contains helper scripts that will aid with local development by simplifying the use of tools external to the Sling Starter.
diff --git a/docker/docker-compose-mongodb.yaml b/docker/docker-compose-mongodb.yaml
new file mode 100644
index 0000000..fa619d2
--- /dev/null
+++ b/docker/docker-compose-mongodb.yaml
@@ -0,0 +1,31 @@
+# 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.
+
+# note that the project needs to be built once with `mvn clean install`
+services:
+ sling:
+ image: apache/sling:snapshot
+ ports:
+ - "8080"
+ links:
+ - mongo
+ environment:
+ - MONGODB_HOST=mongo
+ - MONGODB_PORT=27017
+ command: "oak_mongo"
+ mongo:
+ image: mongo:3.6
diff --git a/docker/docker-compose-tar.yaml b/docker/docker-compose-tar.yaml
new file mode 100644
index 0000000..57facda
--- /dev/null
+++ b/docker/docker-compose-tar.yaml
@@ -0,0 +1,27 @@
+# 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.
+
+# note that the project needs to be built once with `mvn clean install`
+services:
+ sling:
+ image: apache/sling:snapshot
+ ports:
+ - "8080"
+ volumes:
+ - sling-repository:/opt/sling/launcher
+volumes:
+ sling-repository: {}
[sling-org-apache-sling-starter] 05/07: SLING-9638 - Update Starter Docker image to be based on the feature model
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git
commit 9073012fb188a5d7d1a76d8b9fa820108a1bcf7d
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Mon Nov 15 17:16:08 2021 +0100
SLING-9638 - Update Starter Docker image to be based on the feature model
Add pre_build hook to be used to Docker Hub automated builds
---
hooks/pre_build | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/hooks/pre_build b/hooks/pre_build
new file mode 100755
index 0000000..49a4f4d
--- /dev/null
+++ b/hooks/pre_build
@@ -0,0 +1,20 @@
+#!/bin/bash -e
+
+# 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.
+
+docker run --rm -v "$(pwd)":/build -w /build maven:3.8-openjdk-11 mvn -B package
[sling-org-apache-sling-starter] 02/07: SLING-9638 - Update Starter Docker image to be based on the feature model
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git
commit eeee699f930bf71847f95b8f573e37966d3ccffe
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Nov 12 16:52:06 2021 +0100
SLING-9638 - Update Starter Docker image to be based on the feature model
Update to the latest version of the docker-maven-plugin
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 88f7dbd..6d42176 100644
--- a/pom.xml
+++ b/pom.xml
@@ -217,7 +217,7 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.19.1</version>
+ <version>0.38.0</version>
<configuration>
<skip>${docker.skip}</skip>
<images>
[sling-org-apache-sling-starter] 06/07: SLING-9638 - Update Starter Docker image to be based on the feature model
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git
commit 4657556cbbf431da225fa80ba66dd58e5243ca2f
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Nov 26 16:57:56 2021 +0100
SLING-9638 - Update Starter Docker image to be based on the feature model
Make MongoDB host and port configurable using the Felix ConfigAdmin interpolation plugin.
---
pom.xml | 6 +++---
src/main/features/boot.json | 7 ++++++-
src/main/features/oak/persistence/oak_persistence_mongods.json | 5 +----
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7f50ffe..e6ef407 100644
--- a/pom.xml
+++ b/pom.xml
@@ -322,10 +322,10 @@
<frameworkProperties>
<org.osgi.service.http.port>${http.port.mongo}</org.osgi.service.http.port>
</frameworkProperties>
- <variables>
- <mongo.port>${mongo.port}</mongo.port>
- </variables>
</launcherArguments>
+ <environmentVariables>
+ <MONGODB_PORT>${mongo.port}</MONGODB_PORT>
+ </environmentVariables>
<startTimeoutSeconds>${it.startTimeoutSeconds}</startTimeoutSeconds>
</launch>
</launches>
diff --git a/src/main/features/boot.json b/src/main/features/boot.json
index 425ff85..9e47afa 100644
--- a/src/main/features/boot.json
+++ b/src/main/features/boot.json
@@ -17,6 +17,10 @@
"start-order":"1"
},
{
+ "id":"org.apache.felix:org.apache.felix.configadmin.plugin.interpolation:1.1.2",
+ "start-order":"1"
+ },
+ {
"id":"org.apache.felix:org.apache.felix.converter:1.0.18",
"start-order":"1"
},
@@ -150,6 +154,7 @@
"sling.fileinstall.dir.autocreate":"true",
"sling.jre-jpms":"{dollar}{felix.jpms.java.base}{dollar}{felix.jpms.java.compiler}{dollar}{felix.jpms.java.datatransfer}{dollar}{felix.jpms.java.desktop}{dollar}{felix.jpms.java.instrument}{dollar}{felix.jpms.java.logging}{dollar}{felix.jpms.java.management}{dollar}{felix.jpms.java.management.rmi}{dollar}{felix.jpms.java.naming}{dollar}{felix.jpms.java.net.http}{dollar}{felix.jpms.java.prefs}{dollar}{felix.jpms.java.rmi}{dollar}{felix.jpms.java.scripting}{dollar}{felix.jpms.java. [...]
"sling.jpms.java.xml":"{dollar}{sling.jre.java.xml},javax.xml.catalog;uses:=\"javax.xml.namespace\";version=\"1.0.0\"",
- "sling.jre-1.8":",java.applet;version=\"{dollar}{felix.detect.java.version}\",java.awt;version=\"{dollar}{felix.detect.java.version}\",java.awt.color;version=\"{dollar}{felix.detect.java.version}\",java.awt.datatransfer;version=\"{dollar}{felix.detect.java.version}\",java.awt.dnd;version=\"{dollar}{felix.detect.java.version}\",java.awt.event;version=\"{dollar}{felix.detect.java.version}\",java.awt.font;version=\"{dollar}{felix.detect.java.version}\",java.awt.geom;version=\"{dolla [...]
+ "sling.jre-1.8":",java.applet;version=\"{dollar}{felix.detect.java.version}\",java.awt;version=\"{dollar}{felix.detect.java.version}\",java.awt.color;version=\"{dollar}{felix.detect.java.version}\",java.awt.datatransfer;version=\"{dollar}{felix.detect.java.version}\",java.awt.dnd;version=\"{dollar}{felix.detect.java.version}\",java.awt.event;version=\"{dollar}{felix.detect.java.version}\",java.awt.font;version=\"{dollar}{felix.detect.java.version}\",java.awt.geom;version=\"{dolla [...]
+ "felix.cm.config.plugins": "org.apache.felix.configadmin.plugin.interpolation"
}
}
diff --git a/src/main/features/oak/persistence/oak_persistence_mongods.json b/src/main/features/oak/persistence/oak_persistence_mongods.json
index 965f4c4..a3a4485 100644
--- a/src/main/features/oak/persistence/oak_persistence_mongods.json
+++ b/src/main/features/oak/persistence/oak_persistence_mongods.json
@@ -1,7 +1,4 @@
{
- "variables": {
- "mongo.port":"27017"
- },
"bundles":[
{
"id":"com.h2database:h2-mvstore:1.4.200",
@@ -15,7 +12,7 @@
"configurations":{
"org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService":{
"db":"sling",
- "mongouri":"mongodb://localhost:${mongo.port}"
+ "mongouri":"mongodb://$[env:MONGODB_HOST;default=localhost]:$[env:MONGODB_PORT;type=Integer;default=27107]"
}
}
}
[sling-org-apache-sling-starter] 03/07: SLING-9638 - Update Starter Docker image to be based on the feature model
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git
commit fcbb2f8aa47c6624fad3c8191f13f82967a1f7a8
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Nov 12 16:53:01 2021 +0100
SLING-9638 - Update Starter Docker image to be based on the feature model
Move antrun warning next to the plugin execution that it 'guards'.
---
pom.xml | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6d42176..b233a2a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,22 +60,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target if="${docker.skip}">
- <echo>WARNING: docker.skip is ${docker.skip}, Docker-based tests will not be executed.</echo>
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<filesets>
@@ -208,6 +192,22 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target if="${docker.skip}">
+ <echo>WARNING: docker.skip is ${docker.skip}, Docker-based tests will not be executed.</echo>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<!--
Start a MongoDB container for the corresponding tests.
Must be declared before the feature-launcher-maven-plugin