You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by pm...@apache.org on 2006/12/01 22:26:44 UTC
svn commit: r481402 - in /geronimo/specs/trunk: geronimo-jsp_2.1_spec/pom.xml
geronimo-jsp_2.1_spec/src/main/java/javax/servlet/jsp/ pom.xml
Author: pmcmahan
Date: Fri Dec 1 13:26:43 2006
New Revision: 481402
URL: http://svn.apache.org/viewvc?view=rev&rev=481402
Log:
interim copy of jsp 2.1 from tomcat 6 before restructure to allow svn history to be retained
adjust poms to use jdk1.5 for geronimo-jsp_2.1_spec
Added:
geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/java/javax/servlet/jsp/
- copied from r481353, tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/
Modified:
geronimo/specs/trunk/geronimo-jsp_2.1_spec/pom.xml
geronimo/specs/trunk/pom.xml
Modified: geronimo/specs/trunk/geronimo-jsp_2.1_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jsp_2.1_spec/pom.xml?view=diff&rev=481402&r1=481401&r2=481402
==============================================================================
--- geronimo/specs/trunk/geronimo-jsp_2.1_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jsp_2.1_spec/pom.xml Fri Dec 1 13:26:43 2006
@@ -41,9 +41,34 @@
<artifactId>geronimo-servlet_2.5_spec</artifactId>
<version>1.1-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_1.0_spec</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ </dependency>
</dependencies>
<build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <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-idea-plugin</artifactId>
+ <configuration>
+ <jdkName>1.5</jdkName>
+ <linkModules>true</linkModules>
+ </configuration>
+ </plugin>
+ </plugins>
+
<resources>
<resource>
<targetPath>javax/servlet/jsp/resources</targetPath>
Modified: geronimo/specs/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/pom.xml?view=diff&rev=481402&r1=481401&r2=481402
==============================================================================
--- geronimo/specs/trunk/pom.xml (original)
+++ geronimo/specs/trunk/pom.xml Fri Dec 1 13:26:43 2006
@@ -164,7 +164,6 @@
<module>geronimo-jaxrpc_1.1_spec</module>
<module>geronimo-jms_1.1_spec</module>
<module>geronimo-jsp_2.0_spec</module>
- <module>geronimo-jsp_2.1_spec</module>
<module>geronimo-jta_1.0.1B_spec</module>
<module>geronimo-jta_1.1_spec</module>
<module>geronimo-qname_1.1_spec</module>
@@ -196,6 +195,7 @@
<module>geronimo-el_1.0_spec</module>
<module>geronimo-interceptor_3.0_spec</module>
<module>geronimo-jpa_3.0_spec</module>
+ <module>geronimo-jsp_2.1_spec</module>
<module>geronimo-ws-metadata_2.0_spec</module>
</modules>
</profile>