You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2019/01/14 17:43:52 UTC
[sling-parent] branch master updated (1af4a1f -> aa670cb)
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-parent.git.
from 1af4a1f SLING-8201 also ban Felix SCR annotations
new 6cc93da ignore target folders also in subfolders
new aa670cb SLING-8212 Parent: Replace maven-sling-plugin with sling-maven-plugin and ban old artifact id
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:
.gitignore | 2 +-
sling-bundle-parent/pom.xml | 22 +++++++++++++++++++---
sling-parent/pom.xml | 2 +-
3 files changed, 21 insertions(+), 5 deletions(-)
[sling-parent] 02/02: SLING-8212 Parent: Replace maven-sling-plugin
with sling-maven-plugin and ban old artifact id
Posted by ss...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-parent.git
commit aa670cb74f9093da351e08942a50fdaca63fb0c2
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Mon Jan 14 18:41:20 2019 +0100
SLING-8212 Parent: Replace maven-sling-plugin with sling-maven-plugin and ban old artifact id
---
sling-bundle-parent/pom.xml | 22 +++++++++++++++++++---
sling-parent/pom.xml | 2 +-
2 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/sling-bundle-parent/pom.xml b/sling-bundle-parent/pom.xml
index db823a8..9d048d9 100644
--- a/sling-bundle-parent/pom.xml
+++ b/sling-bundle-parent/pom.xml
@@ -43,8 +43,8 @@
<plugin>
<groupId>org.apache.sling</groupId>
- <artifactId>maven-sling-plugin</artifactId>
- <version>2.3.6</version>
+ <artifactId>sling-maven-plugin</artifactId>
+ <version>2.4.0</version>
</plugin>
<plugin>
<groupId>biz.aQute.bnd</groupId>
@@ -162,6 +162,22 @@ Bundle-SCM: url=${project.scm.url},connection=${project.scm.connection},develope
</configuration>
</execution>
<execution>
+ <id>ban-maven-sling-plugin</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <bannedPlugins>
+ <excludes>
+ <exclude>org.apache.sling:maven-sling-plugin</exclude>
+ </excludes>
+ <message>Please change all occurences of maven-sling-plugin to sling-maven-plugin (plugin was renamed).</message>
+ </bannedPlugins>
+ </rules>
+ </configuration>
+ </execution>
+ <execution>
<id>enforce-java</id>
<goals>
<goal>enforce</goal>
@@ -206,7 +222,7 @@ Bundle-SCM: url=${project.scm.url},connection=${project.scm.connection},develope
<plugins>
<plugin>
<groupId>org.apache.sling</groupId>
- <artifactId>maven-sling-plugin</artifactId>
+ <artifactId>sling-maven-plugin</artifactId>
<executions>
<execution>
<id>install-bundle</id>
diff --git a/sling-parent/pom.xml b/sling-parent/pom.xml
index 4275042..2b2d5cf 100644
--- a/sling-parent/pom.xml
+++ b/sling-parent/pom.xml
@@ -725,7 +725,7 @@
org.apache.sling
</groupId>
<artifactId>
- maven-sling-plugin
+ sling-maven-plugin
</artifactId>
<versionRange>
[2.1.0,)
[sling-parent] 01/02: ignore target folders also in subfolders
Posted by ss...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-parent.git
commit 6cc93da97e28fb1a036566a99bf5c257a9399c3e
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Mon Jan 14 18:40:07 2019 +0100
ignore target folders also in subfolders
---
.gitignore | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitignore b/.gitignore
index 5b783ed..7fa4d65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-/target
+target
.idea
.classpath
.metadata