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/07 17:10:00 UTC

[sling-maven-sling-plugin] branch feature/SLING-8204-rename-sling-maven-plugin created (now 2191acf)

This is an automated email from the ASF dual-hosted git repository.

sseifert pushed a change to branch feature/SLING-8204-rename-sling-maven-plugin
in repository https://gitbox.apache.org/repos/asf/sling-maven-sling-plugin.git.


      at 2191acf  SLING-8204 rename to sling-maven-plugin and relocate from old coordinates

This branch includes the following new commits:

     new 2191acf  SLING-8204 rename to sling-maven-plugin and relocate from old coordinates

The 1 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.



[sling-maven-sling-plugin] 01/01: SLING-8204 rename to sling-maven-plugin and relocate from old coordinates

Posted by ss...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

sseifert pushed a commit to branch feature/SLING-8204-rename-sling-maven-plugin
in repository https://gitbox.apache.org/repos/asf/sling-maven-sling-plugin.git

commit 2191acf3d80a388facb1960f42d20ab6524a5732
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Mon Jan 7 17:56:05 2019 +0100

    SLING-8204 rename to sling-maven-plugin and relocate from old coordinates
---
 .gitignore                                         |   2 +-
 pom.xml                                            | 268 ++-------------------
 relocate/pom.xml                                   |  43 ++++
 pom.xml => sling-maven-plugin/pom.xml              |  11 +-
 .../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                    |   0
 {src => sling-maven-plugin/src}/site/site.xml      |   0
 .../sling/maven/bundlesupport/JsonSupportTest.java |   0
 .../maven/bundlesupport/ValidationMojoTest.java    |   0
 .../method/IntermediateUrisExtractorTest.java      |   0
 41 files changed, 60 insertions(+), 264 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5b783ed..7fa4d65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-/target
+target
 .idea
 .classpath
 .metadata
diff --git a/pom.xml b/pom.xml
index 8bf0180..89724e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
   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">
+<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/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
     <parent>
@@ -27,19 +27,11 @@
         <relativePath />
     </parent>
 
-    <artifactId>maven-sling-plugin</artifactId>
-    <version>2.3.9-SNAPSHOT</version>
-    <packaging>maven-plugin</packaging>
+    <artifactId>maven-sling-plugin.reactor</artifactId>
+    <version>2.4.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-    <name>Apache Sling Maven Sling Plugin</name>
-    <description>
-        Apache Sling Maven Plugin for Supporting Bundle Development
-    </description>
-    <url>https://sling.apache.org/components/maven-sling-plugin/</url>
-
-    <prerequisites>
-       <maven>3.0.4</maven>  <!-- still support older maven version than required in parent pom -->
-    </prerequisites>
+    <name>Apache Sling Sling Maven Plugin Reactor</name>
 
     <scm>
         <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-maven-sling-plugin.git</connection>
@@ -48,256 +40,24 @@
         <tag>HEAD</tag>
     </scm>
 
