Resolved J-74: Clean maven config to reflect moving to JDK 7.

- Removed JDK 7 (or higher) specific maven pom profiles
- Moved JDK 7 or higher unit tests to the location of all the unit tests

Change-Id: I97727a8e7fe8e14a01c96dbb7efed4be246af1fe
Signed-off-by: Marek Potociar <[email protected]>

Author: Marek Potociar

incubator/pom.xml

@@ -64,16 +64,4 @@
         <module>html-json</module>
     </modules>
 
-    <profiles>
-        <profile>
-            <id>jdk7-or-higher</id>
-            <activation>
-                <jdk>(1.6,)</jdk>
-            </activation>
-            <modules>
-                <module>html-json</module>
-            </modules>
-        </profile>
-    </profiles>
-
 </project>

media/multipart/pom.xml

@@ -143,35 +143,4 @@
         </dependency>
     </dependencies>
 
-    <profiles>
-        <profile>
-            <id>add-tests-on-jdk-7-or-higher</id>
-            <activation>
-                <jdk>(1.6,)</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/java7</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
 </project>

media/multipart/src/test/java7/org/glassfish/jersey/media/multipart/internal/MultiPartHeaderModificationTest.java renamed to media/multipart/src/test/java/org/glassfish/jersey/media/multipart/internal/MultiPartHeaderModificationTest.java

@@ -191,35 +191,6 @@
     </dependencies>
 
     <profiles>
-        <profile>
-            <id>add-tests-on-jdk-7-or-higher</id>
-            <activation>
-                <jdk>(1.6,)</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/java7</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
         <profile>
             <id>xdk</id>
             <properties>