You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2012/03/30 21:15:50 UTC
svn commit: r1307575 - in /tomcat/trunk/res/maven: mvn-pub.xml
tomcat-catalina-ha.pom tomcat-catalina.pom tomcat-coyote.pom
tomcat-embed-jasper.pom tomcat-jasper.pom tomcat-jni.pom tomcat-spdy.pom
tomcat-util.pom
Author: markt
Date: Fri Mar 30 19:15:50 2012
New Revision: 1307575
URL: http://svn.apache.org/viewvc?rev=1307575&view=rev
Log:
Add new JARs to Maven build.
Review dependencies and add a few new ones as well as some missing ones.
Added:
tomcat/trunk/res/maven/tomcat-jni.pom (with props)
tomcat/trunk/res/maven/tomcat-spdy.pom (with props)
Modified:
tomcat/trunk/res/maven/mvn-pub.xml
tomcat/trunk/res/maven/tomcat-catalina-ha.pom
tomcat/trunk/res/maven/tomcat-catalina.pom
tomcat/trunk/res/maven/tomcat-coyote.pom
tomcat/trunk/res/maven/tomcat-embed-jasper.pom
tomcat/trunk/res/maven/tomcat-jasper.pom
tomcat/trunk/res/maven/tomcat-util.pom
Modified: tomcat/trunk/res/maven/mvn-pub.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn-pub.xml?rev=1307575&r1=1307574&r2=1307575&view=diff
==============================================================================
--- tomcat/trunk/res/maven/mvn-pub.xml (original)
+++ tomcat/trunk/res/maven/mvn-pub.xml Fri Mar 30 19:15:50 2012
@@ -252,6 +252,8 @@
srcJarFileName="servlet-api-src.jar"/>
<doMavenDeploy artifactId="tomcat-api"/>
+ <doMavenDeploy artifactId="tomcat-jni"/>
+ <doMavenDeploy artifactId="tomcat-spdy"/>
<doMavenDeploy artifactId="tomcat-util"/>
<doMavenDeploy artifactId="tomcat-coyote"/>
<doMavenDeploy artifactId="tomcat-dbcp"/>
Modified: tomcat/trunk/res/maven/tomcat-catalina-ha.pom
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-catalina-ha.pom?rev=1307575&r1=1307574&r2=1307575&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-catalina-ha.pom (original)
+++ tomcat/trunk/res/maven/tomcat-catalina-ha.pom Fri Mar 30 19:15:50 2012
@@ -52,5 +52,11 @@
<version>@MAVEN.DEPLOY.VERSION@</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-util</artifactId>
+ <version>@MAVEN.DEPLOY.VERSION@</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
</project>
Modified: tomcat/trunk/res/maven/tomcat-catalina.pom
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-catalina.pom?rev=1307575&r1=1307574&r2=1307575&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-catalina.pom (original)
+++ tomcat/trunk/res/maven/tomcat-catalina.pom Fri Mar 30 19:15:50 2012
@@ -48,6 +48,12 @@
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jni</artifactId>
+ <version>@MAVEN.DEPLOY.VERSION@</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-util</artifactId>
<version>@MAVEN.DEPLOY.VERSION@</version>
<scope>compile</scope>
Modified: tomcat/trunk/res/maven/tomcat-coyote.pom
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-coyote.pom?rev=1307575&r1=1307574&r2=1307575&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-coyote.pom (original)
+++ tomcat/trunk/res/maven/tomcat-coyote.pom Fri Mar 30 19:15:50 2012
@@ -24,9 +24,21 @@
<dependencies>
<dependency>
<groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jni</artifactId>
+ <version>@MAVEN.DEPLOY.VERSION@</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-juli</artifactId>
<version>@MAVEN.DEPLOY.VERSION@</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-util</artifactId>
+ <version>@MAVEN.DEPLOY.VERSION@</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
</project>
Modified: tomcat/trunk/res/maven/tomcat-embed-jasper.pom
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-embed-jasper.pom?rev=1307575&r1=1307574&r2=1307575&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-embed-jasper.pom (original)
+++ tomcat/trunk/res/maven/tomcat-embed-jasper.pom Fri Mar 30 19:15:50 2012
@@ -28,5 +28,10 @@
<version>@MAVEN.DEPLOY.VERSION@</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jdt.core.compiler</groupId>
+ <artifactId>ecj</artifactId>
+ <version>3.7.2</version>
+ </dependency>
</dependencies>
</project>
Modified: tomcat/trunk/res/maven/tomcat-jasper.pom
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-jasper.pom?rev=1307575&r1=1307574&r2=1307575&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-jasper.pom (original)
+++ tomcat/trunk/res/maven/tomcat-jasper.pom Fri Mar 30 19:15:50 2012
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.eclipse.jdt.core.compiler</groupId>
<artifactId>ecj</artifactId>
- <version>3.7</version>
+ <version>3.7.2</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
Added: tomcat/trunk/res/maven/tomcat-jni.pom
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-jni.pom?rev=1307575&view=auto
==============================================================================
--- tomcat/trunk/res/maven/tomcat-jni.pom (added)
+++ tomcat/trunk/res/maven/tomcat-jni.pom Fri Mar 30 19:15:50 2012
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jni</artifactId>
+ <version>@MAVEN.DEPLOY.VERSION@</version>
+ <description>Interface code to the native connector</description>
+</project>
Propchange: tomcat/trunk/res/maven/tomcat-jni.pom
------------------------------------------------------------------------------
svn:eol-style = native
Added: tomcat/trunk/res/maven/tomcat-spdy.pom
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-spdy.pom?rev=1307575&view=auto
==============================================================================
--- tomcat/trunk/res/maven/tomcat-spdy.pom (added)
+++ tomcat/trunk/res/maven/tomcat-spdy.pom Fri Mar 30 19:15:50 2012
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-spdy</artifactId>
+ <version>@MAVEN.DEPLOY.VERSION@</version>
+ <description>SPDY implementation</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jni</artifactId>
+ <version>@MAVEN.DEPLOY.VERSION@</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-juli</artifactId>
+ <version>@MAVEN.DEPLOY.VERSION@</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-coyote</artifactId>
+ <version>@MAVEN.DEPLOY.VERSION@</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+</project>
Propchange: tomcat/trunk/res/maven/tomcat-spdy.pom
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tomcat/trunk/res/maven/tomcat-util.pom
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-util.pom?rev=1307575&r1=1307574&r2=1307575&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-util.pom (original)
+++ tomcat/trunk/res/maven/tomcat-util.pom Fri Mar 30 19:15:50 2012
@@ -21,4 +21,18 @@
<artifactId>tomcat-util</artifactId>
<version>@MAVEN.DEPLOY.VERSION@</version>
<description>Common code shared by Catalina and Jasper</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-juli</artifactId>
+ <version>@MAVEN.DEPLOY.VERSION@</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-api</artifactId>
+ <version>@MAVEN.DEPLOY.VERSION@</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org