-    <properties>
-        <maven.site.path>${project.artifactId}-archives/${project.artifactId}-LATEST</maven.site.path>
-    </properties>
+    <modules>
+        <module>sling-maven-plugin</module>
+        <module>relocate</module>
+    </modules>
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-plugin-plugin</artifactId>
-                 <executions>
-                    <execution>
-                        <id>default-descriptor</id>
-                        <phase>process-classes</phase>
-                    </execution>
-                    <execution>
-                        <id>help-goal</id>
-                        <goals>
-                            <goal>helpmojo</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-scm-publish-plugin</artifactId>
-                <configuration>
-                    <checkoutDirectory>${user.home}/maven-sites/${maven.site.path}</checkoutDirectory>
-                    <tryUpdate>true</tryUpdate>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.rat</groupId>
-                <artifactId>apache-rat-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>src/site/markdown/**</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 
-    <reporting>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-plugin-plugin</artifactId>
-            </plugin>
+            <!-- do not deploy this reactor pom into maven repository -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
+                <artifactId>maven-deploy-plugin</artifactId>
                 <configuration>
-                  <!-- No javadocs -->
-                    <excludePackageNames>
-                        org.apache.sling
-                    </excludePackageNames>
+                    <skip>true</skip>
                 </configuration>
             </plugin>
-        </plugins>
-    </reporting>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>3.6</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
-            <version>3.1</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.0.4</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>2.5</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.jcr.contentparser</artifactId>
-            <version>1.2.4</version>
-            <scope>compile</scope>
-            <exclusions>
-              <exclusion>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-json_1.0_spec</artifactId>
-              </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- Stick with json 1.0 specs until the plugin can be updated to Java 8 - json_1.1 spec requires Java 8 (SLING-7644) -->
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-json_1.0_spec</artifactId>
-            <version>1.0-alpha-1</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.johnzon</groupId>
-            <artifactId>johnzon-core</artifactId>
-            <version>1.0.0</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.jackrabbit.vault</groupId>
-            <artifactId>org.apache.jackrabbit.vault</artifactId>
-            <version>3.1.18</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.jcr</groupId>
-            <artifactId>jcr</artifactId>
-            <scope>compile</scope>
-        </dependency>
 
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.commons.osgi</artifactId>
-            <version>2.4.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-plugin-api</artifactId>
-            <version>3.0.4</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-artifact</artifactId>
-            <version>3.0.4</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-compat</artifactId>
-            <version>3.0.4</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-archiver</artifactId>
-            <version>2.6</version>
-        </dependency>
-        <dependency>
-            <groupId>net.sf.scannotation</groupId>
-            <artifactId>scannotation</artifactId>
-            <version>1.0.2</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>javassist</groupId>
-                    <artifactId>javassist</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.javassist</groupId>
-            <artifactId>javassist</artifactId>
-            <version>3.18.2-GA</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>adapter-annotations</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm-all</artifactId>
-            <version>3.3.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven.plugin-tools</groupId>
-            <artifactId>maven-plugin-annotations</artifactId>
-            <version>3.4</version>
-            <scope>provided</scope>
-        </dependency>        
-        <dependency>
-            <groupId>org.sonatype.plexus</groupId>
-            <artifactId>plexus-build-api</artifactId>
-            <version>0.0.7</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>15.0</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    
-    <profiles>
-        <!-- This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself. -->
-        <profile>
-            <id>only-eclipse</id>
-            <activation>
-                <property>
-                    <name>m2e.version</name>
-                </property>
-            </activation>
-            <build>
-                <pluginManagement>
-                    <plugins>
-                      <plugin>
-                        <groupId>org.eclipse.m2e</groupId>
-                        <artifactId>lifecycle-mapping</artifactId>
-                        <version>1.0.0</version>
-                        <configuration>
-                          <lifecycleMappingMetadata>
-                            <pluginExecutions>
-                              <pluginExecution>
-                                <pluginExecutionFilter>
-                                  <groupId>
-                                    org.apache.maven.plugins
-                                  </groupId>
-                                  <artifactId>
-                                    maven-plugin-plugin
-                                  </artifactId>
-                                  <versionRange>
-                                    [3.4,)
-                                  </versionRange>
-                                  <goals>
-                                    <goal>descriptor</goal>
-                                    <goal>helpmojo</goal>
-                                  </goals>
-                                </pluginExecutionFilter>
-                                <action>
-                                  <ignore />
-                                </action>
-                              </pluginExecution>
-                            </pluginExecutions>
-                          </lifecycleMappingMetadata>
-                        </configuration>
-                      </plugin>
-                    </plugins>
-                </pluginManagement>
-            </build>
-        </profile>
-    </profiles>
+        </plugins>
+    </build>
 
 </project>
diff --git a/relocate/pom.xml b/relocate/pom.xml
new file mode 100644
index 0000000..ea3a0ed
--- /dev/null
+++ b/relocate/pom.xml
@@ -0,0 +1,43 @@
+<?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/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.sling</groupId>
+        <artifactId>sling</artifactId>
+        <version>30</version>
+        <relativePath />
+    </parent>
+
+    <artifactId>maven-sling-plugin</artifactId>
+    <version>2.4.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>Apache Sling Maven Sling Plugin Relocation</name>
+    <description>Please use plugin name 'sling-maven-plugin' instead.</description>
+
+    <distributionManagement>
+        <relocation>
+            <artifactId>sling-maven-plugin</artifactId>
+        </relocation>
+    </distributionManagement>
+
+</project>
diff --git a/pom.xml b/sling-maven-plugin/pom.xml
similarity index 96%
copy from pom.xml
copy to sling-maven-plugin/pom.xml
index 8bf0180..746cf80 100644
--- a/pom.xml
+++ b/sling-maven-plugin/pom.xml
@@ -27,8 +27,8 @@
         <relativePath />
     </parent>
 
-    <artifactId>maven-sling-plugin</artifactId>
-    <version>2.3.9-SNAPSHOT</version>
+    <artifactId>sling-maven-plugin</artifactId>
+    <version>2.4.0-SNAPSHOT</version>
     <packaging>maven-plugin</packaging>
 
     <name>Apache Sling Maven Sling Plugin</name>
@@ -41,13 +41,6 @@
        <maven>3.0.4</maven>  <!-- still support older maven version than required in parent pom -->
     </prerequisites>
 
-    <scm>
-        <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-maven-sling-plugin.git</connection>
-        <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-maven-sling-plugin.git</developerConnection>
-        <url>https://gitbox.apache.org/repos/asf?p=sling-maven-sling-plugin.git</url>
-        <tag>HEAD</tag>
-    </scm>
-
     <properties>
         <maven.site.path>${project.artifactId}-archives/${project.artifactId}-LATEST</maven.site.path>
     </properties>
diff --git a/src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundleDeployMojo.java b/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundleDeployMojo.java
similarity index 100%
rename from src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundleDeployMojo.java
rename to sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundleDeployMojo.java
diff --git a/src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundleInstallMojo.java b/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundleInstallMojo.java
similarity index 100%
rename from src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundleInstallMojo.java
rename to sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundleInstallMojo.java
diff --git a/src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundlePostMojo.java b/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundlePostMojo.java
similarity index 100%
rename from src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundlePostMojo.java
rename to sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundlePostMojo.java
diff --git a/src/main/java/org/apache/sling/maven/bundlesupport/AbstractFsMountMojo.java b/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/AbstractFsMountMojo.java
similarity index 100%
rename from src/main/java/org/apache/sling/maven/bundlesupport/AbstractFsMountMojo.java
rename to sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/AbstractFsMountMojo.java
diff --git a/src/main/java/org/apache/sling/maven/bundlesupport/BundleDeployFileMojo.java b/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/BundleDeployFileMojo.java
similarity index 100%
rename from src/main/java/org/apache/sling/maven/bundlesupport/BundleDeployFileMojo.java
rename to sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/BundleDeployFileMojo.java
diff --git a/src/main/java/org/apache/sling/maven/bundlesupport/BundleDeployMojo.java b/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/BundleDeployMojo.java
similarity index 100%
rename from src/main/java/org/apache/sling/maven/bundlesupport/BundleDeployMojo.java
rename to sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/BundleDeployMojo.java
diff --git a/src/main/java/org/apache/sling/maven/bundlesupport/BundleInstallFileMojo.java b/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/BundleInstallFileMojo.java
similarity index 100%
rename from src/main/java/org/apache/sling/maven/bundlesupport/BundleInstallFileMojo.java
rename to sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/BundleInstallFileMojo.java
diff --git a/src/main/java/org/apache/sling/maven/bundlesupport/BundleInstallMojo.java b/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/BundleInstallMojo.java
similarity index 100%
rename from src/main/java/org/apache/sling/maven/bundlesupport/BundleInstallMojo.java
rename to sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/BundleInstallMojo.java
diff --git a/src/main/java/org/apache/sling/maven/bundlesupport/BundlePrerequisite.java b/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/BundlePrerequisite.java
similarity index 100%
rename from src/main/java/org/apache/sling/maven/bundlesupport/BundlePrerequisite.java
rename to sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/BundlePrerequisite.java
diff --git a/src/main/java/org/apache/sling/maven/bundlesupport/BundleUninstallMojo.java b/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/BundleUninstallMojo.java
similarity index 100%
rename from src/main/java/org/apache/sling/maven/bundlesupport/BundleUninstallMojo.java
rename to sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/BundleUninstallMojo.java
diff --git a/src/main/java/org/apache/sling/maven/bundlesupport/FsMountMojo.java b/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/FsMountMojo.java
similarity index 100%
rename from src/main/java/org/apache/sling/maven/bundlesupport/FsMountMojo.java
rename to sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/FsMountMojo.java
diff --git a/src/main/java/org/apache/sling/maven/bundlesupport/FsUnMountMojo.java b/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/FsUnMountMojo.java
similarity index 100%
rename from src/main/java/org/apache/sling/maven/bundlesupport/FsUnMountMojo.java
rename to sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/FsUnMountMojo.java
diff --git a/src/main/java/org/apache/sling/maven/bundlesupport/GenerateAdapterMetadataMojo.java b/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/GenerateAdapterMetadataMojo.java
similarity index 100%
rename from src/main/java/org/apache/sling/maven/bundlesupport/GenerateAdapterMetadataMojo.java
rename to sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/GenerateAdapterMetadataMojo.java
diff --git a/src/main/java/org/apache/sling/maven/bundlesupport/JsonSupport.java b/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/JsonSupport.java
similarity index 100%
rename from src/main/java/org/apache/sling/maven/bundlesupport/JsonSupport.java
rename to sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/JsonSupport.java
diff --git a/src/main/java/org/apache/sling/maven/bundlesupport/ValidationMojo.java b/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/ValidationMojo.java
similarity index 100%
rename from src/main/java/org/apache/sling/maven/bundlesupport/ValidationMojo.java
rename to sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/ValidationMojo.java
diff --git a/src/main/java/org/apache/sling/maven/bundlesupport/deploy/BundleDeploymentMethod.java b/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/deploy/BundleDeploymentMethod.java
similarity index 100%
rename from src/main/java/org/apache/sling/maven/bundlesupport/deploy/BundleDeploymentMethod.java
rename to sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/deploy/BundleDeploymentMethod.java
diff --git a/src/main/java/org/apache/sling/maven/bundlesupport/deploy/DeployContext.java b/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/deploy/DeployContext.java
similarity index 100%
rename from src/main/java/org/apache/sling/maven/bundlesupport/deploy/DeployContext.java
rename to sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/deploy/DeployContext.java
diff --git a/src/main/java/org/apache/sling/maven/bundlesupport/deploy/DeployMethod.java b/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/deploy/DeployMethod.java
similarity index 100%
rename from src/main/java/org/apache/sling/maven/bundlesupport/deploy/DeployMethod.java
rename to sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/deploy/DeployMethod.java
diff --git a/src/main/java/org/apache/sling/maven/bundlesupport/deploy/method/FelixPostDeployMethod.java b/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/deploy/method/FelixPostDeployMethod.java
similarity index 100%
rename from src/main/java/org/apache/sling/maven/bundlesupport/deploy/method/FelixPostDeployMethod.java
rename to sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/deploy/method/FelixPostDeployMethod.java
diff --git a/src/main/java/org/apache/sling/maven/bundlesupport/deploy/method/IntermediateUrisExtractor.java b/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/deploy/method/IntermediateUrisExtractor.java
similarity index 100%
rename from src/main/java/org/apache/sling/maven/bundlesupport/deploy/method/IntermediateUrisExtractor.java
rename to sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/deploy/method/IntermediateUrisExtractor.java
diff --git a/src/main/java/org/apache/sling/maven/bundlesupport/deploy/method/MkColMethod.java b/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/deploy/method/MkColMethod.java
similarity index 100%
rename from src/main/java/org/apache/sling/maven/bundlesupport/deploy/method/MkColMethod.java
rename to sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/deploy/method/MkColMethod.java
diff --git a/src/main/java/org/apache/sling/maven/bundlesupport/deploy/method/SlingPostDeployMethod.java b/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/deploy/method/SlingPostDeployMethod.java
similarity index 100%
rename from src/main/java/org/apache/sling/maven/bundlesupport/deploy/method/SlingPostDeployMethod.java
rename to sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/deploy/method/SlingPostDeployMethod.java
diff --git a/src/main/java/org/apache/sling/maven/bundlesupport/deploy/method/WebDavPutDeployMethod.java b/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/deploy/method/WebDavPutDeployMethod.java
similarity index 100%
rename from src/main/java/org/apache/sling/maven/bundlesupport/deploy/method/WebDavPutDeployMethod.java
rename to sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/deploy/method/WebDavPutDeployMethod.java
diff --git a/src/main/java/org/apache/sling/maven/bundlesupport/fsresource/FileVaultXmlMounter.java b/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/fsresource/FileVaultXmlMounter.java
similarity index 100%
rename from src/main/java/org/apache/sling/maven/bundlesupport/fsresource/FileVaultXmlMounter.java
rename to sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/fsresource/FileVaultXmlMounter.java
diff --git a/src/main/java/org/apache/sling/maven/bundlesupport/fsresource/FsMode.java b/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/fsresource/FsMode.java
similarity index 100%
rename from src/main/java/org/apache/sling/maven/bundlesupport/fsresource/FsMode.java
rename to sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/fsresource/FsMode.java
diff --git a/src/main/java/org/apache/sling/maven/bundlesupport/fsresource/FsMountHelper.java b/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/fsresource/FsMountHelper.java
similarity index 100%
rename from src/main/java/org/apache/sling/maven/bundlesupport/fsresource/FsMountHelper.java
rename to sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/fsresource/FsMountHelper.java
diff --git a/src/main/java/org/apache/sling/maven/bundlesupport/fsresource/FsResourceConfiguration.java b/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/fsresource/FsResourceConfiguration.java
similarity index 100%
rename from src/main/java/org/apache/sling/maven/bundlesupport/fsresource/FsResourceConfiguration.java
rename to sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/fsresource/FsResourceConfiguration.java
diff --git a/src/main/java/org/apache/sling/maven/bundlesupport/fsresource/SlingInitialContentMounter.java b/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/fsresource/SlingInitialContentMounter.java
similarity index 100%
rename from src/main/java/org/apache/sling/maven/bundlesupport/fsresource/SlingInitialContentMounter.java
rename to sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/fsresource/SlingInitialContentMounter.java
diff --git a/src/main/resources/META-INF/LICENSE b/sling-maven-plugin/src/main/resources/META-INF/LICENSE
similarity index 100%
rename from src/main/resources/META-INF/LICENSE
rename to sling-maven-plugin/src/main/resources/META-INF/LICENSE
diff --git a/src/main/resources/META-INF/NOTICE b/sling-maven-plugin/src/main/resources/META-INF/NOTICE
similarity index 100%
rename from src/main/resources/META-INF/NOTICE
rename to sling-maven-plugin/src/main/resources/META-INF/NOTICE
diff --git a/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml b/sling-maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
similarity index 100%
rename from src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
rename to sling-maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
diff --git a/src/main/resources/META-INF/plexus/components.xml b/sling-maven-plugin/src/main/resources/META-INF/plexus/components.xml
similarity index 100%
rename from src/main/resources/META-INF/plexus/components.xml
rename to sling-maven-plugin/src/main/resources/META-INF/plexus/components.xml
diff --git a/src/site/markdown/index.md b/sling-maven-plugin/src/site/markdown/index.md
similarity index 100%
rename from src/site/markdown/index.md
rename to sling-maven-plugin/src/site/markdown/index.md
diff --git a/src/site/site.xml b/sling-maven-plugin/src/site/site.xml
similarity index 100%
rename from src/site/site.xml
rename to sling-maven-plugin/src/site/site.xml
diff --git a/src/test/java/org/apache/sling/maven/bundlesupport/JsonSupportTest.java b/sling-maven-plugin/src/test/java/org/apache/sling/maven/bundlesupport/JsonSupportTest.java
similarity index 100%
rename from src/test/java/org/apache/sling/maven/bundlesupport/JsonSupportTest.java
rename to sling-maven-plugin/src/test/java/org/apache/sling/maven/bundlesupport/JsonSupportTest.java
diff --git a/src/test/java/org/apache/sling/maven/bundlesupport/ValidationMojoTest.java b/sling-maven-plugin/src/test/java/org/apache/sling/maven/bundlesupport/ValidationMojoTest.java
similarity index 100%
rename from src/test/java/org/apache/sling/maven/bundlesupport/ValidationMojoTest.java
rename to sling-maven-plugin/src/test/java/org/apache/sling/maven/bundlesupport/ValidationMojoTest.java
diff --git a/src/test/java/org/apache/sling/maven/bundlesupport/deploy/method/IntermediateUrisExtractorTest.java b/sling-maven-plugin/src/test/java/org/apache/sling/maven/bundlesupport/deploy/method/IntermediateUrisExtractorTest.java
similarity index 100%
rename from src/test/java/org/apache/sling/maven/bundlesupport/deploy/method/IntermediateUrisExtractorTest.java
rename to sling-maven-plugin/src/test/java/org/apache/sling/maven/bundlesupport/deploy/method/IntermediateUrisExtractorTest.java