diff options
| -rw-r--r-- | build.xml | 30 | ||||
| m--------- | maven | 0 | ||||
| -rw-r--r-- | release.template | 12 |
3 files changed, 10 insertions, 32 deletions
@@ -98,34 +98,6 @@ <!--
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- Upload artifacts to GoogleCode and the remote Maven repository
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- -->
- <target name="uploadArtifacts" depends="build">
-
- <mx:gcupload
- username="${googlecode.user}"
- password="${googlecode.password}"
- projectname="iciql"
- filename="${project.targetDirectory}/${project.artifactId}-${project.version}.zip"
- targetfilename="${project.artifactId}-${project.version}.zip"
- summary="Version ${project.version} -- library, sources, and javadoc"
- labels="Featured, Type-Package, OpSys-All" />
-
- <mx:ftp server="${ftp.server}" userid="${ftp.user}" password="${ftp.password}"
- remotedir="${ftp.maven.dir}" verbose="yes" depends="yes" timediffauto="true"
- preservelastmodified="true">
- <fileset dir="${basedir}/maven">
- <!-- exclude root files -->
- <exclude name="*.md" />
- <exclude name=".git*" />
- </fileset>
- </mx:ftp>
- </target>
-
-
- <!--
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Build the iciql website
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-->
@@ -183,7 +155,7 @@ <menu name="downloads">
<link name="${project.artifactId}-${project.releaseVersion}"
- src="${gc.url}${project.artifactId}-${project.releaseVersion}.jar" />
+ src="${gc.url}${project.artifactId}-${project.releaseVersion}.zip" />
<divider />
<link name="Maven Repository" src="${project.mavenUrl}" />
</menu>
diff --git a/maven b/maven -Subproject 6884b8fde4f372d63e1cc21773ce25c3d3e3fda +Subproject 82c3f24d10f3c5fc77fb878242c686792997341 diff --git a/release.template b/release.template index 7df43ea..4195e44 100644 --- a/release.template +++ b/release.template @@ -58,7 +58,6 @@ echo "Updating gh-pages for Maven submodule ${project.version} RELEASE artifacts echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" echo "" git checkout gh-pages -git pull git add maven git commit -m "updated Maven submodule repository to ${project.version}" @@ -107,10 +106,17 @@ cd .. # push project branches echo "" echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" -echo "Pushing master, gh-pages, and tag ${project.tag}" +echo "Pushing gh-pages" +echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" +echo "" +git push -f origin gh-pages + +echo "" +echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" +echo "Pushing master and tag ${project.tag}" echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" echo "" -git push origin master gh-pages tag ${project.tag} +git push origin master tag ${project.tag} # update the Maven submodule reference git submodule update |