Revision: 5148
Author: [email protected]
Date: Fri Nov 9 14:54:43 2012
Log: fix some minor maven procedure issues
http://codereview.appspot.com/6814097
- Delete target mvn-deploy. afaik, it has never been used, and it
doesn't work as written. It'll be easy enough to add back
if we decide some day that our maven artifacts should be at
sonatype instead of google code.
- Add description to target mvn-install.
- Rename -javadocs.jar to -javadoc.jar for consistency with
previous versions published.
- Note that -precajole.jar is a temporary hack.
R=kpreid2
http://code.google.com/p/google-caja/source/detail?r=5148
Modified:
/trunk/build.xml
/trunk/tools/copy-for-maven
=======================================
--- /trunk/build.xml Tue Nov 6 16:59:57 2012
+++ /trunk/build.xml Fri Nov 9 14:54:43 2012
@@ -82,8 +82,6 @@
<property name="gwt-war" location="war"/>
<property name="gwt.style" value="OBFUSCATED"/>
<property name="maven" location="ant-maven"/>
- <property name="maven-repository-url"
value="https://oss.sonatype.org/service/local/staging/deploy/maven2/"; />
- <property name="maven-repository-id" value="sonatype-nexus-staging" />
<!-- maven -->
<property name="maven.ant.tasks.jar"
value="third_party/ant/maven-ant-tasks-2.1.1.jar"/>
@@ -1712,8 +1710,8 @@
<artifact:pom id="project" file="${maven}/pom.xml" />
</target>
-
- <target name="mvn-install" depends="jars,javadocs,precajole,pom">
+ <target name="mvn-install" depends="jars,javadocs,precajole,pom"
+ description="Generate maven artifacts and install them in ~/.m2">
<artifact:install file="${maven-jarfile-nodeps}">
<pom refid="project"/>
<attach file="${maven-jarfile-javadoc}" classifier="javadoc"/>
@@ -1721,52 +1719,6 @@
</artifact:install>
</target>
- <!-- The mvn-deploy target takes the generated maven artifacts and pushes
- them to the Sonatype repository. You will need to have a
- gpg key defined and account set up. More docs on how to do this
here:
-
-
https://docs.sonatype.org/display/Repository/Sonatype+OSS+Maven+Repository+Usage+Guide
- -->
-
- <!-- TODO(felix8a): fix this or delete this -->
- <target name="mvn-deploy"
- depends="mvn-install"
- description="Signs and Deploys caja artifacts to the central maven
repo">
-
- <!-- sign and deploy the main artifact -->
- <artifact:mvn>
- <arg
value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file"
/>
- <arg value="-Durl=${maven-repository-url}" />
- <arg value="-DrepositoryId=${maven-repository-id}" />
- <arg value="-DpomFile=${maven}/pom.xml" />
- <arg value="-Dfile=${maven-jarfile-nodeps}" />
- <arg value="-Pgpg" />
- </artifact:mvn>
-
- <!-- sign and deploy the sources artifact -->
- <artifact:mvn>
- <arg
value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file"
/>
- <arg value="-Durl=${maven-repository-url}" />
- <arg value="-DrepositoryId=${maven-repository-id}" />
- <arg value="-DpomFile=${maven}/pom.xml" />
- <arg value="-Dfile=${maven-jarfile-sources}" />
- <arg value="-Dclassifier=sources" />
- <arg value="-Pgpg" />
- </artifact:mvn>
-
- <!-- sign and deploy the javadoc artifact -->
- <artifact:mvn>
- <arg
value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file"
/>
- <arg value="-Durl=${maven-repository-url}" />
- <arg value="-DrepositoryId=${maven-repository-id}" />
- <arg value="-DpomFile=${maven}/pom.xml" />
- <arg value="-Dfile=${maven-jarfile-javadoc}" />
- <arg value="-Dclassifier=javadoc" />
- <arg value="-Pgpg" />
- </artifact:mvn>
- </target>
-
-
<!--
- Enable Emma
-
=======================================
--- /trunk/tools/copy-for-maven Mon Jul 30 13:18:01 2012
+++ /trunk/tools/copy-for-maven Fri Nov 9 14:54:43 2012
@@ -54,9 +54,12 @@
cp(src + '/ant-maven/pom.xml', dvcaja + '.pom')
cp(src + '/ant-jars/pluginc.jar', dvcaja + '.jar')
- cp(src + '/ant-jars/pluginc-javadocs.jar', dvcaja + '-javadocs.jar')
+ cp(src + '/ant-jars/pluginc-javadocs.jar', dvcaja + '-javadoc.jar')
+ cp(src + '/ant-jars/pluginc-src.jar', dvcaja + '-sources.jar')
+
+ # TODO(felix8a): precajole should be a separate maven artifact.
+ # This is a temporary hack to capture the jar for a release.
cp(src + '/ant-jars/precajole.jar', dvcaja + '-precajole.jar')
- cp(src + '/ant-jars/pluginc-src.jar', dvcaja + '-sources.jar')
for f in glob.glob(dver + '/*'):
if re.search(r'[.](pom|jar)$', f):
