You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by tr...@apache.org on 2006/11/19 06:22:28 UTC

svn commit: r476720 - /mina/branches/1.1/pom.xml

Author: trustin
Date: Sat Nov 18 21:22:28 2006
New Revision: 476720

URL: http://svn.apache.org/viewvc?view=rev&rev=476720
Log:
Fixed more problems in the pom


Modified:
    mina/branches/1.1/pom.xml

Modified: mina/branches/1.1/pom.xml
URL: http://svn.apache.org/viewvc/mina/branches/1.1/pom.xml?view=diff&rev=476720&r1=476719&r2=476720
==============================================================================
--- mina/branches/1.1/pom.xml (original)
+++ mina/branches/1.1/pom.xml Sat Nov 18 21:22:28 2006
@@ -65,70 +65,15 @@
   <repositories>
   </repositories>
 
-  <profiles>
-    <profile>
-      <id>jdk1.5</id>
-      <activation>
-        <jdk>1.5</jdk>
-      </activation>
-      <modules>
-        <module>core</module>
-        <module>filter-ssl</module>
-        <module>filter-codec-netty</module>
-        <module>filter-compression</module>
-        <module>integration-spring</module>
-	      <module>integration-jmx</module>
-        <module>example</module>
-      </modules>
-    </profile>
-
-    <profile>
-      <id>jdk1.4</id>
-      <activation>
-        <jdk>1.4</jdk>
-      </activation>
-      <modules>
-        <module>core</module>
-        <module>filter-codec-netty</module>
-        <module>filter-compression</module>
-      </modules>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-              <execution>
-                <phase>validate</phase>
-                <configuration>
-                  <tasks>
-                    <echo>
-====================================================================
-                       W A R N I N G
-                       -------------
-
-Build with 1.4 jvm will not include modules:
- 
- o mina-java5
- o mina-filter-ssl
- o mina-integration-spring
- o mina-example
- o mina-jmx
-
-Use JDK 1.5 to make sure these modules build.
-====================================================================
-                    </echo>
-                  </tasks>
-                </configuration>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
+  <modules>
+    <module>core</module>
+    <module>filter-ssl</module>
+    <module>filter-codec-netty</module>
+    <module>filter-compression</module>
+    <module>integration-spring</module>
+    <module>integration-jmx</module>
+    <module>example</module>
+  </modules>
   
   <build>
     <plugins>
@@ -136,8 +81,8 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.4</source>
-          <target>1.4</target>
+          <source>1.5</source>
+          <target>1.5</target>
           <debug>true</debug>
           <optimize>true</optimize>
           <showDeprecations>true</showDeprecations>