This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch MNG-7129-maven-caching
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/MNG-7129-maven-caching by this
push:
new 18fbc3f Refactor to use a single-module build
18fbc3f is described below
commit 18fbc3f69dab95882afc81b626e14529956fe892
Author: Guillaume Nodet <[email protected]>
AuthorDate: Fri Dec 10 10:27:14 2021 +0100
Refactor to use a single-module build
---
maven-caching-extension/pom.xml | 194 ---------
pom.xml | 443 +++++++++------------
{build => src/build}/checkstyle-suppressions.xml | 0
{build => src/build}/eclipse-formatter-config.xml | 0
{build => src/build}/maven-header.txt | 0
.../org/apache/maven/caching/CacheContext.java | 0
.../org/apache/maven/caching/CacheController.java | 0
.../apache/maven/caching/CacheControllerImpl.java | 0
.../java/org/apache/maven/caching/CacheDiff.java | 0
.../maven/caching/CacheLifecycleParticipant.java | 0
.../org/apache/maven/caching/CacheRepository.java | 0
.../java/org/apache/maven/caching/CacheResult.java | 0
.../java/org/apache/maven/caching/CacheUtils.java | 0
.../caching/CachingMojosExecutionStrategy.java | 0
.../maven/caching/DefaultMultiModuleSupport.java | 0
.../caching/DefaultNormalizedModelProvider.java | 0
.../maven/caching/DefaultPluginScanConfig.java | 0
.../caching/DefaultProjectInputCalculator.java | 0
.../caching/DefaultRestoredArtifactHandler.java | 0
.../maven/caching/HttpCacheRepositoryImpl.java | 0
.../maven/caching/LifecyclePhasesHelper.java | 0
.../apache/maven/caching/LocalCacheRepository.java | 0
.../maven/caching/LocalCacheRepositoryImpl.java | 0
.../maven/caching/MojoParametersListener.java | 0
.../apache/maven/caching/MultiModuleSupport.java | 0
.../maven/caching/NormalizedModelProvider.java | 0
.../org/apache/maven/caching/PluginScanConfig.java | 0
.../apache/maven/caching/PluginScanConfigImpl.java | 0
.../maven/caching/ProjectInputCalculator.java | 0
.../maven/caching/RemoteCacheRepository.java | 0
.../caching/RemoteCacheRepositoryProvider.java | 0
.../org/apache/maven/caching/RestoreStatus.java | 0
.../maven/caching/RestoredArtifactHandler.java | 0
.../apache/maven/caching/ScanConfigProperties.java | 0
.../apache/maven/caching/WagonConfigurator.java | 0
.../org/apache/maven/caching/WagonProvider.java | 0
.../maven/caching/WagonRemoteCacheRepository.java | 0
.../org/apache/maven/caching/Xpp3DomUtils.java | 0
.../maven/caching/artifact/RestoredArtifact.java | 0
.../checksum/DependencyNotResolvedException.java | 0
.../apache/maven/caching/checksum/DigestUtils.java | 0
.../apache/maven/caching/checksum/KeyUtils.java | 0
.../maven/caching/checksum/MavenProjectInput.java | 0
.../org/apache/maven/caching/checksum/WalkKey.java | 0
.../apache/maven/caching/hash/CloseableBuffer.java | 0
.../java/org/apache/maven/caching/hash/Hash.java | 0
.../apache/maven/caching/hash/HashAlgorithm.java | 0
.../apache/maven/caching/hash/HashChecksum.java | 0
.../org/apache/maven/caching/hash/HashFactory.java | 0
.../org/apache/maven/caching/hash/HexUtils.java | 0
.../apache/maven/caching/hash/ReflectionUtils.java | 0
.../java/org/apache/maven/caching/hash/SHA.java | 0
.../maven/caching/hash/ThreadLocalBuffer.java | 0
.../maven/caching/hash/ThreadLocalDigest.java | 0
.../java/org/apache/maven/caching/hash/XX.java | 0
.../java/org/apache/maven/caching/hash/XXMM.java | 0
.../java/org/apache/maven/caching/xml/Build.java | 0
.../org/apache/maven/caching/xml/CacheConfig.java | 0
.../apache/maven/caching/xml/CacheConfigImpl.java | 0
.../org/apache/maven/caching/xml/CacheSource.java | 0
.../org/apache/maven/caching/xml/CacheState.java | 0
.../org/apache/maven/caching/xml/DtoUtils.java | 0
.../org/apache/maven/caching/xml/XmlService.java | 0
.../src => src}/main/mdo/cache-build.mdo | 0
.../src => src}/main/mdo/cache-config.mdo | 0
.../src => src}/main/mdo/cache-diff.mdo | 0
.../src => src}/main/mdo/cache-report.mdo | 0
.../src => src}/site/apt/index.apt | 0
.../src => src}/site/markdown/cache.md | 0
.../src => src}/site/markdown/getting-started.md | 0
.../src => src}/site/markdown/how-to.md | 0
.../site/markdown/maven-cache-config.xml | 0
.../src => src}/site/markdown/parameters.md | 0
.../src => src}/site/markdown/performance.md | 0
.../src => src}/site/markdown/remote-cache.md | 0
.../src => src}/site/markdown/usage.md | 0
{maven-caching-extension/src => src}/site/site.xml | 0
.../org/apache/maven/caching/BuildInfoTest.java | 0
.../caching/checksum/MavenProjectInputTest.java | 0
.../apache/maven/caching/checksum/SHAHashTest.java | 0
.../apache/maven/caching/checksum/XXHashTest.java | 0
.../apache/maven/caching/hash/HexUtilsTest.java | 0
.../maven/caching/its/BuildExtensionTest.java | 0
.../maven/caching/its/CoreExtensionTest.java | 0
.../maven/caching/its/junit/IntegrationTest.java | 0
.../its/junit/IntegrationTestExtension.java | 0
.../org/apache/maven/caching/its/junit/Test.java | 0
.../apache/maven/caching/xml/XmlServiceTest.java | 0
.../build-extension}/.mvn/maven-cache-config.xml | 0
.../test/projects/build-extension/pom.xml | 0
.../main/java/org/apache/maven/caching/Test.java | 0
.../projects/core-extension/.mvn/extensions.xml | 0
.../core-extension}/.mvn/maven-cache-config.xml | 0
.../test/projects/core-extension/pom.xml | 0
.../main/java/org/apache/maven/caching/Test.java | 0
.../maven/caching/xml/cache-build-instance.xml | 0
.../maven/caching/xml/cache-config-instance.xml | 0
.../maven/caching/xml/cache-diff-instance.xml | 0
.../maven/caching/xml/cache-report-instance.xml | 0
.../test/resources/test-folder/test-pom.xml | 0
100 files changed, 196 insertions(+), 441 deletions(-)
diff --git a/maven-caching-extension/pom.xml b/maven-caching-extension/pom.xml
deleted file mode 100644
index 1891a3d..0000000
--- a/maven-caching-extension/pom.xml
+++ /dev/null
@@ -1,194 +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/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.maven.caching</groupId>
- <artifactId>maven-caching</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>maven-caching-extension</artifactId>
-
- <name>Maven Caching Extension</name>
- <description>Maven Caching extension classes.</description>
-
- <dependencies>
- <!-- Maven -->
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.5.13</version>
- </dependency>
- <dependency>
- <groupId>net.openhft</groupId>
- <artifactId>zero-allocation-hashing</artifactId>
- <version>0.9</version>
- </dependency>
- <dependency>
- <groupId>com.github.albfernandez</groupId>
- <artifactId>juniversalchardet</artifactId>
- <version>2.4.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.3.2</version>
- </dependency>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-http</artifactId>
- <version>${wagonVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.resolver</groupId>
- <artifactId>maven-resolver-util</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- <version>3.0.2</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-verifier</artifactId>
- <version>1.7.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.modello</groupId>
- <artifactId>modello-maven-plugin</artifactId>
- <configuration>
- <models>
- <model>src/main/mdo/cache-config.mdo</model>
- <model>src/main/mdo/cache-build.mdo</model>
- <model>src/main/mdo/cache-diff.mdo</model>
- <model>src/main/mdo/cache-report.mdo</model>
- </models>
- <version>1.0.0</version>
- </configuration>
- <executions>
- <execution>
- <id>modello-cache</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>java</goal>
- <goal>xpp3-reader</goal>
- <goal>xpp3-writer</goal>
- </goals>
- </execution>
- <execution>
- <id>modello-cache-xsd</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>xsd</goal>
- </goals>
- <configuration>
-
<outputDirectory>${basedir}/target/generated-resources/modello</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>3.2.0</version>
- <executions>
- <execution>
- <id>add-resources</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>add-resource</goal>
- </goals>
- <configuration>
- <resources>
- <resource>
-
<directory>${basedir}/target/generated-resources/modello</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>3.0.0-M5</version>
- <executions>
- <execution>
- <id>default-test</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <excludes>**/its/**</excludes>
- </configuration>
- </execution>
- <execution>
- <id>integration-test</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <includes>**/its/**</includes>
- <systemPropertyVariables>
-
<project.version>${project.version}</project.version>
-
<maven.multiModuleProjectDirectory>${maven.multiModuleProjectDirectory}</maven.multiModuleProjectDirectory>
- </systemPropertyVariables>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/pom.xml b/pom.xml
index 0eb3450..4c3e54c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,12 +30,12 @@ under the License.
<relativePath/>
</parent>
- <groupId>org.apache.maven.caching</groupId>
- <artifactId>maven-caching</artifactId>
+ <groupId>org.apache.maven.extensions</groupId>
+ <artifactId>maven-caching-extension</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <packaging>pom</packaging>
+ <packaging>jar</packaging>
- <name>Apache Maven Caching</name>
+ <name>Apache Maven Caching Extension</name>
<inceptionYear>2021</inceptionYear>
<properties>
@@ -67,263 +67,105 @@ under the License.
<project.build.outputTimestamp>2021-04-05T08:12:18Z</project.build.outputTimestamp>
</properties>
- <modules>
- <module>maven-caching-extension</module>
- </modules>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.caching</groupId>
- <artifactId>maven-caching-extension</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-bom</artifactId>
- <version>${maven4Version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- <version>1</version>
- </dependency>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <version>1.3.2</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4jVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4jVersion}</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>1.2.1</version>
- <optional>true</optional>
- </dependency>
- <!-- Wagon -->
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-provider-api</artifactId>
- <version>${wagonVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-file</artifactId>
- <version>${wagonVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-http</artifactId>
- <version>${wagonVersion}</version>
- <classifier>shaded</classifier>
- </dependency>
- <!-- Repository -->
- <dependency>
- <groupId>org.apache.maven.resolver</groupId>
- <artifactId>maven-resolver-api</artifactId>
- <version>${resolverVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.resolver</groupId>
- <artifactId>maven-resolver-spi</artifactId>
- <version>${resolverVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.resolver</groupId>
- <artifactId>maven-resolver-impl</artifactId>
- <version>${resolverVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.resolver</groupId>
- <artifactId>maven-resolver-util</artifactId>
- <version>${resolverVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.resolver</groupId>
- <artifactId>maven-resolver-connector-basic</artifactId>
- <version>${resolverVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.resolver</groupId>
- <artifactId>maven-resolver-transport-wagon</artifactId>
- <version>${resolverVersion}</version>
- </dependency>
- <!-- Commons -->
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>${commonsCliVersion}</version>
- </dependency>
- <dependency>
- <groupId>commons-jxpath</groupId>
- <artifactId>commons-jxpath</artifactId>
- <version>${jxpathVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>${commonsLangVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-sec-dispatcher</artifactId>
- <version>${securityDispatcherVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>${plexusUtilsVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-cipher</artifactId>
- <version>${cipherVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>${mockitoVersion}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.xmlunit</groupId>
- <artifactId>xmlunit-assertj</artifactId>
- <version>${xmlunitVersion}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.xmlunit</groupId>
- <artifactId>xmlunit-core</artifactId>
- <version>${xmlunitVersion}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.xmlunit</groupId>
- <artifactId>xmlunit-matchers</artifactId>
- <version>${xmlunitVersion}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
- <version>2.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
- <version>2.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-testing</artifactId>
- <version>1.0.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit</groupId>
- <artifactId>junit-bom</artifactId>
- <type>pom</type>
- <version>${junitVersion}</version>
- <scope>import</scope>
- </dependency>
- </dependencies>
- <!--bootstrap-start-comment-->
- </dependencyManagement>
- <!--bootstrap-end-comment-->
- <!--bootstrap-start-comment-->
<dependencies>
<dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>${maven4Version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.5.13</version>
+ </dependency>
+ <dependency>
+ <groupId>net.openhft</groupId>
+ <artifactId>zero-allocation-hashing</artifactId>
+ <version>0.9</version>
+ </dependency>
+ <dependency>
+ <groupId>com.github.albfernandez</groupId>
+ <artifactId>juniversalchardet</artifactId>
+ <version>2.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>${commonsLangVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.3.2</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.3.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>${plexusUtilsVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http</artifactId>
+ <version>${wagonVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-util</artifactId>
+ <version>${resolverVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ <version>3.0.2</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
+ <version>5.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-verifier</artifactId>
+ <version>1.7.2</version>
<scope>test</scope>
</dependency>
</dependencies>
- <!--bootstrap-end-comment-->
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>3.0.0-M5</version>
- <configuration>
- <argLine>-Xmx256m --add-exports
java.base/sun.nio.ch=ALL-UNNAMED</argLine>
- <environmentVariables>
-
<JENKINS_MAVEN_AGENT_DISABLED>true</JENKINS_MAVEN_AGENT_DISABLED>
- </environmentVariables>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>.asf.yaml</exclude>
- <exclude>src/test/resources*/**</exclude>
- <exclude>src/test/projects/**</exclude>
- <exclude>src/test/remote-repo/**</exclude>
- <exclude>build/maven-header.txt</exclude>
- <exclude>.gitmodules</exclude>
- <exclude>maven/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>net.revelc.code.formatter</groupId>
- <artifactId>formatter-maven-plugin</artifactId>
- <version>${formatter-maven-plugin.version}</version>
- <configuration>
-
<configFile>${maven.multiModuleProjectDirectory}/build/eclipse-formatter-config.xml</configFile>
- <skip>${format.skip}</skip>
- <lineEnding>KEEP</lineEnding>
- <cachedir>${project.build.directory}/cache</cachedir>
- </configuration>
- </plugin>
- <plugin>
- <groupId>net.revelc.code</groupId>
- <artifactId>impsort-maven-plugin</artifactId>
- <version>${impsort-maven-plugin.version}</version>
- <configuration>
- <removeUnused>true</removeUnused>
- <staticAfter>true</staticAfter>
- <lineEnding>KEEP</lineEnding>
- <skip>${format.skip}</skip>
- <cachedir>${project.build.directory}/cache</cachedir>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>3.4.1</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </pluginManagement>
<plugins>
<plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>.asf.yaml</exclude>
+ <exclude>src/test/resources*/**</exclude>
+ <exclude>src/test/projects/**</exclude>
+ <exclude>src/test/remote-repo/**</exclude>
+ <exclude>src/build/maven-header.txt</exclude>
+ <exclude>.gitmodules</exclude>
+ <exclude>maven/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>net.revelc.code.formatter</groupId>
<artifactId>formatter-maven-plugin</artifactId>
+ <version>${formatter-maven-plugin.version}</version>
+ <configuration>
+
<configFile>${maven.multiModuleProjectDirectory}/src/build/eclipse-formatter-config.xml</configFile>
+ <skip>${format.skip}</skip>
+ <lineEnding>KEEP</lineEnding>
+ <cachedir>${project.build.directory}/cache</cachedir>
+ </configuration>
<executions>
<execution>
<id>format</id>
@@ -337,6 +179,21 @@ under the License.
<plugin>
<groupId>net.revelc.code</groupId>
<artifactId>impsort-maven-plugin</artifactId>
+ <version>${impsort-maven-plugin.version}</version>
+ <configuration>
+ <removeUnused>true</removeUnused>
+ <staticAfter>true</staticAfter>
+ <lineEnding>KEEP</lineEnding>
+ <skip>${format.skip}</skip>
+ <cachedir>${project.build.directory}/cache</cachedir>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>3.4.1</version>
+ </dependency>
+ </dependencies>
<executions>
<execution>
<id>sort-imports</id>
@@ -374,8 +231,8 @@ under the License.
<version>3.1.2</version>
<configuration>
<violationSeverity>info</violationSeverity>
-
<suppressionsLocation>${maven.multiModuleProjectDirectory}/build/checkstyle-suppressions.xml</suppressionsLocation>
-
<headerLocation>${maven.multiModuleProjectDirectory}/build/maven-header.txt</headerLocation>
+
<suppressionsLocation>${maven.multiModuleProjectDirectory}/src/build/checkstyle-suppressions.xml</suppressionsLocation>
+
<headerLocation>${maven.multiModuleProjectDirectory}/src/build/maven-header.txt</headerLocation>
</configuration>
<dependencies>
<dependency>
@@ -390,6 +247,98 @@ under the License.
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-maven-plugin</artifactId>
+ <configuration>
+ <models>
+ <model>src/main/mdo/cache-config.mdo</model>
+ <model>src/main/mdo/cache-build.mdo</model>
+ <model>src/main/mdo/cache-diff.mdo</model>
+ <model>src/main/mdo/cache-report.mdo</model>
+ </models>
+ <version>1.0.0</version>
+ </configuration>
+ <executions>
+ <execution>
+ <id>modello-cache</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>java</goal>
+ <goal>xpp3-reader</goal>
+ <goal>xpp3-writer</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>modello-cache-xsd</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>xsd</goal>
+ </goals>
+ <configuration>
+
<outputDirectory>${basedir}/target/generated-resources/modello</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>3.2.0</version>
+ <executions>
+ <execution>
+ <id>add-resources</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>add-resource</goal>
+ </goals>
+ <configuration>
+ <resources>
+ <resource>
+
<directory>${basedir}/target/generated-resources/modello</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>3.0.0-M5</version>
+ <configuration>
+ <argLine>-Xmx256m --add-exports
java.base/sun.nio.ch=ALL-UNNAMED</argLine>
+ <environmentVariables>
+
<JENKINS_MAVEN_AGENT_DISABLED>true</JENKINS_MAVEN_AGENT_DISABLED>
+ </environmentVariables>
+ </configuration>
+ <executions>
+ <execution>
+ <id>default-test</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <excludes>**/its/**</excludes>
+ </configuration>
+ </execution>
+ <execution>
+ <id>integration-test</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <includes>**/its/**</includes>
+ <systemPropertyVariables>
+
<project.version>${project.version}</project.version>
+
<maven.multiModuleProjectDirectory>${maven.multiModuleProjectDirectory}</maven.multiModuleProjectDirectory>
+ </systemPropertyVariables>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
diff --git a/build/checkstyle-suppressions.xml
b/src/build/checkstyle-suppressions.xml
similarity index 100%
rename from build/checkstyle-suppressions.xml
rename to src/build/checkstyle-suppressions.xml
diff --git a/build/eclipse-formatter-config.xml
b/src/build/eclipse-formatter-config.xml
similarity index 100%
rename from build/eclipse-formatter-config.xml
rename to src/build/eclipse-formatter-config.xml
diff --git a/build/maven-header.txt b/src/build/maven-header.txt
similarity index 100%
rename from build/maven-header.txt
rename to src/build/maven-header.txt
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/CacheContext.java
b/src/main/java/org/apache/maven/caching/CacheContext.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/CacheContext.java
rename to src/main/java/org/apache/maven/caching/CacheContext.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/CacheController.java
b/src/main/java/org/apache/maven/caching/CacheController.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/CacheController.java
rename to src/main/java/org/apache/maven/caching/CacheController.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/CacheControllerImpl.java
b/src/main/java/org/apache/maven/caching/CacheControllerImpl.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/CacheControllerImpl.java
rename to src/main/java/org/apache/maven/caching/CacheControllerImpl.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/CacheDiff.java
b/src/main/java/org/apache/maven/caching/CacheDiff.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/CacheDiff.java
rename to src/main/java/org/apache/maven/caching/CacheDiff.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/CacheLifecycleParticipant.java
b/src/main/java/org/apache/maven/caching/CacheLifecycleParticipant.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/CacheLifecycleParticipant.java
rename to src/main/java/org/apache/maven/caching/CacheLifecycleParticipant.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/CacheRepository.java
b/src/main/java/org/apache/maven/caching/CacheRepository.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/CacheRepository.java
rename to src/main/java/org/apache/maven/caching/CacheRepository.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/CacheResult.java
b/src/main/java/org/apache/maven/caching/CacheResult.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/CacheResult.java
rename to src/main/java/org/apache/maven/caching/CacheResult.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/CacheUtils.java
b/src/main/java/org/apache/maven/caching/CacheUtils.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/CacheUtils.java
rename to src/main/java/org/apache/maven/caching/CacheUtils.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/CachingMojosExecutionStrategy.java
b/src/main/java/org/apache/maven/caching/CachingMojosExecutionStrategy.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/CachingMojosExecutionStrategy.java
rename to
src/main/java/org/apache/maven/caching/CachingMojosExecutionStrategy.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/DefaultMultiModuleSupport.java
b/src/main/java/org/apache/maven/caching/DefaultMultiModuleSupport.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/DefaultMultiModuleSupport.java
rename to src/main/java/org/apache/maven/caching/DefaultMultiModuleSupport.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/DefaultNormalizedModelProvider.java
b/src/main/java/org/apache/maven/caching/DefaultNormalizedModelProvider.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/DefaultNormalizedModelProvider.java
rename to
src/main/java/org/apache/maven/caching/DefaultNormalizedModelProvider.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/DefaultPluginScanConfig.java
b/src/main/java/org/apache/maven/caching/DefaultPluginScanConfig.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/DefaultPluginScanConfig.java
rename to src/main/java/org/apache/maven/caching/DefaultPluginScanConfig.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/DefaultProjectInputCalculator.java
b/src/main/java/org/apache/maven/caching/DefaultProjectInputCalculator.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/DefaultProjectInputCalculator.java
rename to
src/main/java/org/apache/maven/caching/DefaultProjectInputCalculator.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/DefaultRestoredArtifactHandler.java
b/src/main/java/org/apache/maven/caching/DefaultRestoredArtifactHandler.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/DefaultRestoredArtifactHandler.java
rename to
src/main/java/org/apache/maven/caching/DefaultRestoredArtifactHandler.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/HttpCacheRepositoryImpl.java
b/src/main/java/org/apache/maven/caching/HttpCacheRepositoryImpl.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/HttpCacheRepositoryImpl.java
rename to src/main/java/org/apache/maven/caching/HttpCacheRepositoryImpl.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/LifecyclePhasesHelper.java
b/src/main/java/org/apache/maven/caching/LifecyclePhasesHelper.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/LifecyclePhasesHelper.java
rename to src/main/java/org/apache/maven/caching/LifecyclePhasesHelper.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/LocalCacheRepository.java
b/src/main/java/org/apache/maven/caching/LocalCacheRepository.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/LocalCacheRepository.java
rename to src/main/java/org/apache/maven/caching/LocalCacheRepository.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/LocalCacheRepositoryImpl.java
b/src/main/java/org/apache/maven/caching/LocalCacheRepositoryImpl.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/LocalCacheRepositoryImpl.java
rename to src/main/java/org/apache/maven/caching/LocalCacheRepositoryImpl.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/MojoParametersListener.java
b/src/main/java/org/apache/maven/caching/MojoParametersListener.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/MojoParametersListener.java
rename to src/main/java/org/apache/maven/caching/MojoParametersListener.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/MultiModuleSupport.java
b/src/main/java/org/apache/maven/caching/MultiModuleSupport.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/MultiModuleSupport.java
rename to src/main/java/org/apache/maven/caching/MultiModuleSupport.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/NormalizedModelProvider.java
b/src/main/java/org/apache/maven/caching/NormalizedModelProvider.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/NormalizedModelProvider.java
rename to src/main/java/org/apache/maven/caching/NormalizedModelProvider.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/PluginScanConfig.java
b/src/main/java/org/apache/maven/caching/PluginScanConfig.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/PluginScanConfig.java
rename to src/main/java/org/apache/maven/caching/PluginScanConfig.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/PluginScanConfigImpl.java
b/src/main/java/org/apache/maven/caching/PluginScanConfigImpl.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/PluginScanConfigImpl.java
rename to src/main/java/org/apache/maven/caching/PluginScanConfigImpl.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/ProjectInputCalculator.java
b/src/main/java/org/apache/maven/caching/ProjectInputCalculator.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/ProjectInputCalculator.java
rename to src/main/java/org/apache/maven/caching/ProjectInputCalculator.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/RemoteCacheRepository.java
b/src/main/java/org/apache/maven/caching/RemoteCacheRepository.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/RemoteCacheRepository.java
rename to src/main/java/org/apache/maven/caching/RemoteCacheRepository.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/RemoteCacheRepositoryProvider.java
b/src/main/java/org/apache/maven/caching/RemoteCacheRepositoryProvider.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/RemoteCacheRepositoryProvider.java
rename to
src/main/java/org/apache/maven/caching/RemoteCacheRepositoryProvider.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/RestoreStatus.java
b/src/main/java/org/apache/maven/caching/RestoreStatus.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/RestoreStatus.java
rename to src/main/java/org/apache/maven/caching/RestoreStatus.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/RestoredArtifactHandler.java
b/src/main/java/org/apache/maven/caching/RestoredArtifactHandler.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/RestoredArtifactHandler.java
rename to src/main/java/org/apache/maven/caching/RestoredArtifactHandler.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/ScanConfigProperties.java
b/src/main/java/org/apache/maven/caching/ScanConfigProperties.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/ScanConfigProperties.java
rename to src/main/java/org/apache/maven/caching/ScanConfigProperties.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/WagonConfigurator.java
b/src/main/java/org/apache/maven/caching/WagonConfigurator.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/WagonConfigurator.java
rename to src/main/java/org/apache/maven/caching/WagonConfigurator.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/WagonProvider.java
b/src/main/java/org/apache/maven/caching/WagonProvider.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/WagonProvider.java
rename to src/main/java/org/apache/maven/caching/WagonProvider.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/WagonRemoteCacheRepository.java
b/src/main/java/org/apache/maven/caching/WagonRemoteCacheRepository.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/WagonRemoteCacheRepository.java
rename to src/main/java/org/apache/maven/caching/WagonRemoteCacheRepository.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/Xpp3DomUtils.java
b/src/main/java/org/apache/maven/caching/Xpp3DomUtils.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/Xpp3DomUtils.java
rename to src/main/java/org/apache/maven/caching/Xpp3DomUtils.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/artifact/RestoredArtifact.java
b/src/main/java/org/apache/maven/caching/artifact/RestoredArtifact.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/artifact/RestoredArtifact.java
rename to src/main/java/org/apache/maven/caching/artifact/RestoredArtifact.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/checksum/DependencyNotResolvedException.java
b/src/main/java/org/apache/maven/caching/checksum/DependencyNotResolvedException.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/checksum/DependencyNotResolvedException.java
rename to
src/main/java/org/apache/maven/caching/checksum/DependencyNotResolvedException.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/checksum/DigestUtils.java
b/src/main/java/org/apache/maven/caching/checksum/DigestUtils.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/checksum/DigestUtils.java
rename to src/main/java/org/apache/maven/caching/checksum/DigestUtils.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/checksum/KeyUtils.java
b/src/main/java/org/apache/maven/caching/checksum/KeyUtils.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/checksum/KeyUtils.java
rename to src/main/java/org/apache/maven/caching/checksum/KeyUtils.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/checksum/MavenProjectInput.java
b/src/main/java/org/apache/maven/caching/checksum/MavenProjectInput.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/checksum/MavenProjectInput.java
rename to src/main/java/org/apache/maven/caching/checksum/MavenProjectInput.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/checksum/WalkKey.java
b/src/main/java/org/apache/maven/caching/checksum/WalkKey.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/checksum/WalkKey.java
rename to src/main/java/org/apache/maven/caching/checksum/WalkKey.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/hash/CloseableBuffer.java
b/src/main/java/org/apache/maven/caching/hash/CloseableBuffer.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/hash/CloseableBuffer.java
rename to src/main/java/org/apache/maven/caching/hash/CloseableBuffer.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/hash/Hash.java
b/src/main/java/org/apache/maven/caching/hash/Hash.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/hash/Hash.java
rename to src/main/java/org/apache/maven/caching/hash/Hash.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/hash/HashAlgorithm.java
b/src/main/java/org/apache/maven/caching/hash/HashAlgorithm.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/hash/HashAlgorithm.java
rename to src/main/java/org/apache/maven/caching/hash/HashAlgorithm.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/hash/HashChecksum.java
b/src/main/java/org/apache/maven/caching/hash/HashChecksum.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/hash/HashChecksum.java
rename to src/main/java/org/apache/maven/caching/hash/HashChecksum.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/hash/HashFactory.java
b/src/main/java/org/apache/maven/caching/hash/HashFactory.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/hash/HashFactory.java
rename to src/main/java/org/apache/maven/caching/hash/HashFactory.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/hash/HexUtils.java
b/src/main/java/org/apache/maven/caching/hash/HexUtils.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/hash/HexUtils.java
rename to src/main/java/org/apache/maven/caching/hash/HexUtils.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/hash/ReflectionUtils.java
b/src/main/java/org/apache/maven/caching/hash/ReflectionUtils.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/hash/ReflectionUtils.java
rename to src/main/java/org/apache/maven/caching/hash/ReflectionUtils.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/hash/SHA.java
b/src/main/java/org/apache/maven/caching/hash/SHA.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/hash/SHA.java
rename to src/main/java/org/apache/maven/caching/hash/SHA.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/hash/ThreadLocalBuffer.java
b/src/main/java/org/apache/maven/caching/hash/ThreadLocalBuffer.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/hash/ThreadLocalBuffer.java
rename to src/main/java/org/apache/maven/caching/hash/ThreadLocalBuffer.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/hash/ThreadLocalDigest.java
b/src/main/java/org/apache/maven/caching/hash/ThreadLocalDigest.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/hash/ThreadLocalDigest.java
rename to src/main/java/org/apache/maven/caching/hash/ThreadLocalDigest.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/hash/XX.java
b/src/main/java/org/apache/maven/caching/hash/XX.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/hash/XX.java
rename to src/main/java/org/apache/maven/caching/hash/XX.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/hash/XXMM.java
b/src/main/java/org/apache/maven/caching/hash/XXMM.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/hash/XXMM.java
rename to src/main/java/org/apache/maven/caching/hash/XXMM.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/xml/Build.java
b/src/main/java/org/apache/maven/caching/xml/Build.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/xml/Build.java
rename to src/main/java/org/apache/maven/caching/xml/Build.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/xml/CacheConfig.java
b/src/main/java/org/apache/maven/caching/xml/CacheConfig.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/xml/CacheConfig.java
rename to src/main/java/org/apache/maven/caching/xml/CacheConfig.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/xml/CacheConfigImpl.java
b/src/main/java/org/apache/maven/caching/xml/CacheConfigImpl.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/xml/CacheConfigImpl.java
rename to src/main/java/org/apache/maven/caching/xml/CacheConfigImpl.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/xml/CacheSource.java
b/src/main/java/org/apache/maven/caching/xml/CacheSource.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/xml/CacheSource.java
rename to src/main/java/org/apache/maven/caching/xml/CacheSource.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/xml/CacheState.java
b/src/main/java/org/apache/maven/caching/xml/CacheState.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/xml/CacheState.java
rename to src/main/java/org/apache/maven/caching/xml/CacheState.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/xml/DtoUtils.java
b/src/main/java/org/apache/maven/caching/xml/DtoUtils.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/xml/DtoUtils.java
rename to src/main/java/org/apache/maven/caching/xml/DtoUtils.java
diff --git
a/maven-caching-extension/src/main/java/org/apache/maven/caching/xml/XmlService.java
b/src/main/java/org/apache/maven/caching/xml/XmlService.java
similarity index 100%
rename from
maven-caching-extension/src/main/java/org/apache/maven/caching/xml/XmlService.java
rename to src/main/java/org/apache/maven/caching/xml/XmlService.java
diff --git a/maven-caching-extension/src/main/mdo/cache-build.mdo
b/src/main/mdo/cache-build.mdo
similarity index 100%
rename from maven-caching-extension/src/main/mdo/cache-build.mdo
rename to src/main/mdo/cache-build.mdo
diff --git a/maven-caching-extension/src/main/mdo/cache-config.mdo
b/src/main/mdo/cache-config.mdo
similarity index 100%
rename from maven-caching-extension/src/main/mdo/cache-config.mdo
rename to src/main/mdo/cache-config.mdo
diff --git a/maven-caching-extension/src/main/mdo/cache-diff.mdo
b/src/main/mdo/cache-diff.mdo
similarity index 100%
rename from maven-caching-extension/src/main/mdo/cache-diff.mdo
rename to src/main/mdo/cache-diff.mdo
diff --git a/maven-caching-extension/src/main/mdo/cache-report.mdo
b/src/main/mdo/cache-report.mdo
similarity index 100%
rename from maven-caching-extension/src/main/mdo/cache-report.mdo
rename to src/main/mdo/cache-report.mdo
diff --git a/maven-caching-extension/src/site/apt/index.apt
b/src/site/apt/index.apt
similarity index 100%
rename from maven-caching-extension/src/site/apt/index.apt
rename to src/site/apt/index.apt
diff --git a/maven-caching-extension/src/site/markdown/cache.md
b/src/site/markdown/cache.md
similarity index 100%
rename from maven-caching-extension/src/site/markdown/cache.md
rename to src/site/markdown/cache.md
diff --git a/maven-caching-extension/src/site/markdown/getting-started.md
b/src/site/markdown/getting-started.md
similarity index 100%
rename from maven-caching-extension/src/site/markdown/getting-started.md
rename to src/site/markdown/getting-started.md
diff --git a/maven-caching-extension/src/site/markdown/how-to.md
b/src/site/markdown/how-to.md
similarity index 100%
rename from maven-caching-extension/src/site/markdown/how-to.md
rename to src/site/markdown/how-to.md
diff --git a/maven-caching-extension/src/site/markdown/maven-cache-config.xml
b/src/site/markdown/maven-cache-config.xml
similarity index 100%
rename from maven-caching-extension/src/site/markdown/maven-cache-config.xml
rename to src/site/markdown/maven-cache-config.xml
diff --git a/maven-caching-extension/src/site/markdown/parameters.md
b/src/site/markdown/parameters.md
similarity index 100%
rename from maven-caching-extension/src/site/markdown/parameters.md
rename to src/site/markdown/parameters.md
diff --git a/maven-caching-extension/src/site/markdown/performance.md
b/src/site/markdown/performance.md
similarity index 100%
rename from maven-caching-extension/src/site/markdown/performance.md
rename to src/site/markdown/performance.md
diff --git a/maven-caching-extension/src/site/markdown/remote-cache.md
b/src/site/markdown/remote-cache.md
similarity index 100%
rename from maven-caching-extension/src/site/markdown/remote-cache.md
rename to src/site/markdown/remote-cache.md
diff --git a/maven-caching-extension/src/site/markdown/usage.md
b/src/site/markdown/usage.md
similarity index 100%
rename from maven-caching-extension/src/site/markdown/usage.md
rename to src/site/markdown/usage.md
diff --git a/maven-caching-extension/src/site/site.xml b/src/site/site.xml
similarity index 100%
rename from maven-caching-extension/src/site/site.xml
rename to src/site/site.xml
diff --git
a/maven-caching-extension/src/test/java/org/apache/maven/caching/BuildInfoTest.java
b/src/test/java/org/apache/maven/caching/BuildInfoTest.java
similarity index 100%
rename from
maven-caching-extension/src/test/java/org/apache/maven/caching/BuildInfoTest.java
rename to src/test/java/org/apache/maven/caching/BuildInfoTest.java
diff --git
a/maven-caching-extension/src/test/java/org/apache/maven/caching/checksum/MavenProjectInputTest.java
b/src/test/java/org/apache/maven/caching/checksum/MavenProjectInputTest.java
similarity index 100%
rename from
maven-caching-extension/src/test/java/org/apache/maven/caching/checksum/MavenProjectInputTest.java
rename to
src/test/java/org/apache/maven/caching/checksum/MavenProjectInputTest.java
diff --git
a/maven-caching-extension/src/test/java/org/apache/maven/caching/checksum/SHAHashTest.java
b/src/test/java/org/apache/maven/caching/checksum/SHAHashTest.java
similarity index 100%
rename from
maven-caching-extension/src/test/java/org/apache/maven/caching/checksum/SHAHashTest.java
rename to src/test/java/org/apache/maven/caching/checksum/SHAHashTest.java
diff --git
a/maven-caching-extension/src/test/java/org/apache/maven/caching/checksum/XXHashTest.java
b/src/test/java/org/apache/maven/caching/checksum/XXHashTest.java
similarity index 100%
rename from
maven-caching-extension/src/test/java/org/apache/maven/caching/checksum/XXHashTest.java
rename to src/test/java/org/apache/maven/caching/checksum/XXHashTest.java
diff --git
a/maven-caching-extension/src/test/java/org/apache/maven/caching/hash/HexUtilsTest.java
b/src/test/java/org/apache/maven/caching/hash/HexUtilsTest.java
similarity index 100%
rename from
maven-caching-extension/src/test/java/org/apache/maven/caching/hash/HexUtilsTest.java
rename to src/test/java/org/apache/maven/caching/hash/HexUtilsTest.java
diff --git
a/maven-caching-extension/src/test/java/org/apache/maven/caching/its/BuildExtensionTest.java
b/src/test/java/org/apache/maven/caching/its/BuildExtensionTest.java
similarity index 100%
rename from
maven-caching-extension/src/test/java/org/apache/maven/caching/its/BuildExtensionTest.java
rename to src/test/java/org/apache/maven/caching/its/BuildExtensionTest.java
diff --git
a/maven-caching-extension/src/test/java/org/apache/maven/caching/its/CoreExtensionTest.java
b/src/test/java/org/apache/maven/caching/its/CoreExtensionTest.java
similarity index 100%
rename from
maven-caching-extension/src/test/java/org/apache/maven/caching/its/CoreExtensionTest.java
rename to src/test/java/org/apache/maven/caching/its/CoreExtensionTest.java
diff --git
a/maven-caching-extension/src/test/java/org/apache/maven/caching/its/junit/IntegrationTest.java
b/src/test/java/org/apache/maven/caching/its/junit/IntegrationTest.java
similarity index 100%
rename from
maven-caching-extension/src/test/java/org/apache/maven/caching/its/junit/IntegrationTest.java
rename to src/test/java/org/apache/maven/caching/its/junit/IntegrationTest.java
diff --git
a/maven-caching-extension/src/test/java/org/apache/maven/caching/its/junit/IntegrationTestExtension.java
b/src/test/java/org/apache/maven/caching/its/junit/IntegrationTestExtension.java
similarity index 100%
rename from
maven-caching-extension/src/test/java/org/apache/maven/caching/its/junit/IntegrationTestExtension.java
rename to
src/test/java/org/apache/maven/caching/its/junit/IntegrationTestExtension.java
diff --git
a/maven-caching-extension/src/test/java/org/apache/maven/caching/its/junit/Test.java
b/src/test/java/org/apache/maven/caching/its/junit/Test.java
similarity index 100%
rename from
maven-caching-extension/src/test/java/org/apache/maven/caching/its/junit/Test.java
rename to src/test/java/org/apache/maven/caching/its/junit/Test.java
diff --git
a/maven-caching-extension/src/test/java/org/apache/maven/caching/xml/XmlServiceTest.java
b/src/test/java/org/apache/maven/caching/xml/XmlServiceTest.java
similarity index 100%
rename from
maven-caching-extension/src/test/java/org/apache/maven/caching/xml/XmlServiceTest.java
rename to src/test/java/org/apache/maven/caching/xml/XmlServiceTest.java
diff --git
a/maven-caching-extension/src/test/projects/core-extension/.mvn/maven-cache-config.xml
b/src/test/projects/build-extension/.mvn/maven-cache-config.xml
similarity index 100%
rename from
maven-caching-extension/src/test/projects/core-extension/.mvn/maven-cache-config.xml
rename to src/test/projects/build-extension/.mvn/maven-cache-config.xml
diff --git a/maven-caching-extension/src/test/projects/build-extension/pom.xml
b/src/test/projects/build-extension/pom.xml
similarity index 100%
rename from maven-caching-extension/src/test/projects/build-extension/pom.xml
rename to src/test/projects/build-extension/pom.xml
diff --git
a/maven-caching-extension/src/test/projects/core-extension/src/main/java/org/apache/maven/caching/Test.java
b/src/test/projects/build-extension/src/main/java/org/apache/maven/caching/Test.java
similarity index 100%
rename from
maven-caching-extension/src/test/projects/core-extension/src/main/java/org/apache/maven/caching/Test.java
rename to
src/test/projects/build-extension/src/main/java/org/apache/maven/caching/Test.java
diff --git
a/maven-caching-extension/src/test/projects/core-extension/.mvn/extensions.xml
b/src/test/projects/core-extension/.mvn/extensions.xml
similarity index 100%
rename from
maven-caching-extension/src/test/projects/core-extension/.mvn/extensions.xml
rename to src/test/projects/core-extension/.mvn/extensions.xml
diff --git
a/maven-caching-extension/src/test/projects/build-extension/.mvn/maven-cache-config.xml
b/src/test/projects/core-extension/.mvn/maven-cache-config.xml
similarity index 100%
rename from
maven-caching-extension/src/test/projects/build-extension/.mvn/maven-cache-config.xml
rename to src/test/projects/core-extension/.mvn/maven-cache-config.xml
diff --git a/maven-caching-extension/src/test/projects/core-extension/pom.xml
b/src/test/projects/core-extension/pom.xml
similarity index 100%
rename from maven-caching-extension/src/test/projects/core-extension/pom.xml
rename to src/test/projects/core-extension/pom.xml
diff --git
a/maven-caching-extension/src/test/projects/build-extension/src/main/java/org/apache/maven/caching/Test.java
b/src/test/projects/core-extension/src/main/java/org/apache/maven/caching/Test.java
similarity index 100%
rename from
maven-caching-extension/src/test/projects/build-extension/src/main/java/org/apache/maven/caching/Test.java
rename to
src/test/projects/core-extension/src/main/java/org/apache/maven/caching/Test.java
diff --git
a/maven-caching-extension/src/test/resources/org/apache/maven/caching/xml/cache-build-instance.xml
b/src/test/resources/org/apache/maven/caching/xml/cache-build-instance.xml
similarity index 100%
rename from
maven-caching-extension/src/test/resources/org/apache/maven/caching/xml/cache-build-instance.xml
rename to
src/test/resources/org/apache/maven/caching/xml/cache-build-instance.xml
diff --git
a/maven-caching-extension/src/test/resources/org/apache/maven/caching/xml/cache-config-instance.xml
b/src/test/resources/org/apache/maven/caching/xml/cache-config-instance.xml
similarity index 100%
rename from
maven-caching-extension/src/test/resources/org/apache/maven/caching/xml/cache-config-instance.xml
rename to
src/test/resources/org/apache/maven/caching/xml/cache-config-instance.xml
diff --git
a/maven-caching-extension/src/test/resources/org/apache/maven/caching/xml/cache-diff-instance.xml
b/src/test/resources/org/apache/maven/caching/xml/cache-diff-instance.xml
similarity index 100%
rename from
maven-caching-extension/src/test/resources/org/apache/maven/caching/xml/cache-diff-instance.xml
rename to
src/test/resources/org/apache/maven/caching/xml/cache-diff-instance.xml
diff --git
a/maven-caching-extension/src/test/resources/org/apache/maven/caching/xml/cache-report-instance.xml
b/src/test/resources/org/apache/maven/caching/xml/cache-report-instance.xml
similarity index 100%
rename from
maven-caching-extension/src/test/resources/org/apache/maven/caching/xml/cache-report-instance.xml
rename to
src/test/resources/org/apache/maven/caching/xml/cache-report-instance.xml
diff --git
a/maven-caching-extension/src/test/resources/test-folder/test-pom.xml
b/src/test/resources/test-folder/test-pom.xml
similarity index 100%
rename from maven-caching-extension/src/test/resources/test-folder/test-pom.xml
rename to src/test/resources/test-folder/test-pom.xml
