Author: markt
Date: Fri Jan 24 12:24:24 2014
New Revision: 1560968
URL: http://svn.apache.org/r1560968
Log:
Correct issue back-porting fix for bug 56044
Ensure new JARs are published
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/build.xml
tomcat/tc7.0.x/trunk/res/maven/mvn-pub.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1560922
Modified: tomcat/tc7.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1560968&r1=1560967&r2=1560968&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Fri Jan 24 12:24:24 2014
@@ -1153,7 +1153,6 @@
<jarIt jarfile="${tomcat-embed-jasper.jar}"
filesDir="${tomcat.classes}"
filesId="files.tomcat-embed-jasper"
- meta-inf="${tomcat.manifests}/jasper.jar"
notice="${tomcat.manifests}/jsp-api.jar.notice"
license="${tomcat.manifests}/jsp-api.jar.jar.license"/>
<jarIt jarfile="${tomcat-embed-el.jar}"
Modified: tomcat/tc7.0.x/trunk/res/maven/mvn-pub.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/maven/mvn-pub.xml?rev=1560968&r1=1560967&r2=1560968&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/maven/mvn-pub.xml (original)
+++ tomcat/tc7.0.x/trunk/res/maven/mvn-pub.xml Fri Jan 24 12:24:24 2014
@@ -348,6 +348,16 @@
file="${tomcat.embed.path}/tomcat-embed-jasper.jar"
pom="tomcat-embed-jasper.pom"
src="${tomcat.embed.src.path}/tomcat-embed-jasper-src.jar"/>
+ <doMavenDeploy artifactId="tomcat-embed-el"
+ groupId="org.apache.tomcat.embed"
+ file="${tomcat.embed.path}/tomcat-embed-el.jar"
+ pom="tomcat-embed-el.pom"
+ src="${tomcat.embed.src.path}/tomcat-embed-el-src.jar"/>
+ <doMavenDeploy artifactId="tomcat-embed-websocket"
+ groupId="org.apache.tomcat.embed"
+ file="${tomcat.embed.path}/tomcat-embed-websocket.jar"
+ pom="tomcat-embed-websocket.pom"
+ src="${tomcat.embed.src.path}/tomcat-embed-websocket-src.jar"/>
<doMavenDeploy artifactId="tomcat-embed-logging-juli"
groupId="org.apache.tomcat.embed"
file="${tomcat.embed.path}/tomcat-embed-logging-juli.jar"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
