You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2022/08/12 13:54:50 UTC
[sling-maven-plugin] branch master updated: SLING-11532 remove old relocate module (#9)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-maven-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 07b629c SLING-11532 remove old relocate module (#9)
07b629c is described below
commit 07b629c761a1d7dcc1ee68a8a9c3c013bad5f3da
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Fri Aug 12 15:54:45 2022 +0200
SLING-11532 remove old relocate module (#9)
convert to single module project again
---
parent/pom.xml | 81 -----
parent/src/site/site.xml | 31 --
pom.xml | 361 +++++++++++++++++++--
relocate/pom.xml | 42 ---
sling-maven-plugin/pom.xml | 345 --------------------
.../src => src}/it/install-test/invoker.properties | 0
.../src => src}/it/install-test/pom.xml | 0
.../java/org/apache/sling/dummy/HelloWorld.java | 0
.../bundlesupport/AbstractBundleDeployMojo.java | 0
.../bundlesupport/AbstractBundleInstallMojo.java | 0
.../bundlesupport/AbstractBundleRequestMojo.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
.../deploy/method/SlingPostDeployMethod.java | 0
.../bundlesupport/deploy/method/WebDavMkCol.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 => src}/main/resources/META-INF/LICENSE | 0
.../src => src}/main/resources/META-INF/NOTICE | 0
.../META-INF/m2e/lifecycle-mapping-metadata.xml | 0
.../main/resources/META-INF/plexus/components.xml | 0
.../site/markdown/bundle-installation.md | 0
.../src => src}/site/markdown/index.md | 0
{sling-maven-plugin/src => src}/site/site.xml | 0
.../bundlesupport/BundlePrerequisiteTest.java | 0
.../GenerateAdapterMetadataMojoTest.java | 0
.../sling/maven/bundlesupport/JsonSupportTest.java | 0
.../maven/bundlesupport/ValidationMojoTest.java | 0
.../bundlesupport/annotationtest/Adapter1.java | 0
.../bundlesupport/annotationtest/Adapter2.java | 0
.../method/IntermediateUrisExtractorTest.java | 0
.../deploy/method/SlingPostDeployMethodTest.java | 0
51 files changed, 328 insertions(+), 532 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
deleted file mode 100644
index abba75c..0000000
--- a/parent/pom.xml
+++ /dev/null
@@ -1,81 +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/xsd/maven-4.0.0.xsd" child.project.url.inherit.append.path="false">
-
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>49</version>
- <relativePath />
- </parent>
-
- <artifactId>sling-maven-plugin.parent</artifactId>
- <version>2.4.3-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <name>Apache Sling Maven Plugin Parent</name>
-
- <!-- using adjusted inheritance rules: https://issues.apache.org/jira/browse/MNG-6059 -->
- <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
- <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-maven-plugin.git</connection>
- <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-maven-plugin.git</developerConnection>
- <url>https://github.com/apache/sling-maven-plugin</url>
- <tag>HEAD</tag>
- </scm>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- </configuration>
- </plugin>
-
- </plugins>
- </pluginManagement>
- </build>
-
- <profiles>
- <profile>
- <id>apache-release</id>
- <build>
- <plugins>
- <!-- Set runOnlyAtExecutionRoot=false to make sure each jar file get's it source-release.zip attachment -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>source-release-assembly</id>
- <configuration>
- <runOnlyAtExecutionRoot>false</runOnlyAtExecutionRoot>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
diff --git a/parent/src/site/site.xml b/parent/src/site/site.xml
deleted file mode 100644
index 0ba3fda..0000000
--- a/parent/src/site/site.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-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/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd">
- <body>
- <!-- repeat the items from parent due to https://issues.apache.org/jira/browse/MSITE-910 -->
- <breadcrumbs>
- <item name="Apache Sling" href="https://sling.apache.org/"/>
- <item name="Maven Plugins" href="https://sling.apache.org/components/"/>
- </breadcrumbs>
- </body>
-</project>
diff --git a/pom.xml b/pom.xml
index 5e777df..b5cda59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,57 +1,352 @@
<?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.
+ 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">
+<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-maven-plugin.parent</artifactId>
- <version>2.4.3-SNAPSHOT</version>
- <relativePath>parent/pom.xml</relativePath>
+ <artifactId>sling</artifactId>
+ <version>49</version>
+ <relativePath />
</parent>
- <artifactId>sling-maven-plugin.reactor</artifactId>
+ <artifactId>sling-maven-plugin</artifactId>
<version>2.4.3-SNAPSHOT</version>
- <packaging>pom</packaging>
+ <packaging>maven-plugin</packaging>
+
+ <name>Apache Sling Maven Plugin</name>
+ <description>
+ Apache Sling Maven Plugin for Supporting Bundle Development
+ </description>
+ <url>https://sling.apache.org/components/sling-maven-plugin/</url>
- <name>Apache Sling Maven Plugin Reactor</name>
+ <prerequisites>
+ <maven>${mavenVersion}</maven>
+ </prerequisites>
- <modules>
- <module>parent</module>
- <module>sling-maven-plugin</module>
- <module>relocate</module>
- </modules>
+ <scm>
+ <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-maven-plugin.git</connection>
+ <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-maven-plugin.git</developerConnection>
+ <url>https://github.com/apache/sling-maven-plugin</url>
+ <tag>HEAD</tag>
+ </scm>
+
+ <properties>
+ <maven.site.path>${project.artifactId}-archives/${project.artifactId}-LATEST</maven.site.path>
+ <github.project.id>apache/sling-maven-plugin</github.project.id>
+ <sling.java.version>8</sling.java.version>
+ <mavenVersion>3.3.1</mavenVersion><!-- minimum target Maven version this plugin is compatible with -->
+ <maven.compiler.target>${sling.java.version}</maven.compiler.target><!-- also set target next to release due to https://issues.apache.org/jira/browse/MPLUGIN-404 -->
+ <starter-its.startTimeoutSeconds>60</starter-its.startTimeoutSeconds><!-- the time in seconds to wait for Sling Starter Feature to be started for the ITs -->
+ </properties>
<build>
<plugins>
-
- <!-- do not deploy this reactor pom into maven repository -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
+ <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>
- <skip>true</skip>
+ <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>
+ <!-- reserve network ports for the integration tests -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>reserve-network-port</id>
+ <goals>
+ <goal>reserve-network-port</goal>
+ </goals>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <portNames>
+ <portName>starter-its.http.port</portName>
+ </portNames>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- launch the Sling instances to test; only oak-tar -->
+ <plugin>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>feature-launcher-maven-plugin</artifactId>
+ <version>0.1.2</version>
+ <configuration>
+ <!-- newer versions don't work due to https://issues.apache.org/jira/browse/SLING-11158 -->
+ <featureLauncherVersion>1.1.26</featureLauncherVersion>
+ <launches>
+ <launch>
+ <id>sling-starter-oak-tar</id>
+ <!-- launch the regular Starter distribution (based on Oak with Segment Node Store) -->
+ <feature>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.starter</artifactId>
+ <version>12</version>
+ <classifier>oak_tar</classifier>
+ <type>slingosgifeature</type>
+ </feature>
+ <launcherArguments>
+ <frameworkProperties>
+ <org.osgi.service.http.port>${starter-its.http.port}</org.osgi.service.http.port>
+ </frameworkProperties>
+ </launcherArguments>
+ <startTimeoutSeconds>${starter-its.startTimeoutSeconds}</startTimeoutSeconds>
+ </launch>
+ </launches>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>start</goal>
+ <goal>stop</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <configuration>
+ <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+ <pomIncludes>
+ <pomInclude>**/pom.xml</pomInclude>
+ </pomIncludes>
+ <postBuildHookScript>verify</postBuildHookScript>
+ <localRepositoryPath>${project.build.directory}/it-repo</localRepositoryPath>
+ <properties>
+ <sling.url>http://localhost:${starter-its.http.port}</sling.url>
+ </properties>
+ <streamLogsOnFailures>true</streamLogsOnFailures>
+ </configuration>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <goals>
+ <goal>install</goal>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <!-- No javadocs -->
+ <excludePackageNames>
+ org.apache.sling
+ </excludePackageNames>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.httpcomponents.client5</groupId>
+ <artifactId>httpclient5</artifactId>
+ <version>5.1.3</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.12.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.11.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.jcr.contentparser</artifactId>
+ <version>1.2.8</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-json_1.1_spec</artifactId>
+ <version>1.5</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.johnzon</groupId>
+ <artifactId>johnzon-core</artifactId>
+ <version>1.2.16</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.framework</artifactId>
+ <version>1.8.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.commons.osgi</artifactId>
+ <version>2.4.2</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>${mavenVersion}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>${mavenVersion}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>${mavenVersion}</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- use for evaluating Adapter annotations -->
+ <dependency>
+ <groupId>io.github.classgraph</groupId>
+ <artifactId>classgraph</artifactId>
+ <version>4.8.149</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>adapter-annotations</artifactId>
+ <version>1.0.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <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>
+ </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>
</project>
diff --git a/relocate/pom.xml b/relocate/pom.xml
deleted file mode 100644
index a9c729d..0000000
--- a/relocate/pom.xml
+++ /dev/null
@@ -1,42 +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/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.sling</groupId>
- <artifactId>sling-maven-plugin.parent</artifactId>
- <version>2.4.3-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
- </parent>
-
- <artifactId>maven-sling-plugin</artifactId>
- <version>2.4.3-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <name>Apache Sling Maven 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/sling-maven-plugin/pom.xml b/sling-maven-plugin/pom.xml
deleted file mode 100644
index 130db05..0000000
--- a/sling-maven-plugin/pom.xml
+++ /dev/null
@@ -1,345 +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-maven-plugin.parent</artifactId>
- <version>2.4.3-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
- </parent>
-
- <artifactId>sling-maven-plugin</artifactId>
- <version>2.4.3-SNAPSHOT</version>
- <packaging>maven-plugin</packaging>
-
- <name>Apache Sling Maven Plugin</name>
- <description>
- Apache Sling Maven Plugin for Supporting Bundle Development
- </description>
- <url>https://sling.apache.org/components/sling-maven-plugin/</url>
-
- <prerequisites>
- <maven>${mavenVersion}</maven>
- </prerequisites>
-
- <properties>
- <maven.site.path>${project.artifactId}-archives/${project.artifactId}-LATEST</maven.site.path>
- <github.project.id>apache/sling-maven-plugin</github.project.id>
- <sling.java.version>8</sling.java.version>
- <mavenVersion>3.3.1</mavenVersion><!-- minimum target Maven version this plugin is compatible with -->
- <maven.compiler.target>${sling.java.version}</maven.compiler.target><!-- also set target next to release due to https://issues.apache.org/jira/browse/MPLUGIN-404 -->
- <starter-its.startTimeoutSeconds>60</starter-its.startTimeoutSeconds><!-- the time in seconds to wait for Sling Starter Feature to be started for the ITs -->
- </properties>
-
- <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>
- <!-- reserve network ports for the integration tests -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>reserve-network-port</id>
- <goals>
- <goal>reserve-network-port</goal>
- </goals>
- <phase>pre-integration-test</phase>
- <configuration>
- <portNames>
- <portName>starter-its.http.port</portName>
- </portNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!-- launch the Sling instances to test; only oak-tar -->
- <plugin>
- <groupId>org.apache.sling</groupId>
- <artifactId>feature-launcher-maven-plugin</artifactId>
- <version>0.1.2</version>
- <configuration>
- <!-- newer versions don't work due to https://issues.apache.org/jira/browse/SLING-11158 -->
- <featureLauncherVersion>1.1.26</featureLauncherVersion>
- <launches>
- <launch>
- <id>sling-starter-oak-tar</id>
- <!-- Include the feature previously aggregated -->
- <feature>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.starter</artifactId>
- <version>12</version>
- <classifier>oak_tar</classifier>
- <type>slingosgifeature</type>
- </feature>
- <launcherArguments>
- <frameworkProperties>
- <org.osgi.service.http.port>${starter-its.http.port}</org.osgi.service.http.port>
- </frameworkProperties>
- </launcherArguments>
- <startTimeoutSeconds>${starter-its.startTimeoutSeconds}</startTimeoutSeconds>
- </launch>
- </launches>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>start</goal>
- <goal>stop</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-invoker-plugin</artifactId>
- <configuration>
- <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
- <pomIncludes>
- <pomInclude>**/pom.xml</pomInclude>
- </pomIncludes>
- <postBuildHookScript>verify</postBuildHookScript>
- <localRepositoryPath>${project.build.directory}/it-repo</localRepositoryPath>
- <properties>
- <sling.url>http://localhost:${starter-its.http.port}</sling.url>
- </properties>
- <streamLogsOnFailures>true</streamLogsOnFailures>
- </configuration>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>install</goal>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <!-- No javadocs -->
- <excludePackageNames>
- org.apache.sling
- </excludePackageNames>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.httpcomponents.client5</groupId>
- <artifactId>httpclient5</artifactId>
- <version>5.1.3</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.12.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.11.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.jcr.contentparser</artifactId>
- <version>1.2.8</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-json_1.1_spec</artifactId>
- <version>1.5</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.johnzon</groupId>
- <artifactId>johnzon-core</artifactId>
- <version>1.2.16</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>javax.jcr</groupId>
- <artifactId>jcr</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.framework</artifactId>
- <version>1.8.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.osgi</artifactId>
- <version>2.4.2</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>${mavenVersion}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-core</artifactId>
- <version>${mavenVersion}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>${mavenVersion}</version>
- <scope>provided</scope>
- </dependency>
- <!-- use for evaluating Adapter annotations -->
- <dependency>
- <groupId>io.github.classgraph</groupId>
- <artifactId>classgraph</artifactId>
- <version>4.8.149</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>adapter-annotations</artifactId>
- <version>1.0.0</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-annotations</artifactId>
- <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>
- </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>
-</project>
diff --git a/sling-maven-plugin/src/it/install-test/invoker.properties b/src/it/install-test/invoker.properties
similarity index 100%
rename from sling-maven-plugin/src/it/install-test/invoker.properties
rename to src/it/install-test/invoker.properties
diff --git a/sling-maven-plugin/src/it/install-test/pom.xml b/src/it/install-test/pom.xml
similarity index 100%
rename from sling-maven-plugin/src/it/install-test/pom.xml
rename to src/it/install-test/pom.xml
diff --git a/sling-maven-plugin/src/it/install-test/src/main/java/org/apache/sling/dummy/HelloWorld.java b/src/it/install-test/src/main/java/org/apache/sling/dummy/HelloWorld.java
similarity index 100%
rename from sling-maven-plugin/src/it/install-test/src/main/java/org/apache/sling/dummy/HelloWorld.java
rename to src/it/install-test/src/main/java/org/apache/sling/dummy/HelloWorld.java
diff --git a/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundleDeployMojo.java b/src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundleDeployMojo.java
similarity index 100%
rename from sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundleDeployMojo.java
rename to src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundleDeployMojo.java
diff --git a/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundleInstallMojo.java b/src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundleInstallMojo.java
similarity index 100%
rename from sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundleInstallMojo.java
rename to src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundleInstallMojo.java
diff --git a/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundleRequestMojo.java b/src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundleRequestMojo.java
similarity index 100%
rename from sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundleRequestMojo.java
rename to src/main/java/org/apache/sling/maven/bundlesupport/AbstractBundleRequestMojo.java
diff --git a/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/AbstractFsMountMojo.java b/src/main/java/org/apache/sling/maven/bundlesupport/AbstractFsMountMojo.java
similarity index 100%
rename from sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/AbstractFsMountMojo.java
rename to src/main/java/org/apache/sling/maven/bundlesupport/AbstractFsMountMojo.java
diff --git a/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/BundleDeployFileMojo.java b/src/main/java/org/apache/sling/maven/bundlesupport/BundleDeployFileMojo.java
similarity index 100%
rename from sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/BundleDeployFileMojo.java
rename to src/main/java/org/apache/sling/maven/bundlesupport/BundleDeployFileMojo.java
diff --git a/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/BundleDeployMojo.java b/src/main/java/org/apache/sling/maven/bundlesupport/BundleDeployMojo.java
similarity index 100%
rename from sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/BundleDeployMojo.java
rename to src/main/java/org/apache/sling/maven/bundlesupport/BundleDeployMojo.java
diff --git a/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/BundleInstallFileMojo.java b/src/main/java/org/apache/sling/maven/bundlesupport/BundleInstallFileMojo.java
similarity index 100%
rename from sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/BundleInstallFileMojo.java
rename to src/main/java/org/apache/sling/maven/bundlesupport/BundleInstallFileMojo.java
diff --git a/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/BundleInstallMojo.java b/src/main/java/org/apache/sling/maven/bundlesupport/BundleInstallMojo.java
similarity index 100%
rename from sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/BundleInstallMojo.java
rename to src/main/java/org/apache/sling/maven/bundlesupport/BundleInstallMojo.java
diff --git a/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/BundlePrerequisite.java b/src/main/java/org/apache/sling/maven/bundlesupport/BundlePrerequisite.java
similarity index 100%
rename from sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/BundlePrerequisite.java
rename to src/main/java/org/apache/sling/maven/bundlesupport/BundlePrerequisite.java
diff --git a/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/BundleUninstallMojo.java b/src/main/java/org/apache/sling/maven/bundlesupport/BundleUninstallMojo.java
similarity index 100%
rename from sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/BundleUninstallMojo.java
rename to src/main/java/org/apache/sling/maven/bundlesupport/BundleUninstallMojo.java
diff --git a/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/FsMountMojo.java b/src/main/java/org/apache/sling/maven/bundlesupport/FsMountMojo.java
similarity index 100%
rename from sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/FsMountMojo.java
rename to src/main/java/org/apache/sling/maven/bundlesupport/FsMountMojo.java
diff --git a/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/FsUnMountMojo.java b/src/main/java/org/apache/sling/maven/bundlesupport/FsUnMountMojo.java
similarity index 100%
rename from sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/FsUnMountMojo.java
rename to src/main/java/org/apache/sling/maven/bundlesupport/FsUnMountMojo.java
diff --git a/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/GenerateAdapterMetadataMojo.java b/src/main/java/org/apache/sling/maven/bundlesupport/GenerateAdapterMetadataMojo.java
similarity index 100%
rename from sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/GenerateAdapterMetadataMojo.java
rename to src/main/java/org/apache/sling/maven/bundlesupport/GenerateAdapterMetadataMojo.java
diff --git a/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/JsonSupport.java b/src/main/java/org/apache/sling/maven/bundlesupport/JsonSupport.java
similarity index 100%
rename from sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/JsonSupport.java
rename to src/main/java/org/apache/sling/maven/bundlesupport/JsonSupport.java
diff --git a/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/ValidationMojo.java b/src/main/java/org/apache/sling/maven/bundlesupport/ValidationMojo.java
similarity index 100%
rename from sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/ValidationMojo.java
rename to src/main/java/org/apache/sling/maven/bundlesupport/ValidationMojo.java
diff --git a/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/deploy/BundleDeploymentMethod.java b/src/main/java/org/apache/sling/maven/bundlesupport/deploy/BundleDeploymentMethod.java
similarity index 100%
rename from sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/deploy/BundleDeploymentMethod.java
rename to src/main/java/org/apache/sling/maven/bundlesupport/deploy/BundleDeploymentMethod.java
diff --git a/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/deploy/DeployContext.java b/src/main/java/org/apache/sling/maven/bundlesupport/deploy/DeployContext.java
similarity index 100%
rename from sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/deploy/DeployContext.java
rename to src/main/java/org/apache/sling/maven/bundlesupport/deploy/DeployContext.java
diff --git a/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/deploy/DeployMethod.java b/src/main/java/org/apache/sling/maven/bundlesupport/deploy/DeployMethod.java
similarity index 100%
rename from sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/deploy/DeployMethod.java
rename to src/main/java/org/apache/sling/maven/bundlesupport/deploy/DeployMethod.java
diff --git a/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/deploy/method/FelixPostDeployMethod.java b/src/main/java/org/apache/sling/maven/bundlesupport/deploy/method/FelixPostDeployMethod.java
similarity index 100%
rename from sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/deploy/method/FelixPostDeployMethod.java
rename to src/main/java/org/apache/sling/maven/bundlesupport/deploy/method/FelixPostDeployMethod.java
diff --git a/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/deploy/method/IntermediateUrisExtractor.java b/src/main/java/org/apache/sling/maven/bundlesupport/deploy/method/IntermediateUrisExtractor.java
similarity index 100%
rename from sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/deploy/method/IntermediateUrisExtractor.java
rename to src/main/java/org/apache/sling/maven/bundlesupport/deploy/method/IntermediateUrisExtractor.java
diff --git a/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/deploy/method/SlingPostDeployMethod.java b/src/main/java/org/apache/sling/maven/bundlesupport/deploy/method/SlingPostDeployMethod.java
similarity index 100%
rename from sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/deploy/method/SlingPostDeployMethod.java
rename to src/main/java/org/apache/sling/maven/bundlesupport/deploy/method/SlingPostDeployMethod.java
diff --git a/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/deploy/method/WebDavMkCol.java b/src/main/java/org/apache/sling/maven/bundlesupport/deploy/method/WebDavMkCol.java
similarity index 100%
rename from sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/deploy/method/WebDavMkCol.java
rename to src/main/java/org/apache/sling/maven/bundlesupport/deploy/method/WebDavMkCol.java
diff --git a/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/deploy/method/WebDavPutDeployMethod.java b/src/main/java/org/apache/sling/maven/bundlesupport/deploy/method/WebDavPutDeployMethod.java
similarity index 100%
rename from sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/deploy/method/WebDavPutDeployMethod.java
rename to src/main/java/org/apache/sling/maven/bundlesupport/deploy/method/WebDavPutDeployMethod.java
diff --git a/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/fsresource/FileVaultXmlMounter.java b/src/main/java/org/apache/sling/maven/bundlesupport/fsresource/FileVaultXmlMounter.java
similarity index 100%
rename from sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/fsresource/FileVaultXmlMounter.java
rename to src/main/java/org/apache/sling/maven/bundlesupport/fsresource/FileVaultXmlMounter.java
diff --git a/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/fsresource/FsMode.java b/src/main/java/org/apache/sling/maven/bundlesupport/fsresource/FsMode.java
similarity index 100%
rename from sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/fsresource/FsMode.java
rename to src/main/java/org/apache/sling/maven/bundlesupport/fsresource/FsMode.java
diff --git a/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/fsresource/FsMountHelper.java b/src/main/java/org/apache/sling/maven/bundlesupport/fsresource/FsMountHelper.java
similarity index 100%
rename from sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/fsresource/FsMountHelper.java
rename to src/main/java/org/apache/sling/maven/bundlesupport/fsresource/FsMountHelper.java
diff --git a/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/fsresource/FsResourceConfiguration.java b/src/main/java/org/apache/sling/maven/bundlesupport/fsresource/FsResourceConfiguration.java
similarity index 100%
rename from sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/fsresource/FsResourceConfiguration.java
rename to src/main/java/org/apache/sling/maven/bundlesupport/fsresource/FsResourceConfiguration.java
diff --git a/sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/fsresource/SlingInitialContentMounter.java b/src/main/java/org/apache/sling/maven/bundlesupport/fsresource/SlingInitialContentMounter.java
similarity index 100%
rename from sling-maven-plugin/src/main/java/org/apache/sling/maven/bundlesupport/fsresource/SlingInitialContentMounter.java
rename to src/main/java/org/apache/sling/maven/bundlesupport/fsresource/SlingInitialContentMounter.java
diff --git a/sling-maven-plugin/src/main/resources/META-INF/LICENSE b/src/main/resources/META-INF/LICENSE
similarity index 100%
rename from sling-maven-plugin/src/main/resources/META-INF/LICENSE
rename to src/main/resources/META-INF/LICENSE
diff --git a/sling-maven-plugin/src/main/resources/META-INF/NOTICE b/src/main/resources/META-INF/NOTICE
similarity index 100%
rename from sling-maven-plugin/src/main/resources/META-INF/NOTICE
rename to src/main/resources/META-INF/NOTICE
diff --git a/sling-maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml b/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
similarity index 100%
rename from sling-maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
rename to src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml
diff --git a/sling-maven-plugin/src/main/resources/META-INF/plexus/components.xml b/src/main/resources/META-INF/plexus/components.xml
similarity index 100%
rename from sling-maven-plugin/src/main/resources/META-INF/plexus/components.xml
rename to src/main/resources/META-INF/plexus/components.xml
diff --git a/sling-maven-plugin/src/site/markdown/bundle-installation.md b/src/site/markdown/bundle-installation.md
similarity index 100%
rename from sling-maven-plugin/src/site/markdown/bundle-installation.md
rename to src/site/markdown/bundle-installation.md
diff --git a/sling-maven-plugin/src/site/markdown/index.md b/src/site/markdown/index.md
similarity index 100%
rename from sling-maven-plugin/src/site/markdown/index.md
rename to src/site/markdown/index.md
diff --git a/sling-maven-plugin/src/site/site.xml b/src/site/site.xml
similarity index 100%
rename from sling-maven-plugin/src/site/site.xml
rename to src/site/site.xml
diff --git a/sling-maven-plugin/src/test/java/org/apache/sling/maven/bundlesupport/BundlePrerequisiteTest.java b/src/test/java/org/apache/sling/maven/bundlesupport/BundlePrerequisiteTest.java
similarity index 100%
rename from sling-maven-plugin/src/test/java/org/apache/sling/maven/bundlesupport/BundlePrerequisiteTest.java
rename to src/test/java/org/apache/sling/maven/bundlesupport/BundlePrerequisiteTest.java
diff --git a/sling-maven-plugin/src/test/java/org/apache/sling/maven/bundlesupport/GenerateAdapterMetadataMojoTest.java b/src/test/java/org/apache/sling/maven/bundlesupport/GenerateAdapterMetadataMojoTest.java
similarity index 100%
rename from sling-maven-plugin/src/test/java/org/apache/sling/maven/bundlesupport/GenerateAdapterMetadataMojoTest.java
rename to src/test/java/org/apache/sling/maven/bundlesupport/GenerateAdapterMetadataMojoTest.java
diff --git a/sling-maven-plugin/src/test/java/org/apache/sling/maven/bundlesupport/JsonSupportTest.java b/src/test/java/org/apache/sling/maven/bundlesupport/JsonSupportTest.java
similarity index 100%
rename from sling-maven-plugin/src/test/java/org/apache/sling/maven/bundlesupport/JsonSupportTest.java
rename to src/test/java/org/apache/sling/maven/bundlesupport/JsonSupportTest.java
diff --git a/sling-maven-plugin/src/test/java/org/apache/sling/maven/bundlesupport/ValidationMojoTest.java b/src/test/java/org/apache/sling/maven/bundlesupport/ValidationMojoTest.java
similarity index 100%
rename from sling-maven-plugin/src/test/java/org/apache/sling/maven/bundlesupport/ValidationMojoTest.java
rename to src/test/java/org/apache/sling/maven/bundlesupport/ValidationMojoTest.java
diff --git a/sling-maven-plugin/src/test/java/org/apache/sling/maven/bundlesupport/annotationtest/Adapter1.java b/src/test/java/org/apache/sling/maven/bundlesupport/annotationtest/Adapter1.java
similarity index 100%
rename from sling-maven-plugin/src/test/java/org/apache/sling/maven/bundlesupport/annotationtest/Adapter1.java
rename to src/test/java/org/apache/sling/maven/bundlesupport/annotationtest/Adapter1.java
diff --git a/sling-maven-plugin/src/test/java/org/apache/sling/maven/bundlesupport/annotationtest/Adapter2.java b/src/test/java/org/apache/sling/maven/bundlesupport/annotationtest/Adapter2.java
similarity index 100%
rename from sling-maven-plugin/src/test/java/org/apache/sling/maven/bundlesupport/annotationtest/Adapter2.java
rename to src/test/java/org/apache/sling/maven/bundlesupport/annotationtest/Adapter2.java
diff --git a/sling-maven-plugin/src/test/java/org/apache/sling/maven/bundlesupport/deploy/method/IntermediateUrisExtractorTest.java b/src/test/java/org/apache/sling/maven/bundlesupport/deploy/method/IntermediateUrisExtractorTest.java
similarity index 100%
rename from sling-maven-plugin/src/test/java/org/apache/sling/maven/bundlesupport/deploy/method/IntermediateUrisExtractorTest.java
rename to src/test/java/org/apache/sling/maven/bundlesupport/deploy/method/IntermediateUrisExtractorTest.java
diff --git a/sling-maven-plugin/src/test/java/org/apache/sling/maven/bundlesupport/deploy/method/SlingPostDeployMethodTest.java b/src/test/java/org/apache/sling/maven/bundlesupport/deploy/method/SlingPostDeployMethodTest.java
similarity index 100%
rename from sling-maven-plugin/src/test/java/org/apache/sling/maven/bundlesupport/deploy/method/SlingPostDeployMethodTest.java
rename to src/test/java/org/apache/sling/maven/bundlesupport/deploy/method/SlingPostDeployMethodTest.java