From 1ead23ad9cdc4e4c01754aad4e0750987ae0b755 Mon Sep 17 00:00:00 2001
From: Gunnar Morling <gunnar.morling@googlemail.com>
Date: Fri, 30 May 2014 09:13:55 +0200
Subject: [PATCH] #169 Copying sources instead of classes from core-common to
 core/core-jdk to improve IDE experience; Splitting up integration tests

---
 core-common/pom.xml                           |  20 +++
 core-jdk8/pom.xml                             |  29 ++++-
 core/pom.xml                                  |  28 ++++-
 integrationtest-jdk8/pom.xml                  | 118 ++++++++++++++++++
 .../mapstruct/itest/java8/Java8Mapper.java    |   0
 .../org/mapstruct/itest/java8/Source.java     |   0
 .../org/mapstruct/itest/java8/Target.java     |   0
 .../itest/java8/Java8MapperTest.java          |  10 +-
 integrationtest/pom.xml                       | 100 ++-------------
 parent/pom.xml                                |   3 +-
 pom.xml                                       |   1 +
 11 files changed, 202 insertions(+), 107 deletions(-)
 create mode 100644 integrationtest-jdk8/pom.xml
 rename {integrationtest => integrationtest-jdk8}/src/main/java/org/mapstruct/itest/java8/Java8Mapper.java (100%)
 rename {integrationtest => integrationtest-jdk8}/src/main/java/org/mapstruct/itest/java8/Source.java (100%)
 rename {integrationtest => integrationtest-jdk8}/src/main/java/org/mapstruct/itest/java8/Target.java (100%)
 rename {integrationtest => integrationtest-jdk8}/src/test/java/org/mapstruct/itest/java8/Java8MapperTest.java (82%)

diff --git a/core-common/pom.xml b/core-common/pom.xml
index 5cbe3a4d2..e9c661f3c 100644
--- a/core-common/pom.xml
+++ b/core-common/pom.xml
@@ -61,6 +61,26 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/core-jdk8/pom.xml b/core-jdk8/pom.xml
index b4f06141f..4f8c72266 100644
--- a/core-jdk8/pom.xml
+++ b/core-jdk8/pom.xml
@@ -32,6 +32,11 @@
     <artifactId>mapstruct-jdk8</artifactId>
     <packaging>jar</packaging>
     <name>MapStruct Core JDK 8</name>
+    <description>MapStruct annotations to be used with JDK 8 and later</description>
+
+    <properties>
+        <common.sources.dir>copied-common-sources</common.sources.dir>
+    </properties>
 
     <dependencies>
         <dependency>
@@ -74,19 +79,39 @@
                     <target>1.8</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>add-copied-common-sources</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>${project.build.directory}/${common.sources.dir}</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
+                        <id>add-copied-common-sources</id>
                         <phase>process-resources</phase>
                         <goals>
                             <goal>unpack-dependencies</goal>
                         </goals>
                         <configuration>
                             <includeArtifactIds>mapstruct-common</includeArtifactIds>
-                            <includes>**/*.class</includes>
-                            <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+                            <includes>**/*.java</includes>
+                            <classifier>sources</classifier>
+                            <outputDirectory>${project.build.directory}/${common.sources.dir}</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/core/pom.xml b/core/pom.xml
index 7c196eded..4faa4245c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -33,6 +33,10 @@
     <packaging>jar</packaging>
     <name>MapStruct Core</name>
 
+    <properties>
+        <common.sources.dir>copied-common-sources</common.sources.dir>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -79,19 +83,39 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>add-copied-common-sources</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>${project.build.directory}/${common.sources.dir}</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
+                        <id>add-copied-common-sources</id>
                         <phase>process-resources</phase>
                         <goals>
                             <goal>unpack-dependencies</goal>
                         </goals>
                         <configuration>
                             <includeArtifactIds>mapstruct-common</includeArtifactIds>
