You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ph...@apache.org on 2013/01/31 18:09:44 UTC
svn commit: r1441067 - in /qpid/proton/branches/jni-binding: bin/release.sh
pom.xml proton-j/pom.xml tests/pom.xml
Author: philharveyonline
Date: Thu Jan 31 17:09:44 2013
New Revision: 1441067
URL: http://svn.apache.org/viewvc?rev=1441067&view=rev
Log:
PROTON-210: fixed release.sh to create single tarball from top level. Not yet fully tested
Modified:
qpid/proton/branches/jni-binding/bin/release.sh
qpid/proton/branches/jni-binding/pom.xml
qpid/proton/branches/jni-binding/proton-j/pom.xml
qpid/proton/branches/jni-binding/tests/pom.xml
Modified: qpid/proton/branches/jni-binding/bin/release.sh
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/bin/release.sh?rev=1441067&r1=1441066&r2=1441067&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/bin/release.sh (original)
+++ qpid/proton/branches/jni-binding/bin/release.sh Thu Jan 31 17:09:44 2013
@@ -19,8 +19,6 @@
# under the License.
#
-# TODO modify this script to create the correct artefacts from the top level (i.e. not from separate proton-c/proton-j subfolders)
-
# release.sh - Creates release tarballs from the upstream source
# repository.
#
@@ -78,18 +76,17 @@ if [[ -z "${REVISION}" ]]; then
REVISION=$(svn info http://svn.apache.org/repos/asf/qpid/proton | fgrep Revision: | awk '{ print $2 }')
fi
-echo "Using svn revision ${REVISION} for all exports."
+echo "Using svn revision ${REVISION}."
##
-## Create the C Tarball
+## Create the tarball
##
-rootname="qpid-proton-c-${VERSION}"
+rootname="qpid-proton-${VERSION}"
WORKDIR=$(mktemp -d)
mkdir -p "${WORKDIR}"
(
cd ${WORKDIR}
- svn export -qr ${REVISION} ${URL}/${BRANCH}/proton-c ${rootname}
- svn export -qr ${REVISION} ${URL}/${BRANCH}/tests ${rootname}/tests
+ svn export -qr ${REVISION} ${URL}/${BRANCH}/ ${rootname}
cat <<EOF > ${rootname}/SVN_INFO
Repo: ${URL}
@@ -97,33 +94,13 @@ Branch: ${BRANCH}
Revision: ${REVISION}
EOF
+ mvn org.codehaus.mojo:versions-maven-plugin:1.2:set org.codehaus.mojo:versions-maven-plugin:1.2:commit -DnewVersion="${VERSION}" -f ${WORKDIR}/${rootname}/pom.xml
+
##
## Remove content not for release
##
- rm -rf ${rootname}/examples/mailbox
-
- echo "Generating Archive: ${CURRDIR}/${rootname}.tar.gz"
- tar zcf ${CURRDIR}/${rootname}.tar.gz ${rootname}
-)
-
-##
-## Create the Java Tarball
-##
-rootname="qpid-proton-j-${VERSION}"
-WORKDIR=$(mktemp -d)
-mkdir -p "${WORKDIR}"
-(
- cd ${WORKDIR}
- svn export -qr ${REVISION} ${URL}/${BRANCH}/proton-j ${rootname}
- svn export -qr ${REVISION} ${URL}/${BRANCH}/tests ${rootname}/tests
-
- cat <<EOF > ${rootname}/SVN_INFO
-Repo: ${URL}
-Branch: ${BRANCH}
-Revision: ${REVISION}
-EOF
-
- mvn org.codehaus.mojo:versions-maven-plugin:1.2:set org.codehaus.mojo:versions-maven-plugin:1.2:commit -DnewVersion="${VERSION}" -f ${WORKDIR}/${rootname}/pom.xml
+ rm -r ${rootname}/proton-c/examples/mailbox
+ rm -r ${rootname}/design
echo "Generating Archive: ${CURRDIR}/${rootname}.tar.gz"
tar zcf ${CURRDIR}/${rootname}.tar.gz ${rootname}
Modified: qpid/proton/branches/jni-binding/pom.xml
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/pom.xml?rev=1441067&r1=1441066&r2=1441067&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/pom.xml (original)
+++ qpid/proton/branches/jni-binding/pom.xml Thu Jan 31 17:09:44 2013
@@ -28,9 +28,25 @@
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <prerequisites>
- <maven>3.0</maven>
- </prerequisites>
+ <properties>
+ <junit-version>4.10</junit-version>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ <optimize>true</optimize>
+ <showDeprecation>true</showDeprecation>
+ <showWarnings>true</showWarnings>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<profiles>
<profile>
Modified: qpid/proton/branches/jni-binding/proton-j/pom.xml
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-j/pom.xml?rev=1441067&r1=1441066&r2=1441067&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/proton-j/pom.xml (original)
+++ qpid/proton/branches/jni-binding/proton-j/pom.xml Thu Jan 31 17:09:44 2013
@@ -17,38 +17,15 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>12</version>
- <relativePath></relativePath>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>proton-project</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.qpid</groupId>
<artifactId>proton-j</artifactId>
- <version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <properties>
- <junit-version>4.10</junit-version>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- <optimize>true</optimize>
- <showDeprecation>true</showDeprecation>
- <showWarnings>true</showWarnings>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>junit</groupId>
Modified: qpid/proton/branches/jni-binding/tests/pom.xml
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/tests/pom.xml?rev=1441067&r1=1441066&r2=1441067&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/tests/pom.xml (original)
+++ qpid/proton/branches/jni-binding/tests/pom.xml Thu Jan 31 17:09:44 2013
@@ -21,9 +21,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.qpid</groupId>
<artifactId>tests</artifactId>
- <version>1.0-SNAPSHOT</version>
<description>The Proton system tests execute against either the Java or the C implementations, based on the chosen profile.
@@ -42,26 +40,13 @@ To override this, run Maven like so: &qu
<resources>
<resource><directory>python</directory></resource>
</resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- <optimize>true</optimize>
- <showDeprecation>true</showDeprecation>
- <showWarnings>true</showWarnings>
- </configuration>
- </plugin>
- </plugins>
</build>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
+ <version>${junit-version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -126,9 +111,8 @@ To override this, run Maven like so: &qu
</profiles>
<parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>12</version>
- <relativePath></relativePath>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>proton-project</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org