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/11 16:10:32 UTC
[sling-maven-sling-plugin] branch master updated (4b458ed ->
711a3f7)
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-maven-sling-plugin.git.
from 4b458ed Merge pull request #1 from apache/SLING-7445
add 2191acf SLING-8204 rename to sling-maven-plugin and relocate from old coordinates
new b3e52d2 Merge branch 'master' into feature/SLING-8204-rename-sling-maven-plugin
new 0520d9f update to parent pom 34
new 53d4500 SLING-8204 further renamings to Sling Maven Plugin
new 711a3f7 Merge branch 'feature/SLING-8204-rename-sling-maven-plugin'
The 4 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 +-
README.md | 4 +-
pom.xml | 270 ++-------------------
relocate/pom.xml | 43 ++++
pom.xml => sling-maven-plugin/pom.xml | 17 +-
.../bundlesupport/AbstractBundleDeployMojo.java | 0
.../bundlesupport/AbstractBundleInstallMojo.java | 0
.../bundlesupport/AbstractBundlePostMojo.java | 0
.../maven/bundlesupport/AbstractFsMountMojo.java | 0
.../maven/bundlesupport/BundleDeployFileMojo.java | 0
.../maven/bundlesupport/BundleDeployMojo.java | 0
.../maven/bundlesupport/BundleInstallFileMojo.java | 0
.../maven/bundlesupport/BundleInstallMojo.java | 0
.../maven/bundlesupport/BundlePrerequisite.java | 0
.../maven/bundlesupport/BundleUninstallMojo.java | 0
.../sling/maven/bundlesupport/FsMountMojo.java | 0
.../sling/maven/bundlesupport/FsUnMountMojo.java | 0
.../bundlesupport/GenerateAdapterMetadataMojo.java | 0
.../sling/maven/bundlesupport/JsonSupport.java | 0
.../sling/maven/bundlesupport/ValidationMojo.java | 0
.../deploy/BundleDeploymentMethod.java | 0
.../maven/bundlesupport/deploy/DeployContext.java | 0
.../maven/bundlesupport/deploy/DeployMethod.java | 0
.../deploy/method/FelixPostDeployMethod.java | 0
.../deploy/method/IntermediateUrisExtractor.java | 0
.../bundlesupport/deploy/method/MkColMethod.java | 0
.../deploy/method/SlingPostDeployMethod.java | 0
.../deploy/method/WebDavPutDeployMethod.java | 0
.../fsresource/FileVaultXmlMounter.java | 0
.../maven/bundlesupport/fsresource/FsMode.java | 0
.../bundlesupport/fsresource/FsMountHelper.java | 0
.../fsresource/FsResourceConfiguration.java | 0
.../fsresource/SlingInitialContentMounter.java | 0
.../src}/main/resources/META-INF/LICENSE | 0
.../src}/main/resources/META-INF/NOTICE | 0
.../META-INF/m2e/lifecycle-mapping-metadata.xml | 0
.../main/resources/META-INF/plexus/components.xml | 0
.../src}/site/markdown/index.md | 4 +-
{src => sling-maven-plugin/src}/site/site.xml | 0
.../sling/maven/bundlesupport/JsonSupportTest.java | 0
.../maven/bundlesupport/ValidationMojoTest.java | 0
.../method/IntermediateUrisExtractorTest.java | 0
42 files changed, 68 insertions(+), 272 deletions(-)
create mode 100644 relocate/pom.xml
copy pom.xml => sling-maven-plugin/pom.xml (94%)
rename {src => sling-maven-plugin/src}/main/java/org/apache/sling/maven/bundlesupport/AbstractBundleDeployMojo.java (100%)
rename {src => sling-maven-plugin/src}/main/java/org/apache/sling/maven/bundlesupport/AbstractBundleInstallMojo.java (100%)
rename {src => sling-maven-plugin/src}/main/java/org/apache/sling/maven/bundlesupport/AbstractBundlePostMojo.java (100%)
rename {src => sling-maven-plugin/src}/main/java/org/apache/sling/maven/bundlesupport/AbstractFsMountMojo.java (100%)
rename {src => sling-maven-plugin/src}/main/java/org/apache/sling/maven/bundlesupport/BundleDeployFileMojo.java (100%)
rename {src => sling-maven-plugin/src}/main/java/org/apache/sling/maven/bundlesupport/BundleDeployMojo.java (100%)
rename {src => sling-maven-plugin/src}/main/java/org/apache/sling/maven/bundlesupport/BundleInstallFileMojo.java (100%)
rename {src => sling-maven-plugin/src}/main/java/org/apache/sling/maven/bundlesupport/BundleInstallMojo.java (100%)
rename {src => sling-maven-plugin/src}/main/java/org/apache/sling/maven/bundlesupport/BundlePrerequisite.java (100%)
rename {src => sling-maven-plugin/src}/main/java/org/apache/sling/maven/bundlesupport/BundleUninstallMojo.java (100%)
rename {src => sling-maven-plugin/src}/main/java/org/apache/sling/maven/bundlesupport/FsMountMojo.java (100%)
rename {src => sling-maven-plugin/src}/main/java/org/apache/sling/maven/bundlesupport/FsUnMountMojo.java (100%)
rename {src => sling-maven-plugin/src}/main/java/org/apache/sling/maven/bundlesupport/GenerateAdapterMetadataMojo.java (100%)
rename {src => sling-maven-plugin/src}/main/java/org/apache/sling/maven/bundlesupport/JsonSupport.java (100%)
rename {src => sling-maven-plugin/src}/main/java/org/apache/sling/maven/bundlesupport/ValidationMojo.java (100%)
rename {src => sling-maven-plugin/src}/main/java/org/apache/sling/maven/bundlesupport/deploy/BundleDeploymentMethod.java (100%)
rename {src => sling-maven-plugin/src}/main/java/org/apache/sling/maven/bundlesupport/deploy/DeployContext.java (100%)
rename {src => sling-maven-plugin/src}/main/java/org/apache/sling/maven/bundlesupport/deploy/DeployMethod.java (100%)
rename {src => sling-maven-plugin/src}/main/java/org/apache/sling/maven/bundlesupport/deploy/method/FelixPostDeployMethod.java (100%)
rename {src => sling-maven-plugin/src}/main/java/org/apache/sling/maven/bundlesupport/deploy/method/IntermediateUrisExtractor.java (100%)
rename {src => sling-maven-plugin/src}/main/java/org/apache/sling/maven/bundlesupport/deploy/method/MkColMethod.java (100%)
rename {src => sling-maven-plugin/src}/main/java/org/apache/sling/maven/bundlesupport/deploy/method/SlingPostDeployMethod.java (100%)
rename {src => sling-maven-plugin/src}/main/java/org/apache/sling/maven/bundlesupport/deploy/method/WebDavPutDeployMethod.java (100%)
rename {src => sling-maven-plugin/src}/main/java/org/apache/sling/maven/bundlesupport/fsresource/FileVaultXmlMounter.java (100%)
rename {src => sling-maven-plugin/src}/main/java/org/apache/sling/maven/bundlesupport/fsresource/FsMode.java (100%)
rename {src => sling-maven-plugin/src}/main/java/org/apache/sling/maven/bundlesupport/fsresource/FsMountHelper.java (100%)
rename {src => sling-maven-plugin/src}/main/java/org/apache/sling/maven/bundlesupport/fsresource/FsResourceConfiguration.java (100%)
rename {src => sling-maven-plugin/src}/main/java/org/apache/sling/maven/bundlesupport/fsresource/SlingInitialContentMounter.java (100%)
rename {src => sling-maven-plugin/src}/main/resources/META-INF/LICENSE (100%)
rename {src => sling-maven-plugin/src}/main/resources/META-INF/NOTICE (100%)
rename {src => sling-maven-plugin/src}/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml (100%)
rename {src => sling-maven-plugin/src}/main/resources/META-INF/plexus/components.xml (100%)
rename {src => sling-maven-plugin/src}/site/markdown/index.md (70%)
rename {src => sling-maven-plugin/src}/site/site.xml (100%)
rename {src => sling-maven-plugin/src}/test/java/org/apache/sling/maven/bundlesupport/JsonSupportTest.java (100%)
rename {src => sling-maven-plugin/src}/test/java/org/apache/sling/maven/bundlesupport/ValidationMojoTest.java (100%)
rename {src => sling-maven-plugin/src}/test/java/org/apache/sling/maven/bundlesupport/deploy/method/IntermediateUrisExtractorTest.java (100%)
[sling-maven-sling-plugin] 04/04: Merge branch
'feature/SLING-8204-rename-sling-maven-plugin'
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-maven-sling-plugin.git
commit 711a3f718981677897c0fa8200c982f47bc458f4
Merge: 4b458ed 53d4500
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Fri Jan 11 17:10:08 2019 +0100
Merge branch 'feature/SLING-8204-rename-sling-maven-plugin'
.gitignore | 2 +-
README.md | 4 +-
pom.xml | 270 ++-------------------
relocate/pom.xml | 43 ++++
pom.xml => sling-maven-plugin/pom.xml | 17 +-
.../bundlesupport/AbstractBundleDeployMojo.java | 0
.../bundlesupport/AbstractBundleInstallMojo.java | 0
.../bundlesupport/AbstractBundlePostMojo.java | 0
.../maven/bundlesupport/AbstractFsMountMojo.java | 0
.../maven/bundlesupport/BundleDeployFileMojo.java | 0
.../maven/bundlesupport/BundleDeployMojo.java | 0
.../maven/bundlesupport/BundleInstallFileMojo.java | 0
.../maven/bundlesupport/BundleInstallMojo.java | 0
.../maven/bundlesupport/BundlePrerequisite.java | 0
.../maven/bundlesupport/BundleUninstallMojo.java | 0
.../sling/maven/bundlesupport/FsMountMojo.java | 0
.../sling/maven/bundlesupport/FsUnMountMojo.java | 0
.../bundlesupport/GenerateAdapterMetadataMojo.java | 0
.../sling/maven/bundlesupport/JsonSupport.java | 0
.../sling/maven/bundlesupport/ValidationMojo.java | 0
.../deploy/BundleDeploymentMethod.java | 0
.../maven/bundlesupport/deploy/DeployContext.java | 0
.../maven/bundlesupport/deploy/DeployMethod.java | 0
.../deploy/method/FelixPostDeployMethod.java | 0
.../deploy/method/IntermediateUrisExtractor.java | 0
.../bundlesupport/deploy/method/MkColMethod.java | 0
.../deploy/method/SlingPostDeployMethod.java | 0
.../deploy/method/WebDavPutDeployMethod.java | 0
.../fsresource/FileVaultXmlMounter.java | 0
.../maven/bundlesupport/fsresource/FsMode.java | 0
.../bundlesupport/fsresource/FsMountHelper.java | 0
.../fsresource/FsResourceConfiguration.java | 0
.../fsresource/SlingInitialContentMounter.java | 0
.../src}/main/resources/META-INF/LICENSE | 0
.../src}/main/resources/META-INF/NOTICE | 0
.../META-INF/m2e/lifecycle-mapping-metadata.xml | 0
.../main/resources/META-INF/plexus/components.xml | 0
.../src}/site/markdown/index.md | 4 +-
{src => sling-maven-plugin/src}/site/site.xml | 0
.../sling/maven/bundlesupport/JsonSupportTest.java | 0
.../maven/bundlesupport/ValidationMojoTest.java | 0
.../method/IntermediateUrisExtractorTest.java | 0
42 files changed, 68 insertions(+), 272 deletions(-)
[sling-maven-sling-plugin] 02/04: update to parent pom 34
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-maven-sling-plugin.git
commit 0520d9f4e7640e80826e657170a707b3b55fe7ae
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Fri Jan 11 17:02:40 2019 +0100
update to parent pom 34
---
pom.xml | 2 +-
relocate/pom.xml | 2 +-
sling-maven-plugin/pom.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 89724e7..5b5c78b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>30</version>
+ <version>34</version>
<relativePath />
</parent>
diff --git a/relocate/pom.xml b/relocate/pom.xml
index ea3a0ed..fe9c015 100644
--- a/relocate/pom.xml
+++ b/relocate/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>30</version>
+ <version>34</version>
<relativePath />
</parent>
diff --git a/sling-maven-plugin/pom.xml b/sling-maven-plugin/pom.xml
index 746cf80..a9ccd63 100644
--- a/sling-maven-plugin/pom.xml
+++ b/sling-maven-plugin/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>30</version>
+ <version>34</version>
<relativePath />
</parent>
[sling-maven-sling-plugin] 03/04: SLING-8204 further renamings to
Sling Maven Plugin
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-maven-sling-plugin.git
commit 53d450096d4d3dd874acec36ccf6b7128fc4ec8e
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Fri Jan 11 17:06:32 2019 +0100
SLING-8204 further renamings to Sling Maven Plugin
---
README.md | 4 ++--
pom.xml | 4 ++--
relocate/pom.xml | 2 +-
sling-maven-plugin/pom.xml | 4 ++--
sling-maven-plugin/src/site/markdown/index.md | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/README.md b/README.md
index b64e6df..560be52 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
[<img src="http://sling.apache.org/res/logos/sling.png"/>](http://sling.apache.org)
- [![Build Status](https://builds.apache.org/buildStatus/icon?job=sling-maven-sling-plugin-1.8)](https://builds.apache.org/view/S-Z/view/Sling/job/sling-maven-sling-plugin-1.8) [![Test Status](https://img.shields.io/jenkins/t/https/builds.apache.org/view/S-Z/view/Sling/job/sling-maven-sling-plugin-1.8.svg)](https://builds.apache.org/view/S-Z/view/Sling/job/sling-maven-sling-plugin-1.8/test_results_analyzer/) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.apache.sli [...]
+ [![Build Status](https://builds.apache.org/buildStatus/icon?job=sling-maven-sling-plugin-1.8)](https://builds.apache.org/view/S-Z/view/Sling/job/sling-maven-sling-plugin-1.8) [![Test Status](https://img.shields.io/jenkins/t/https/builds.apache.org/view/S-Z/view/Sling/job/sling-maven-sling-plugin-1.8.svg)](https://builds.apache.org/view/S-Z/view/Sling/job/sling-maven-sling-plugin-1.8/test_results_analyzer/) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.apache.sli [...]
-# Apache Sling Maven Sling Plugin
+# Apache Sling Maven Plugin
This module is part of the [Apache Sling](https://sling.apache.org) project.
diff --git a/pom.xml b/pom.xml
index 5b5c78b..fcd4267 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,11 +27,11 @@
<relativePath />
</parent>
- <artifactId>maven-sling-plugin.reactor</artifactId>
+ <artifactId>sling-maven-plugin.reactor</artifactId>
<version>2.4.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Apache Sling Sling Maven Plugin Reactor</name>
+ <name>Apache Sling Maven Plugin Reactor</name>
<scm>
<connection>scm:git:https://gitbox.apache.org/repos/asf/sling-maven-sling-plugin.git</connection>
diff --git a/relocate/pom.xml b/relocate/pom.xml
index fe9c015..9be0948 100644
--- a/relocate/pom.xml
+++ b/relocate/pom.xml
@@ -31,7 +31,7 @@
<version>2.4.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Apache Sling Maven Sling Plugin Relocation</name>
+ <name>Apache Sling Maven Plugin Relocation</name>
<description>Please use plugin name 'sling-maven-plugin' instead.</description>
<distributionManagement>
diff --git a/sling-maven-plugin/pom.xml b/sling-maven-plugin/pom.xml
index a9ccd63..bb2b748 100644
--- a/sling-maven-plugin/pom.xml
+++ b/sling-maven-plugin/pom.xml
@@ -31,11 +31,11 @@
<version>2.4.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
- <name>Apache Sling Maven Sling Plugin</name>
+ <name>Apache Sling Maven Plugin</name>
<description>
Apache Sling Maven Plugin for Supporting Bundle Development
</description>
- <url>https://sling.apache.org/components/maven-sling-plugin/</url>
+ <url>https://sling.apache.org/components/sling-maven-plugin/</url>
<prerequisites>
<maven>3.0.4</maven> <!-- still support older maven version than required in parent pom -->
diff --git a/sling-maven-plugin/src/site/markdown/index.md b/sling-maven-plugin/src/site/markdown/index.md
index 9a20f1c..8fba41b 100644
--- a/sling-maven-plugin/src/site/markdown/index.md
+++ b/sling-maven-plugin/src/site/markdown/index.md
@@ -1,6 +1,6 @@
-Maven Sling Plugin
+Sling Maven Plugin
==================
-The Maven Sling Plugin provides a number of goals which may be of help while developing bundles for Sling. To run the plugin you need at least Maven 3.x and JDK 1.7 or higher.
+The Sling Maven Plugin provides a number of goals which may be of help while developing bundles for Sling. To run the plugin you need at least Maven 3.x and JDK 1.7 or higher.
See [Goals](plugin-info.html) for a list of supported goals.
[sling-maven-sling-plugin] 01/04: Merge branch 'master' into
feature/SLING-8204-rename-sling-maven-plugin
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-maven-sling-plugin.git
commit b3e52d244a672742f3fc5a2ad8c85ba433e8e9f3
Merge: 2191acf 4b458ed
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Fri Jan 11 16:59:17 2019 +0100
Merge branch 'master' into feature/SLING-8204-rename-sling-maven-plugin
.../maven/bundlesupport/deploy/method/WebDavPutDeployMethod.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)