-                            <includes>**/*.class</includes>
-                            <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+                            <includes>**/*.java</includes>
+                            <classifier>sources</classifier>
+                            <outputDirectory>${project.build.directory}/${common.sources.dir}</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/integrationtest-jdk8/pom.xml b/integrationtest-jdk8/pom.xml
new file mode 100644
index 000000000..6495b7125
--- /dev/null
+++ b/integrationtest-jdk8/pom.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright 2012-2014 Gunnar Morling (http://www.gunnarmorling.de/)
+ and/or other contributors as indicated by the @authors tag. See the
+ copyright.txt file in the distribution for a full listing of all
+ contributors.
+
+ Licensed 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.mapstruct</groupId>
+        <artifactId>mapstruct-parent</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../parent/pom.xml</relativePath>
+    </parent>
+
+    <artifactId>mapstruct-integrationtest-jdk8</artifactId>
+    <packaging>jar</packaging>
+    <name>MapStruct Integration Tests for JDK 8</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>mapstruct-jdk8</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.easytesting</groupId>
+            <artifactId>fest-assert</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.bsc.maven</groupId>
+                <artifactId>maven-processor-plugin</artifactId>
+                <configuration>
+                    <defaultOutputDirectory>${project.build.directory}/generated-sources/mapstruct</defaultOutputDirectory>
+                    <processors>
+                        <processor>org.mapstruct.ap.MappingProcessor</processor>
+                    </processors>
+                    <options>
+                        <!-- suppressGeneratorTimestamp=false is the default -->
+                        <suppressGeneratorTimestamp>false</suppressGeneratorTimestamp>
+                    </options>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>process</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>${project.groupId}</groupId>
+                        <artifactId>mapstruct-processor</artifactId>
+                        <version>${project.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>check-style</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>checkstyle</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/integrationtest/src/main/java/org/mapstruct/itest/java8/Java8Mapper.java b/integrationtest-jdk8/src/main/java/org/mapstruct/itest/java8/Java8Mapper.java
similarity index 100%
rename from integrationtest/src/main/java/org/mapstruct/itest/java8/Java8Mapper.java
rename to integrationtest-jdk8/src/main/java/org/mapstruct/itest/java8/Java8Mapper.java
diff --git a/integrationtest/src/main/java/org/mapstruct/itest/java8/Source.java b/integrationtest-jdk8/src/main/java/org/mapstruct/itest/java8/Source.java
similarity index 100%
rename from integrationtest/src/main/java/org/mapstruct/itest/java8/Source.java
rename to integrationtest-jdk8/src/main/java/org/mapstruct/itest/java8/Source.java
diff --git a/integrationtest/src/main/java/org/mapstruct/itest/java8/Target.java b/integrationtest-jdk8/src/main/java/org/mapstruct/itest/java8/Target.java
similarity index 100%
rename from integrationtest/src/main/java/org/mapstruct/itest/java8/Target.java
rename to integrationtest-jdk8/src/main/java/org/mapstruct/itest/java8/Target.java
diff --git a/integrationtest/src/test/java/org/mapstruct/itest/java8/Java8MapperTest.java b/integrationtest-jdk8/src/test/java/org/mapstruct/itest/java8/Java8MapperTest.java
similarity index 82%
rename from integrationtest/src/test/java/org/mapstruct/itest/java8/Java8MapperTest.java
rename to integrationtest-jdk8/src/test/java/org/mapstruct/itest/java8/Java8MapperTest.java
index ec306b540..41017a788 100644
--- a/integrationtest/src/test/java/org/mapstruct/itest/java8/Java8MapperTest.java
+++ b/integrationtest-jdk8/src/test/java/org/mapstruct/itest/java8/Java8MapperTest.java
@@ -20,9 +20,7 @@
 package org.mapstruct.itest.java8;
 
 import static org.fest.assertions.Assertions.assertThat;
-import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
+
 import org.junit.Test;
 
 /**
@@ -32,12 +30,6 @@ import org.junit.Test;
  */
 public class Java8MapperTest {
 
-    @Deployment
-    public static JavaArchive createDeployment() {
-        return ShrinkWrap.create( JavaArchive.class )
-            .addPackage( Java8Mapper.class.getPackage() );
-    }
-
     @Test
     public void shouldMapWithRepeatedMappingAnnotation() {
         Java8Mapper mapper = Java8Mapper.INSTANCE;
diff --git a/integrationtest/pom.xml b/integrationtest/pom.xml
index b8b86d279..2c2f4abb7 100644
--- a/integrationtest/pom.xml
+++ b/integrationtest/pom.xml
@@ -34,6 +34,13 @@
     <name>MapStruct Integration Test</name>
 
     <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>mapstruct</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- Testing -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -211,97 +218,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>jdk-lt-8</id>
-            <activation>
-                <jdk>[,1.8)</jdk>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>mapstruct</artifactId>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-compiler-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>default-compile</id>
-                                <phase>compile</phase>
-                                <configuration>
-                                    <excludes>
-                                        <exclude>**/java8/</exclude>
-                                    </excludes>
-                                </configuration>
-                                <goals>
-                                    <goal>compile</goal>
-                                </goals>
-                            </execution>
-                            <execution>
-                                <id>default-testCompile</id>
-                                <phase>test-compile</phase>
-                                <configuration>
-                                    <testExcludes>
-                                        <exclude>**/java8/</exclude>
-                                    </testExcludes>
-                                </configuration>
-                                <goals>
-                                    <goal>testCompile</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.bsc.maven</groupId>
-                        <artifactId>maven-processor-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>process</id>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <excludes>
-                                        <exclude>**/java8/</exclude>
-                                    </excludes>
-                                </configuration>
-                                <goals>
-                                    <goal>process</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>jdk-geq-8</id>
-            <activation>
-                <jdk>1.8</jdk>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>mapstruct-jdk8</artifactId>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-compiler-plugin</artifactId>
-                        <configuration>
-                            <source>1.8</source>
-                            <target>1.8</target>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
diff --git a/parent/pom.xml b/parent/pom.xml
index 6a94af70f..6fe658d04 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -372,6 +372,7 @@
                                         <versionRange>[2.4,)</versionRange>
                                         <goals>
                                             <goal>copy-dependencies</goal>
+                                            <goal>unpack-dependencies</goal>
                                         </goals>
                                     </pluginExecutionFilter>
                                     <action>
@@ -489,7 +490,7 @@
                         <configuration>
                             <rules>
                                 <requireJavaVersion>
-                                    <version>[1.6,)</version>
+                                    <version>[1.8,)</version>
                                 </requireJavaVersion>
                                 <DependencyConvergence />
                                 <requirePluginVersions />
diff --git a/pom.xml b/pom.xml
index 194d9ffb1..345f851fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,6 +42,7 @@
         <module>core-jdk8</module>
         <module>processor</module>
         <module>integrationtest</module>
+        <module>integrationtest-jdk8</module>
     </modules>
 
     <build>