[Bug 411069] update minimum jdk versions in pom.xml's

2013-08-20 12:40:33 -05:00 · 2013-08-20 12:40:33 -05:00 · a69deacc4c
parent 2761abb658
commit a69deacc4c
11 changed files with 1 additions and 56 deletions
--- a/jetty-jndi/pom.xml
+++ b/jetty-jndi/pom.xml
@ -69,18 +69,4 @@
      <artifactId>javax.mail.glassfish</artifactId>
    </dependency>
  </dependencies>
-  <profiles>
-    <profile>
-      <id>below-jdk1.6</id>
-      <activation>
-       <jdk>(,1.6)</jdk>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>org.eclipse.jetty.orbit</groupId>
-          <artifactId>javax.activation</artifactId>
-        </dependency>
-      </dependencies>
-    </profile>
-  </profiles>
 </project>
--- a/jetty-nosql/pom.xml
+++ b/jetty-nosql/pom.xml
@ -14,16 +14,6 @@
  <build>
    <defaultGoal>install</defaultGoal>
    <plugins>
-      <!-- Jetty 7 is JDK5 +
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-          <verbose>false</verbose>
-        </configuration>
-      </plugin>
-       -->
      <plugin>
        <groupId>org.apache.felix</groupId>
        <artifactId>maven-bundle-plugin</artifactId>
--- a/jetty-osgi/test-jetty-osgi-context/pom.xml
+++ b/jetty-osgi/test-jetty-osgi-context/pom.xml
@ -102,8 +102,6 @@
 *
                        </Import-Package>
                        <DynamicImport-Package>org.eclipse.jetty.*;version="[9.0,10.0)"</DynamicImport-Package>
-                        <!--Require-Bundle/-->
-                        <!-- Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment --> 
                    </instructions>
                </configuration>
            </plugin>
--- a/jetty-osgi/test-jetty-osgi-webapp/pom.xml
+++ b/jetty-osgi/test-jetty-osgi-webapp/pom.xml
@ -97,8 +97,6 @@
 *
                        </Import-Package>
                        <DynamicImport-Package>org.eclipse.jetty.*;version="[9.0,10.0)"</DynamicImport-Package>
-                        <!--Require-Bundle/-->
-                        <!-- Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment --> 
                    </instructions>
                </configuration>
            </plugin>
--- a/pom.xml
+++ b/pom.xml
@ -391,7 +391,7 @@
        <artifactId>maven-pmd-plugin</artifactId>
        <version>2.7.1</version>
        <configuration>
-          <targetJdk>1.5</targetJdk>
+          <targetJdk>1.7</targetJdk>
          <rulesets>
            <ruleset>jetty/pmd_ruleset.xml</ruleset>
          </rulesets>
--- a/tests/test-sessions/test-hash-sessions/pom.xml
+++ b/tests/test-sessions/test-hash-sessions/pom.xml
@ -28,13 +28,6 @@
  <url>http://www.eclipse.org/jetty</url>
  <build>
    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-        </configuration>
-      </plugin>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-deploy-plugin</artifactId>
--- a/tests/test-sessions/test-jdbc-sessions/pom.xml
+++ b/tests/test-sessions/test-jdbc-sessions/pom.xml
@ -28,13 +28,6 @@
  <url>http://www.eclipse.org/jetty</url>
  <build>
    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-        </configuration>
-      </plugin>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-deploy-plugin</artifactId>
--- a/tests/test-sessions/test-mongodb-sessions/pom.xml
+++ b/tests/test-sessions/test-mongodb-sessions/pom.xml
@ -28,13 +28,6 @@
  <url>http://www.eclipse.org/jetty</url>
  <build>
    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-        </configuration>
-      </plugin>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-deploy-plugin</artifactId>
--- a/tests/test-webapps/test-mock-resources/pom.xml
+++ b/tests/test-webapps/test-mock-resources/pom.xml
@ -13,8 +13,6 @@
      <plugin>
        <artifactId>maven-compiler-plugin</artifactId>
        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
          <verbose>false</verbose>
        </configuration>
      </plugin>
--- a/tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
+++ b/tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
@ -13,8 +13,6 @@
       <plugin>
        <artifactId>maven-compiler-plugin</artifactId>
        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
          <verbose>false</verbose>
        </configuration>
       </plugin>
--- a/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
+++ b/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
@ -14,8 +14,6 @@
      <plugin>
        <artifactId>maven-compiler-plugin</artifactId>
        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
          <verbose>false</verbose>
        </configuration>
      </plugin>