[asterisk-scf-commits] asterisk-scf/release/slice.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Fri Jul 1 12:15:17 CDT 2011
branch "master" has been updated
via a461475bc6a2dc40d2d3e6142b9a1d1eef423687 (commit)
via 5c33e83d9428a31c82df051ad28784719c093cc7 (commit)
via 982413fb056b9d2c8ca1ffc639f5613acfc96ea0 (commit)
from c1445edc298ff6e9364422138a4d8b44263bcc84 (commit)
Summary of changes:
build.xml | 44 +++++++++++++++++++++++++++++++++++++++++++-
ice-pom.xml.in | 21 ++++++++++++++++++++-
install-ice-jar.xml | 10 ++++++++++
pom.xml.in | 20 +++++++++++++++++++-
4 files changed, 92 insertions(+), 3 deletions(-)
- Log -----------------------------------------------------------------
commit a461475bc6a2dc40d2d3e6142b9a1d1eef423687
Author: David M. Lee <dlee at digium.com>
Date: Fri Jul 1 11:28:57 2011 -0500
Added deploy targets.
diff --git a/build.xml b/build.xml
index 63807e3..dc4f1c4 100644
--- a/build.xml
+++ b/build.xml
@@ -11,8 +11,14 @@
<property name="mvn.version" value="2.1.1"/>
- <include file="install-ice-jar.xml" as="ice"/>
+ <!--
+ ~ This optional file contains the properties:
+ ~ release.repo.url - URL to deploy release artifacts
+ ~ snapshot.repo.url - URL to deploy snapshot artifacts
+ -->
+ <property file="${user.home}/.ant/repositories.properties"/>
+ <include file="install-ice-jar.xml" as="ice"/>
<path id="maven-ant-tasks.classpath"
path="lib/maven-ant-tasks-${mvn.version}.jar"/>
@@ -95,6 +101,42 @@
</artifact:install>
</target>
+ <target name="fail-if-no-snapshot-repo" unless="snapshot.repo.url">
+ <fail>snapshot.repo.url undefined!
+Either configure in ~/.ant/repositories.properties, or configure using -D
+ </fail>
+ </target>
+
+ <target name="fail-if-no-release-repo" unless="release.repo.url">
+ <fail>release.repo.url undefined!
+Either configure in ~/.ant/repositories.properties, or configure using -D
+ </fail>
+ </target>
+
+ <target name="deploy" depends="package,ice.get-ice-version,fail-if-no-snapshot-repo,fail-if-no-release-repo"
+ description="deploys packages into local Maven repo">
+ <copy file="pom.xml.in" tofile="${generated-pom-dir}/pom.xml"
+ filtering="true" failonerror="true"/>
+ <artifact:pom id="pom" file="${generated-pom-dir}/pom.xml"/>
+<!--
+ <input message="username: " addproperty="repository.username"/>
+ <input message="password: " addproperty="repository.password">
+ <handler classname="org.apache.tools.ant.input.SecureInputHandler" />
+ </input>
+-->
+ <artifact:deploy file="java/astscf-api.jar" pomrefid="pom">
+<!--
+ <remoteRepository url="http://artifactory.digium.internal/artifactory/libs-snapshot-local">
+ <authentication username="${repository.username}" password="${repository.password}"/>
+ </remoteRepository>
+-->
+ <attach file="java/astscf-api-sources.jar"
+ classifier="sources"/>
+ <attach file="java/astscf-api-javadoc.jar"
+ classifier="javadoc"/>
+ </artifact:deploy>
+ </target>
+
<target name="clean"
description="Clean">
<delete dir="java"/>
diff --git a/install-ice-jar.xml b/install-ice-jar.xml
index 70c0571..902a118 100644
--- a/install-ice-jar.xml
+++ b/install-ice-jar.xml
@@ -46,4 +46,14 @@
</artifact:install>
</target>
+ <target name="deploy-ice" depends="get-ice-version,ice-src"
+ description="Deploys ice.jar from ICE_HOME into local Maven repo">
+ <copy file="ice-pom.xml.in" tofile="${generated-pom-dir}/ice-pom.xml"
+ filtering="true" failonerror="true"/>
+ <artifact:pom id="ice-pom" file="${generated-pom-dir}/ice-pom.xml"/>
+ <artifact:deploy file="${env.ICE_HOME}/lib/Ice.jar"
+ pomrefid="ice-pom">
+ <attach file="java/Ice-sources.jar" classifier="sources"/>
+ </artifact:deploy>
+ </target>
</project>
commit 5c33e83d9428a31c82df051ad28784719c093cc7
Author: David M. Lee <dlee at digium.com>
Date: Fri Jul 1 11:27:27 2011 -0500
Prepare for deployment to artifact server.
* Add distribution management to Ice pom file
* Change Ice version to snapshot, since we're not actually releasing it
diff --git a/ice-pom.xml.in b/ice-pom.xml.in
index d420b49..e69c15f 100644
--- a/ice-pom.xml.in
+++ b/ice-pom.xml.in
@@ -7,7 +7,26 @@
<groupId>com.zeroc</groupId>
<artifactId>ice</artifactId>
- <version>@ice-version at -digium</version>
+ <!-- The -digium is b/c we still have a patched version of Ice -->
+ <version>@ice-version at -digium-SNAPSHOT</version>
<name>Ice for Java</name>
+
+ <distributionManagement>
+ <!--
+ ~ Asterisk SCF doesn't provide a public Maven repo. If you wish to
+ ~ deploy to your own repo, provide settings for release.repo.url or
+ ~ snapshot.repo.url
+ -->
+ <repository>
+ <id>asterisk.repo</id>
+ <name>Asterisk SCF Distribution Repo</name>
+ <url>${release.repo.url}</url>
+ </repository>
+ <snapshotRepository>
+ <id>asterisk.repo</id>
+ <name>Asterisk SCF Distribution Repo</name>
+ <url>${snapshot.repo.url}</url>
+ </snapshotRepository>
+ </distributionManagement>
</project>
diff --git a/pom.xml.in b/pom.xml.in
index b4107ad..d0da3c8 100644
--- a/pom.xml.in
+++ b/pom.xml.in
@@ -15,7 +15,7 @@
<dependency>
<groupId>com.zeroc</groupId>
<artifactId>ice</artifactId>
- <version>@ice-version at -digium</version>
+ <version>@ice-version at -digium-SNAPSHOT</version>
</dependency>
</dependencies>
commit 982413fb056b9d2c8ca1ffc639f5613acfc96ea0
Author: David M. Lee <dlee at digium.com>
Date: Thu Jun 30 12:23:04 2011 -0500
Adding distributionManagement for mvn deploy
diff --git a/pom.xml.in b/pom.xml.in
index e7e18a6..b4107ad 100644
--- a/pom.xml.in
+++ b/pom.xml.in
@@ -18,4 +18,22 @@
<version>@ice-version at -digium</version>
</dependency>
</dependencies>
+
+ <distributionManagement>
+ <!--
+ ~ Asterisk SCF doesn't provide a public Maven repo. If you wish to
+ ~ deploy to your own repo, provide settings for release.repo.url or
+ ~ snapshot.repo.url
+ -->
+ <repository>
+ <id>asterisk.repo</id>
+ <name>Asterisk SCF Distribution Repo</name>
+ <url>${release.repo.url}</url>
+ </repository>
+ <snapshotRepository>
+ <id>asterisk.repo</id>
+ <name>Asterisk SCF Distribution Repo</name>
+ <url>${snapshot.repo.url}</url>
+ </snapshotRepository>
+ </distributionManagement>
</project>
-----------------------------------------------------------------------
--
asterisk-scf/release/slice.git
More information about the asterisk-scf-commits
mailing list