Author: markt
Date: Thu Jun 21 18:47:05 2012
New Revision: 1352650
URL: http://svn.apache.org/viewvc?rev=1352650&view=rev
Log:
Align Tomcat 6 Maven deploy script with the Tomcat 7/trunk version
Added:
tomcat/tc6.0.x/trunk/res/maven/catalina-ant.pom (with props)
tomcat/tc6.0.x/trunk/res/maven/tomcat-catalina-jmx-remote.pom (with props)
tomcat/tc6.0.x/trunk/res/maven/tomcat-catalina-ws.pom (with props)
tomcat/tc6.0.x/trunk/res/maven/tomcat-i18n-es.pom (with props)
tomcat/tc6.0.x/trunk/res/maven/tomcat-i18n-fr.pom (with props)
tomcat/tc6.0.x/trunk/res/maven/tomcat-i18n-ja.pom (with props)
Modified:
tomcat/tc6.0.x/trunk/res/maven/ (props changed)
tomcat/tc6.0.x/trunk/res/maven/README.txt
tomcat/tc6.0.x/trunk/res/maven/mvn-pub.xml
tomcat/tc6.0.x/trunk/res/maven/mvn.properties.default
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/res/maven/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jun 21 18:47:05 2012
@@ -0,0 +1 @@
+mvn.properties
Modified: tomcat/tc6.0.x/trunk/res/maven/README.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/maven/README.txt?rev=1352650&r1=1352649&r2=1352650&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/maven/README.txt (original)
+++ tomcat/tc6.0.x/trunk/res/maven/README.txt Thu Jun 21 18:47:05 2012
@@ -1,24 +1,41 @@
-================================================================================
- 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.
-================================================================================
-
-$Id$
-To release do the following:
-1 - copy mvn.properties.default to mvn.propertie and adjust it.
-2 - ant -f mvn-pub.xml deploy-release
- that step creates a staging in
https://repository.apache.org/index.html#stagingRepositories
-3 - test it and do the vote process
-4 - in https://repository.apache.org/index.html#stagingRepositories close it
and then promote it.
+================================================================================
+ 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.
+================================================================================
+
+$Id$
+
+General preparations before any publishing:
+1 - Download Maven Ant Tasks (version 2.1.0 is known to work) and place it in
+ this directory
+2 - Generate a standard Tomcat release (see BUILDING.txt)
+3 - Copy mvn.properties.default to mvn.properties and adjust it as necessary.
+ You will need to set asf.ldap.username and you'll probably need to set
+ gpg.exec
+ The other properties should be OK. Note: you will be prompted for your
+ GPG pass-phrase and LDAP password when the script runs.
+
+To publish a snapshot do the following:
+1 - ant -f mvn-pub.xml deploy-snapshot
+ This populates
+
https://repository.apache.org/content/repositories/snapshots/org/apache/tomcat/
+
+To release do the following:
+1 - ant -f mvn-pub.xml deploy-release
+ that step creates a staging area in
+ https://repository.apache.org/index.html#stagingRepositories
+2 - check the upload and then close the repository
+3 - include the repository in the VOTE thread
+4 - in https://repository.apache.org/index.html#stagingRepositories release it
Added: tomcat/tc6.0.x/trunk/res/maven/catalina-ant.pom
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/maven/catalina-ant.pom?rev=1352650&view=auto
==============================================================================
--- tomcat/tc6.0.x/trunk/res/maven/catalina-ant.pom (added)
+++ tomcat/tc6.0.x/trunk/res/maven/catalina-ant.pom Thu Jun 21 18:47:05 2012
@@ -0,0 +1,46 @@
+<?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>catalina-ant</artifactId>
+ <version>@MAVEN.DEPLOY.VERSION@</version>
+ <description>Tomcat Ant tasks for remote management</description>
+ <url>http://tomcat.apache.org/</url>
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>coyote</artifactId>
+ <version>@MAVEN.DEPLOY.VERSION@</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>catalina</artifactId>
+ <version>@MAVEN.DEPLOY.VERSION@</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+</project>
Propchange: tomcat/tc6.0.x/trunk/res/maven/catalina-ant.pom
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tomcat/tc6.0.x/trunk/res/maven/mvn-pub.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/maven/mvn-pub.xml?rev=1352650&r1=1352649&r2=1352650&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/maven/mvn-pub.xml (original)
+++ tomcat/tc6.0.x/trunk/res/maven/mvn-pub.xml Thu Jun 21 18:47:05 2012
@@ -15,82 +15,42 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="Tomcat 6.0" default="" basedir="."
xmlns:artifact="urn:maven-artifact-ant">
-
+<project name="Tomcat 6.0 Maven Deployment" default="" basedir="."
+ xmlns:artifact="urn:maven-artifact-ant">
<!--
- Built for using Maven 2.0.4
- Two additional jar files required, please download from
- http://people.apache.org/~fhanik/tomcat/maven/
-
- -->
- <!--
- Properties required to be set:
- maven.home - full path to Maven2 installation, mvn or mvn.bat is assumed to
be in ${maven.home}/bin/
- maven.bin - the script to execute for maven, would be mvn or mvn.bat
- maven.repo.url - the URL of the repository, for example
scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository
- maven.repo.repositoryId - the id of the repository, for example
apache.snapshots
- maven.deploy.version - the version that the components will be deployed as,
for example @MAVEN.DEPLOY.VERSION@
- tomcat.lib.path - the path to tomcat JAR files
- tomcat.bin.path - the path to tomcat's bin directory (for other JAR files)
- tomcat.pom.path - the path to the POM files
- All these can be defined by mvn.properties (and defaults are in
mvn.properties.default)
-
- To do password less upload, you'll also need to set
- maven.username - YOUR APACHE LDAP USERNAME (ASF ID normally).
- maven.password - YOUR APACHE LDAP PASSWORD
- maven.scp.username - Your ASF ID
- maven.scp.privateKey - Path to your exported ssh key
-
- To get a private key to work on Windows, I followed these steps
- 1. on a linux box execute 'ssh-keygen -t rsa'
- 2. same linux box execute 'cat id_rsa.pub >> authorized_keys' and 'cat
id_rsa.pub >> authorized_keys2'
- 3. Copy id_rsa and id_rsa.pub to my windows box
- 4. Import id_rsa into puttygen
- 5. export id_rsa from puttygen to OpenSSH key
- 6. The key you exported from puttygen is the one you reference from the
<privateKey> element
- 7. Manually create the %USERPROFILE%\.ssh directory
- 8. Manually add the %USERPROFILE%\.ssh\known_hosts file with the entry for
the host
+ Built for using Maven Ant Tasks (version 2.1.0 is known to work)
-->
+
<property file="${basedir}/mvn.properties"/>
<property file="${basedir}/mvn.properties.default"/>
<property name="local.repo" value="${user.home}/.m2/repository"/>
-
+
<target name="init-maven">
- <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
uri="urn:maven-artifact-ant">
+ <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
+ uri="urn:maven-artifact-ant">
<classpath>
- <pathelement location="${basedir}/maven-ant-tasks-attached-patch.jar"
/>
- <pathelement location="${basedir}/maven-artifact-ant-2.0.4-dep.jar" />
+ <pathelement location="${basedir}/maven-ant-tasks-2.1.0.jar" />
</classpath>
</typedef>
- <artifact:install-provider artifactId="wagon-ssh" version="1.0-beta-6"/>
- </target>
-
- <target name="maven-deploy-nexus" depends="init-maven" if="nexus.set">
- <!--deploy it in nexus -->
- <artifact:deploy file="${file}">
- <pom file="${pom}"/>
- <remoteRepository url="${maven.repo.url}" layout="default">
- <authentication username="${maven.username}"
password="${maven.password}"/>
- </remoteRepository>
- <attach file="${file}.asc" type="jar.asc"/>
- </artifact:deploy>
</target>
- <target name="maven-deploy-other" depends="init-maven" unless="nexus.set">
+ <target name="maven-deploy-nexus" depends="init-maven">
<!--deploy it in nexus -->
<artifact:deploy file="${file}">
- <pom file="${pom}"/>
+ <pom file="${pom}.tmp"/>
<remoteRepository url="${maven.repo.url}" layout="default">
- <authentication username="${maven.scp.username}"
privateKey="${maven.scp.privateKey}" passphrase="${maven.scp.passphrase}"/>
- <authentication username="${maven.username}"
password="${maven.password}"/>
+ <authentication username="${asf.ldap.username}"
+ password="${asf.ldap.password}"/>
</remoteRepository>
<attach file="${file}.asc" type="jar.asc"/>
+ <attach file="${pom}.asc" type="pom.asc"/>
</artifact:deploy>
</target>
<target name="maven-deploy" depends="init-maven">
<!--cleanup-->
<delete file="${pom}.tmp"/>
+ <delete file="${pom}.asc"/>
<delete file="${file}.asc"/>
<!--replace the version in the pom-->
@@ -100,112 +60,179 @@
</filterset>
</copy>
- <!--sign the jar-->
- <exec executable="${maven.gpg.exec}" failonerror="true"
inputstring="${maven.gpg.passphrase}">
+ <!--sign the jar and the pom-->
+ <exec executable="${gpg.exec}" failonerror="true"
+ inputstring="${gpg.passphrase}">
<arg value="--passphrase-fd"/>
<arg value="0"/>
<arg value="-a"/>
<arg value="-b"/>
<arg value="${file}"/>
</exec>
+ <exec executable="${gpg.exec}" failonerror="true"
+ inputstring="${gpg.passphrase}">
+ <arg value="--passphrase-fd"/>
+ <arg value="0"/>
+ <arg value="-a"/>
+ <arg value="-b"/>
+ <arg value="-o"/>
+ <arg value="${pom}.asc"/>
+ <arg value="${pom}.tmp"/>
+ </exec>
<!--deploy it-->
<antcall target="maven-deploy-nexus">
<param name="file" value="${file}"/>
- <param name="pom" value="${pom}.tmp"/>
- </antcall>
- <antcall target="maven-deploy-other">
- <param name="file" value="${file}"/>
- <param name="pom" value="${pom}.tmp"/>
+ <param name="pom" value="${pom}"/>
</antcall>
- <!--
- <exec executable="${maven.home}/bin/${maven.bin}" failonerror="true">
- <env key="MAVEN_HOME" value="${maven.home}"/>
- <arg value="deploy:deploy-file"/>
- <arg value="-Dfile=${file}"/>
- <arg value="-DgroupId=${groupId}"/>
- <arg value="-DartifactId=${artifactId}"/>
- <arg value="-Dversion=${maven.deploy.version}"/>
- <arg value="-Dpackaging=jar"/>
- <arg value="-DgeneratePom=false"/>
- <arg value="-DrepositoryId=${maven.repo.repositoryId}"/>
- <arg value="-Durl=${maven.repo.url}"/>
- <arg value="-DpomFile=${pom}.tmp"/>
- </exec>
- -->
<delete file="${pom}.tmp"/>
+ <delete file="${pom}.asc"/>
<delete file="${file}.asc"/>
</target>
- <macrodef name="doMavenDeploy">
+ <target name="maven-deploy-nosrc" depends="init-maven">
+ <!--cleanup-->
+ <delete file="${pom}.tmp"/>
+ <delete file="${pom}.asc"/>
+ <delete file="${file}.asc"/>
+
+ <!--replace the version in the pom-->
+ <copy file="${pom}" tofile="${pom}.tmp">
+ <filterset>
+ <filter token="MAVEN.DEPLOY.VERSION" value="${maven.deploy.version}"/>
+ </filterset>
+ </copy>
+
+ <!--sign the jar and pom -->
+ <exec executable="${gpg.exec}" failonerror="true"
+ inputstring="${gpg.passphrase}">
+ <arg value="--passphrase-fd"/>
+ <arg value="0"/>
+ <arg value="-a"/>
+ <arg value="-b"/>
+ <arg value="${file}"/>
+ </exec>
+ <exec executable="${gpg.exec}" failonerror="true"
+ inputstring="${gpg.passphrase}">
+ <arg value="--passphrase-fd"/>
+ <arg value="0"/>
+ <arg value="-a"/>
+ <arg value="-b"/>
+ <arg value="-o"/>
+ <arg value="${pom}.asc"/>
+ <arg value="${pom}.tmp"/>
+ </exec>
+
+ <!--deploy it-->
+ <artifact:deploy file="${file}">
+ <pom file="${pom}.tmp"/>
+ <remoteRepository url="${maven.repo.url}" layout="default" >
+ <authentication username="${asf.ldap.username}"
+ password="${asf.ldap.password}"/>
+ </remoteRepository>
+ <attach file="${file}.asc" type="jar.asc"/>
+ <attach file="${pom}.asc" type="pom.asc"/>
+ </artifact:deploy>
+
+ <delete file="${pom}.tmp"/>
+ <delete file="${pom}.asc"/>
+ <delete file="${file}.asc"/>
+ </target>
+
+ <macrodef name="doMavenDeployNoSrc">
<attribute name="artifactId"/>
- <attribute name="jarFileName" default="@{artifactId}.jar"
description="only need to be specified if not same as artifactId"/>
- <attribute name="jarFileDir" default="${tomcat.lib.path}"
description="only need to be specified if not same as tomcat.lib.path"/>
+ <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" />
<sequential>
- <antcall target="maven-deploy">
- <param name="file" value="@{jarFileDir}/@{jarFileName}"/>
- <param name="groupId" value="org.apache.tomcat"/>
+ <antcall target="maven-deploy-nosrc">
+ <param name="file" value="@{file}"/>
+ <param name="groupId" value="@{groupId}"/>
<param name="artifactId" value="@{artifactId}"/>
- <param name="pom" value="${tomcat.pom.path}/@{artifactId}.pom"/>
+ <param name="pom" value="${tomcat.pom.path}/@{pom}"/>
</antcall>
</sequential>
</macrodef>
- <target name="generic-deploy" depends="init-maven">
- <doMavenDeploy artifactId="annotations-api"/> <!--Deploy annotations-->
- <doMavenDeploy artifactId="servlet-api"/> <!--Deploy Servlet api-->
- <doMavenDeploy artifactId="el-api"/> <!--Deploy expression lanaguage api-->
- <doMavenDeploy artifactId="jsp-api"/> <!--Deploy JSP api-->
- <doMavenDeploy artifactId="juli" jarFileName="tomcat-juli.jar"
jarFileDir="${tomcat.bin.path}"/> <!--Deploy JULI-->
- <doMavenDeploy artifactId="tribes" jarFileName="catalina-tribes.jar"/>
<!--Deploy Tribes-->
- <doMavenDeploy artifactId="jasper-el"/> <!--Deploy Jasper EL-->
- <doMavenDeploy artifactId="coyote" jarFileName="tomcat-coyote.jar"/>
<!--Deploy Coyote-->
- <doMavenDeploy artifactId="catalina"/> <!--Deploy Catalina-->
- <doMavenDeploy artifactId="catalina-ha"/> <!--Deploy Catalina-HA-->
- <doMavenDeploy artifactId="jasper"/> <!--Deploy Jasper -->
- <doMavenDeploy artifactId="dbcp" jarFileName="tomcat-dbcp.jar"/>
<!--Deploy DBCP-->
- <antcall target="maven-deploy"><!--Deploy Extras Juli-->
- <param name="file" value="${tomcat.extras.path}/tomcat-juli.jar"/>
- <param name="groupId" value="org.apache.tomcat.extras"/>
- <param name="artifactId" value="juli"/>
- <param name="pom" value="${tomcat.pom.path}/juli-extras.pom"/>
- </antcall>
- <antcall target="maven-deploy"><!--Deploy Extras Juli Adapters-->
- <param name="file"
value="${tomcat.extras.path}/tomcat-juli-adapters.jar"/>
- <param name="groupId" value="org.apache.tomcat.extras"/>
- <param name="artifactId" value="juli-adapters"/>
- <param name="pom" value="${tomcat.pom.path}/juli-adapters.pom"/>
- </antcall>
+ <target name="generic-deploy" depends="init-maven,init-gpg,init-ldap">
+ <!-- Standard jars in bin directory -->
+ <doMavenDeployNoSrc artifactId="juli"
+ file="${tomcat.bin.path}/tomcat-juli.jar"/>
+
+ <!-- Standard jars in lib directory -->
+ <doMavenDeployNoSrc artifactId="annotations-api"/>
+ <doMavenDeployNoSrc artifactId="catalina"/>
+ <doMavenDeployNoSrc artifactId="catalina-ant"/>
+ <doMavenDeployNoSrc artifactId="catalina-ha"/>
+
+ <doMavenDeployNoSrc artifactId="tribes"
+ jarFileName="catalina-tribes.jar"/>
+
+ <doMavenDeployNoSrc artifactId="el-api"/>
+ <doMavenDeployNoSrc artifactId="jasper"/>
+ <doMavenDeployNoSrc artifactId="jasper-el"/>
+ <doMavenDeployNoSrc artifactId="jsp-api"/>
+ <doMavenDeployNoSrc artifactId="servlet-api"/>
+
+ <doMavenDeployNoSrc artifactId="coyote"
+ jarFileName="tomcat-coyote.jar"/>
+
+ <doMavenDeployNoSrc artifactId="dbcp"
+ jarFileName="tomcat-dbcp.jar"/>
+
+ <doMavenDeployNoSrc artifactId="tomcat-i18n-es"/>
+ <doMavenDeployNoSrc artifactId="tomcat-i18n-fr"/>
+ <doMavenDeployNoSrc artifactId="tomcat-i18n-ja"/>
+
+ <!-- Extras jars -->
+ <doMavenDeployNoSrc artifactId="juli"
+ pom="juli-extras.pom"
+ groupId="org.apache.tomcat.extras"
+ file="${tomcat.extras.path}/tomcat-juli.jar" />
+ <doMavenDeployNoSrc artifactId="juli-adapters"
+ groupId="org.apache.tomcat.extras"
+ file="${tomcat.extras.path}/tomcat-juli-adapters.jar" />
+ <doMavenDeployNoSrc artifactId="tomcat-catalina-jmx-remote"
+ groupId="org.apache.tomcat"
+ file="${tomcat.extras.path}/catalina-jmx-remote.jar" />
+ <doMavenDeployNoSrc artifactId="tomcat-catalina-ws"
+ groupId="org.apache.tomcat"
+ file="${tomcat.extras.path}/catalina-ws.jar" />
+
</target>
<target name="deploy-snapshot">
<antcall target="generic-deploy">
- <param name="maven.repo.repositoryId"
value="${maven.snapshot.repo.repositoryId}"/>
+ <param name="maven.repo.repositoryId"
+ value="${maven.snapshot.repo.repositoryId}"/>
<param name="maven.repo.url" value="${maven.snapshot.repo.url}"/>
- <param name="maven.deploy.version"
value="${maven.snapshot.deploy.version}"/>
- </antcall>
- </target>
-
- <target name="deploy-staging">
- <antcall target="generic-deploy">
- <param name="maven.repo.repositoryId"
value="${maven.release.repo.repositoryId}"/>
- <param name="maven.repo.url" value="${maven.release.repo.url}"/>
- <param name="maven.deploy.version"
value="${maven.release.deploy.version}"/>
+ <param name="maven.deploy.version" value="6.0-SNAPSHOT"/>
</antcall>
</target>
<target name="deploy-release">
- <property name="nexus.set" value="true"/>
<antcall target="generic-deploy">
- <param name="maven.repo.repositoryId"
value="${maven.asf.release.repo.repositoryId}"/>
+ <param name="maven.repo.repositoryId"
+ value="${maven.asf.release.repo.repositoryId}"/>
<param name="maven.repo.url" value="${maven.asf.release.repo.url}"/>
- <param name="maven.deploy.version"
value="${maven.asf.release.deploy.version}"/>
+ <param name="maven.deploy.version"
+ value="${maven.asf.release.deploy.version}"/>
</antcall>
</target>
-
- <target name="help">
- <echo>Help is on the way!</echo>
+
+ <target name="init-gpg">
+ <input message="Enter GPG pass-phrase" addproperty="gpg.passphrase" >
+ <handler type="secure"/>
+ </input>
+ </target>
+
+ <target name="init-ldap">
+ <input message="Enter ASF LDAP (same svn) password"
+ addproperty="asf.ldap.password" >
+ <handler type="secure"/>
+ </input>
</target>
</project>
Modified: tomcat/tc6.0.x/trunk/res/maven/mvn.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/maven/mvn.properties.default?rev=1352650&r1=1352649&r2=1352650&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/maven/mvn.properties.default (original)
+++ tomcat/tc6.0.x/trunk/res/maven/mvn.properties.default Thu Jun 21 18:47:05
2012
@@ -12,49 +12,34 @@
# 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.
-#
+#
# To create custom properties, simply create
# the file mvn.properties
# in this directory
# no need to change this file
#
-#Tomcat version
-tomcat.version=6.0.20
-
-#Maven properties
-maven.username=<!-- YOUR APACHE LDAP USERNAME -->
-maven.password=<!-- YOUR APACHE LDAP PASSWORD -->
-maven.scp.username=fhanik
-maven.scp.privateKey=${user.home}/.ssh/id_dsa
-maven.scp.passphrase=
-maven.gpg.exec=/opt/csw/bin/gpg
-maven.gpg.passphrase=*****
-
-
-maven.home=/software/apache-maven-2.0.9
-#Define mvn for Unix systems and mvn.bat for Windows as ANT exec requires the
full name
-maven.bin=mvn
+# Authentication
+# Note: You will be prompted for your GPG passphrase and LDAP password when
+# running this script
+asf.ldap.username=<!-- YOUR APACHE LDAP USERNAME -->
+gpg.exec=C:/software/GNU/GnuPG/gpg.exe
-#Maven snapshot properties
-maven.snapshot.repo.url=scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository
+# ASF Snapshot Repository (hosted on Nexus)
+maven.snapshot.repo.url=https://repository.apache.org/content/repositories/snapshots
maven.snapshot.repo.repositoryId=apache.snapshots
-maven.snapshot.deploy.version=${tomcat.version}-SNAPSHOT
-
-#Maven release properties for Tomcat staging
-maven.release.repo.url=scp://people.apache.org/www/tomcat.apache.org/dev/dist/m2-repository
-maven.release.repo.repositoryId=tomcat-staging
-maven.release.deploy.version=${tomcat.version}
-#Maven release properties for the main ASF repo (staging in nexus)
+# ASF Release Repository (hosted on Nexus)
+# Note: Also used for staging releases prior to voting
maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/deploy/maven2
maven.asf.release.repo.repositoryId=apache.releases
-maven.asf.release.deploy.version=${tomcat.version}
+# Release version info
+maven.asf.release.deploy.version=6.0.36
#Where do we load the libraries from
-tomcat.lib.path=/tmp/pool/apache-tomcat-6.0.20/lib
-tomcat.bin.path=/tmp/pool/apache-tomcat-6.0.20/bin
+tomcat.lib.path=../../output/build/lib
+tomcat.bin.path=../../output/build/bin
tomcat.extras.path=../../output/extras
#Where do we find the POM files
Added: tomcat/tc6.0.x/trunk/res/maven/tomcat-catalina-jmx-remote.pom
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/maven/tomcat-catalina-jmx-remote.pom?rev=1352650&view=auto
==============================================================================
--- tomcat/tc6.0.x/trunk/res/maven/tomcat-catalina-jmx-remote.pom (added)
+++ tomcat/tc6.0.x/trunk/res/maven/tomcat-catalina-jmx-remote.pom Thu Jun 21
18:47:05 2012
@@ -0,0 +1,52 @@
+<?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-catalina-jmx-remote</artifactId>
+ <version>@MAVEN.DEPLOY.VERSION@</version>
+ <description>Tomcat Remote JMX listener</description>
+ <url>http://tomcat.apache.org/</url>
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-coyote</artifactId>
+ <version>@MAVEN.DEPLOY.VERSION@</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</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>
+ </dependencies>
+</project>
Propchange: tomcat/tc6.0.x/trunk/res/maven/tomcat-catalina-jmx-remote.pom
------------------------------------------------------------------------------
svn:eol-style = native
Added: tomcat/tc6.0.x/trunk/res/maven/tomcat-catalina-ws.pom
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/maven/tomcat-catalina-ws.pom?rev=1352650&view=auto
==============================================================================
--- tomcat/tc6.0.x/trunk/res/maven/tomcat-catalina-ws.pom (added)
+++ tomcat/tc6.0.x/trunk/res/maven/tomcat-catalina-ws.pom Thu Jun 21 18:47:05
2012
@@ -0,0 +1,40 @@
+<?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-catalina-ws</artifactId>
+ <version>@MAVEN.DEPLOY.VERSION@</version>
+ <description>Tomcat JNDI Factory for Web Services</description>
+ <url>http://tomcat.apache.org/</url>
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
+ <version>@MAVEN.DEPLOY.VERSION@</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+</project>
Propchange: tomcat/tc6.0.x/trunk/res/maven/tomcat-catalina-ws.pom
------------------------------------------------------------------------------
svn:eol-style = native
Added: tomcat/tc6.0.x/trunk/res/maven/tomcat-i18n-es.pom
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/maven/tomcat-i18n-es.pom?rev=1352650&view=auto
==============================================================================
--- tomcat/tc6.0.x/trunk/res/maven/tomcat-i18n-es.pom (added)
+++ tomcat/tc6.0.x/trunk/res/maven/tomcat-i18n-es.pom Thu Jun 21 18:47:05 2012
@@ -0,0 +1,32 @@
+<?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-i18n-es</artifactId>
+ <version>@MAVEN.DEPLOY.VERSION@</version>
+ <description>Spanish translations</description>
+ <url>http://tomcat.apache.org/</url>
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+</project>
Propchange: tomcat/tc6.0.x/trunk/res/maven/tomcat-i18n-es.pom
------------------------------------------------------------------------------
svn:eol-style = native
Added: tomcat/tc6.0.x/trunk/res/maven/tomcat-i18n-fr.pom
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/maven/tomcat-i18n-fr.pom?rev=1352650&view=auto
==============================================================================
--- tomcat/tc6.0.x/trunk/res/maven/tomcat-i18n-fr.pom (added)
+++ tomcat/tc6.0.x/trunk/res/maven/tomcat-i18n-fr.pom Thu Jun 21 18:47:05 2012
@@ -0,0 +1,32 @@
+<?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-i18n-fr</artifactId>
+ <version>@MAVEN.DEPLOY.VERSION@</version>
+ <description>French translations</description>
+ <url>http://tomcat.apache.org/</url>
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+</project>
Propchange: tomcat/tc6.0.x/trunk/res/maven/tomcat-i18n-fr.pom
------------------------------------------------------------------------------
svn:eol-style = native
Added: tomcat/tc6.0.x/trunk/res/maven/tomcat-i18n-ja.pom
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/maven/tomcat-i18n-ja.pom?rev=1352650&view=auto
==============================================================================
--- tomcat/tc6.0.x/trunk/res/maven/tomcat-i18n-ja.pom (added)
+++ tomcat/tc6.0.x/trunk/res/maven/tomcat-i18n-ja.pom Thu Jun 21 18:47:05 2012
@@ -0,0 +1,32 @@
+<?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-i18n-ja</artifactId>
+ <version>@MAVEN.DEPLOY.VERSION@</version>
+ <description>Japanese translations</description>
+ <url>http://tomcat.apache.org/</url>
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+</project>
Propchange: tomcat/tc6.0.x/trunk/res/maven/tomcat-i18n-ja.pom
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1352650&r1=1352649&r2=1352650&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Jun 21 18:47:05 2012
@@ -276,6 +276,10 @@
<update>
Improve <code>RUNNING.txt</code>. (kkolinko)
</update>
+ <update>
+ Align the Maven deploy script with the Tomact 7 verison, making full
use
+ of Nexus. (markt)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
