Author: jfclere
Date: Fri Nov 3 12:43:19 2017
New Revision: 1814172
URL: http://svn.apache.org/viewvc?rev=1814172&view=rev
Log:
Merge branch 'maven-install' of https://github.com/maxime-beck/tomcat into trunk
Modified:
tomcat/trunk/res/maven/mvn-pub.xml
Modified: tomcat/trunk/res/maven/mvn-pub.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn-pub.xml?rev=1814172&r1=1814171&r2=1814172&view=diff
==============================================================================
--- tomcat/trunk/res/maven/mvn-pub.xml (original)
+++ tomcat/trunk/res/maven/mvn-pub.xml Fri Nov 3 12:43:19 2017
@@ -42,6 +42,45 @@
</typedef>
</target>
+ <target name="maven-install" depends="init-maven">
+ <!--cleanup-->
+ <delete file="${pom}.tmp"/>
+
+ <!--replace the version in the pom-->
+ <copy file="${pom}" tofile="${pom}.tmp">
+ <filterset>
+ <filter token="MAVEN.DEPLOY.VERSION" value="${maven.deploy.version}"/>
+ </filterset>
+ </copy>
+
+ <artifact:install file="${file}">
+ <pom file="${pom}.tmp"/>
+ </artifact:install>
+
+ <delete file="${pom}.tmp"/>
+ </target>
+
+ <macrodef name="doMavenInstall">
+ <attribute name="artifactId"/>
+ <attribute name="jarFileName" default="@{artifactId}.jar" />
+ <attribute name="groupId" default="org.apache.tomcat" />
+ <attribute name="file" default="${tomcat.lib.path}/@{jarFileName}" />
+ <attribute name="pom" default="@{artifactId}.pom" />
+ <attribute name="srcJarFileName" default="@{artifactId}-src.jar" />
+ <attribute name="src" default="${tomcat.src.path}/@{srcJarFileName}" />
+ <sequential>
+ <antcall target="maven-install">
+ <param name="file" value="@{file}"/>
+ <param name="groupId" value="@{groupId}"/>
+ <param name="artifactId" value="@{artifactId}"/>
+ <param name="pom" value="${tomcat.pom.path}/@{pom}"/>
+ <param name="src" value="@{src}"/>
+ <param name="src.skip" value="@{src.skip}"/>
+ <param name="maven.deploy.version" value="9.0.2-dev"/>
+ </antcall>
+ </sequential>
+ </macrodef>
+
<target name="maven-deploy" depends="init-maven">
<!--cleanup-->
<delete file="${pom}.tmp"/>
@@ -227,6 +266,108 @@
</sequential>
</macrodef>
+ <target name="generic-install" depends="init-maven">
+ <doMavenInstall artifactId="tomcat-juli"
+ file="${tomcat.bin.path}/tomcat-juli.jar"/>
+
+ <!-- Standard jars in lib directory -->
+ <doMavenInstall artifactId="tomcat-annotations-api"
+ jarFileName="annotations-api.jar"
+ srcJarFileName="annotations-api-src.jar"/>
+
+ <doMavenInstall artifactId="tomcat-catalina"
+ jarFileName="catalina.jar"
+ srcJarFileName="catalina-src.jar"/>
+
+ <doMavenInstall artifactId="tomcat-catalina-ant"
+ jarFileName="catalina-ant.jar"
+ srcJarFileName="catalina-ant-src.jar"/>
+
+ <doMavenInstall artifactId="tomcat-catalina-ha"
+ jarFileName="catalina-ha.jar"
+ srcJarFileName="catalina-ha-src.jar"/>
+
+ <doMavenInstall artifactId="tomcat-tribes"
+ jarFileName="catalina-tribes.jar"
+ srcJarFileName="catalina-tribes-src.jar"/>
+
+ <doMavenInstall artifactId="tomcat-storeconfig"
+ jarFileName="catalina-storeconfig.jar"
+ srcJarFileName="catalina-storeconfig-src.jar"/>
+
+ <doMavenInstall artifactId="tomcat-jdbc"
+ jarFileName="tomcat-jdbc.jar"
+ srcJarFileName="tomcat-jdbc-src.jar"/>
+
+ <doMavenInstall artifactId="tomcat-el-api"
+ jarFileName="el-api.jar"
+ srcJarFileName="el-api-src.jar"/>
+
+ <doMavenInstall artifactId="tomcat-jasper"
+ jarFileName="jasper.jar"
+ srcJarFileName="jasper-src.jar"/>
+
+ <doMavenInstall artifactId="tomcat-jasper-el"
+ jarFileName="jasper-el.jar"
+ srcJarFileName="jasper-el-src.jar"/>
+
+ <doMavenInstall artifactId="tomcat-jsp-api"
+ jarFileName="jsp-api.jar"
+ srcJarFileName="jsp-api-src.jar"/>
+
+ <doMavenInstall artifactId="tomcat-servlet-api"
+ jarFileName="servlet-api.jar"
+ srcJarFileName="servlet-api-src.jar"/>
+
+ <doMavenInstall artifactId="tomcat-websocket-api"
+ jarFileName="websocket-api.jar"
+ srcJarFileName="websocket-api-src.jar"/>
+
+ <doMavenInstall artifactId="tomcat-jaspic-api"
+ jarFileName="jaspic-api.jar"
+ srcJarFileName="jaspic-api-src.jar"/>
+
+ <doMavenInstall artifactId="tomcat-api"/>
+ <doMavenInstall artifactId="tomcat-jni"/>
+ <doMavenInstall artifactId="tomcat-util"/>
+ <doMavenInstall artifactId="tomcat-util-scan"/>
+ <doMavenInstall artifactId="tomcat-coyote"/>
+ <doMavenInstall artifactId="tomcat-dbcp"/>
+ <doMavenInstall artifactId="tomcat-websocket"/>
+
+ <!-- Extras jars -->
+ <doMavenInstall artifactId="tomcat-catalina-jmx-remote"
+ groupId="org.apache.tomcat.extras"
+ file="${tomcat.extras.path}/catalina-jmx-remote.jar"
+ src="${tomcat.extras.src.path}/catalina-jmx-remote-src.jar" />
+ <doMavenInstall artifactId="tomcat-catalina-ws"
+ groupId="org.apache.tomcat.extras"
+ file="${tomcat.extras.path}/catalina-ws.jar"
+ src="${tomcat.extras.src.path}/catalina-ws-src.jar" />
+
+ <!-- Emedded jars -->
+ <doMavenInstall artifactId="tomcat-embed-core"
+ groupId="org.apache.tomcat.embed"
+ file="${tomcat.embed.path}/tomcat-embed-core.jar"
+ pom="tomcat-embed-core.pom"
+ src="${tomcat.embed.src.path}/tomcat-embed-core-src.jar"/>
+ <doMavenInstall artifactId="tomcat-embed-jasper"
+ groupId="org.apache.tomcat.embed"
+ file="${tomcat.embed.path}/tomcat-embed-jasper.jar"
+ pom="tomcat-embed-jasper.pom"
+ src="${tomcat.embed.src.path}/tomcat-embed-jasper-src.jar"/>
+ <doMavenInstall 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"/>
+ <doMavenInstall 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"/>
+ </target>
+
<target name="generic-deploy"
depends="init-maven,init-gpg-1,init-gpg-2,init-ldap">
<!-- Standard jars in bin directory -->
<!-- Skip bootstrap.jar - it is just a subset of catalina.jar -->
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
