[SCM] robust-http-client packaging branch, master, updated. upstream/1.1-6-g0891e06
James Page
jamespage-guest at alioth.debian.org
Mon Jun 20 07:29:03 UTC 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "robust-http-client packaging".
The branch, master has been updated
via 0891e0670bf68211a38dae5a08697b32d0bc4261 (commit)
via 10b108be8dd268f93c06545e310f4731b6d035a7 (commit)
via 767fc7bb78fdb755f472f31bc169908bde891a82 (commit)
via 7667eb6eb64ddd6f9c4ad8b5d47a79e69d63bf79 (commit)
via 79e5df7bda4f3b784f1b01b780f2476cfb5348e6 (commit)
from e6cfae0a45e14fcb49b9f6fe658cb06eb729815e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 0891e0670bf68211a38dae5a08697b32d0bc4261
Author: James Page <james.page at canonical.com>
Date: Mon Jun 20 08:25:16 2011 +0100
Updated copyright and added extra library to *gnoreRules
commit 10b108be8dd268f93c06545e310f4731b6d035a7
Author: James Page <james.page at canonical.com>
Date: Mon Jun 20 08:22:34 2011 +0100
Updates for new upstream release
commit 767fc7bb78fdb755f472f31bc169908bde891a82
Merge: 79e5df7 7667eb6
Author: James Page <james.page at canonical.com>
Date: Mon Jun 20 08:20:23 2011 +0100
Merge commit 'upstream/1.2'
commit 79e5df7bda4f3b784f1b01b780f2476cfb5348e6
Author: James Page <james.page at canonical.com>
Date: Mon Jun 20 08:20:19 2011 +0100
Updated watch for new SCM location
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 4 +-
debian/copyright | 2 +-
debian/maven.cleanIgnoreRules | 2 +
debian/maven.ignoreRules | 2 +
debian/orig-tar.sh | 16 ------
debian/watch | 3 +-
pom.xml | 53 ++++++++++++++-----
.../robust_http_client/RetryableHttpStream.java | 23 +++++++++
src/site/site.xml | 19 +++++++
9 files changed, 89 insertions(+), 35 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7ef3064..0efb4db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-robust-http-client (1.1-1) unstable; urgency=low
+robust-http-client (1.2-1) unstable; urgency=low
* Initial release. (Closes: #629508)
- -- James Page <james.page at canonical.com> Tue, 07 Jun 2011 09:58:08 +0100
+ -- James Page <james.page at canonical.com> Mon, 20 Jun 2011 08:22:03 +0100
diff --git a/debian/copyright b/debian/copyright
index 4293a96..91bf9b9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ Name: Robust HTTP client library
Source: http://java.net/projects/robust-http-client
Files: *
-Copyright: 2010, Kohsuke Kawaguchi
+Copyright: 2009, Sun Microsystems, Inc.
License: MIT
Files: debian/*
diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules
index 923f8b7..72d16af 100644
--- a/debian/maven.cleanIgnoreRules
+++ b/debian/maven.cleanIgnoreRules
@@ -16,3 +16,5 @@
org.apache.maven.plugins maven-idea-plugin * * * *
org.jvnet.wagon-svn wagon-svn * * * *
+org.kathrynhuxtable.maven.wagon wagon-gitsite * * * *
+org.apache.maven.scm maven-scm-provider-gitexe * * * *
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 923f8b7..72d16af 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -16,3 +16,5 @@
org.apache.maven.plugins maven-idea-plugin * * * *
org.jvnet.wagon-svn wagon-svn * * * *
+org.kathrynhuxtable.maven.wagon wagon-gitsite * * * *
+org.apache.maven.scm maven-scm-provider-gitexe * * * *
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
deleted file mode 100755
index 47e0c74..0000000
--- a/debian/orig-tar.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh -e
-
-VERSION=$2
-TAR=../robust-http-client_$VERSION.orig.tar.gz
-DIR=robust-http-client-$VERSION
-TAG=$(echo "robust-http-client-$VERSION" | sed -re's/~(alpha|beta)/-\1-/')
-
-svn export https://svn.java.net/svn/robust-http-client~svn/tags/${TAG}/ $DIR
-GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude '*.class' $DIR
-rm -rf $DIR ../$TAG
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
- . .svn/deb-layout
- mv $TAR $origDir && echo "moved $TAR to $origDir"
-fi
diff --git a/debian/watch b/debian/watch
index dca64f5..7dd35a2 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,3 @@
version=3
opts="uversionmangle=s/-(alpha|beta)-/~$1/" \
- http://java.net/projects/robust-http-client/sources/svn/show/tags \
- /projects/robust-http-client/sources/svn/show/tags/robust-http-client-(\d+).(\d+).* debian debian/orig-tar.sh
+ http://githubredir.debian.net/github/kohsuke/robust-http-client/ robust-http-client-(.*).tar.gz
diff --git a/pom.xml b/pom.xml
index fd79e03..d547c9a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,26 +2,29 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jvnet.robust-http-client</groupId>
<artifactId>robust-http-client</artifactId>
- <packaging>jar</packaging>
- <version>1.1</version>
+ <version>1.2</version>
<name>Robust HTTP client library</name>
- <url>http://maven.apache.org</url>
+ <description>InputStream that hides automatic download retry</description>
+ <url>http://${project.artifactId}.kohsuke.org/</url>
<scm>
- <connection>scm:svn:https://svn.dev.java.net/svn/robust-http-client/tags/robust-http-client-1.1</connection>
- <developerConnection>scm:svn:https://svn.dev.java.net/svn/robust-http-client/tags/robust-http-client-1.1</developerConnection>
- <url>https://robust-http-client.dev.java.net/source/browse/robust-http-client/tags/robust-http-client-1.1</url>
+ <connection>scm:git:git at github.com/kohsuke/${project.artifactId}.git</connection>
+ <developerConnection>scm:git:ssh://git@github.com/kohsuke/${project.artifactId}.git</developerConnection>
+ <url>http://${project.artifactId}.kohsuke.org/</url>
</scm>
<distributionManagement>
<repository>
- <uniqueVersion>false</uniqueVersion>
- <id>local-repository</id>
- <url>svn:https://svn.dev.java.net/svn/maven2-repository/trunk/repository/</url>
+ <id>maven.jenkins-ci.org</id>
+ <url>http://maven.jenkins-ci.org:8081/content/repositories/releases</url>
</repository>
+ <snapshotRepository>
+ <id>maven.jenkins-ci.org</id>
+ <url>http://maven.jenkins-ci.org:8081/content/repositories/snapshots</url>
+ </snapshotRepository>
<site>
- <id>local</id>
- <url>svn:https://svn.dev.java.net/svn/robust-http-client/trunk/www/</url>
+ <id>github-pages</id>
+ <url>gitsite:git at github.com/kohsuke/${project.artifactId}.git</url>
</site>
</distributionManagement>
@@ -42,13 +45,28 @@
<downloadSources>true</downloadSources>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.0-beta-3</version>
+ </plugin>
</plugins>
<extensions>
<extension>
- <groupId>org.jvnet.wagon-svn</groupId>
- <artifactId>wagon-svn</artifactId>
- <version>1.9</version>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-provider-gitexe</artifactId>
+ <version>1.3</version>
+ </extension>
+ <extension>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-manager-plexus</artifactId>
+ <version>1.3</version>
+ </extension>
+ <extension>
+ <groupId>org.kathrynhuxtable.maven.wagon</groupId>
+ <artifactId>wagon-gitsite</artifactId>
+ <version>0.3.1</version>
</extension>
</extensions>
</build>
@@ -75,4 +93,11 @@
<distribution>repo</distribution>
</license>
</licenses>
+
+ <repositories>
+ <repository>
+ <id>m.g.o-public</id>
+ <url>http://maven.glassfish.org/content/groups/public/</url>
+ </repository>
+ </repositories>
</project>
diff --git a/src/main/java/org/jvnet/robust_http_client/RetryableHttpStream.java b/src/main/java/org/jvnet/robust_http_client/RetryableHttpStream.java
index 3336d3d..53381a0 100644
--- a/src/main/java/org/jvnet/robust_http_client/RetryableHttpStream.java
+++ b/src/main/java/org/jvnet/robust_http_client/RetryableHttpStream.java
@@ -1,3 +1,26 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
package org.jvnet.robust_http_client;
import java.io.IOException;
diff --git a/src/site/site.xml b/src/site/site.xml
new file mode 100644
index 0000000..a938ef1
--- /dev/null
+++ b/src/site/site.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project name="Robust HTTP client library">
+ <skin>
+ <groupId>org.kohsuke</groupId>
+ <artifactId>maven-skin</artifactId>
+ <version>1.1</version>
+ </skin>
+
+ <body>
+ <menu name="Robust HTTP client library">
+ <item name="Overview" href="index.html"/>
+
+ <!--item name="Mailing lists" href="servlets/ProjectMailingListList"/-->
+ <item name="Source code" href="https://github.com/kohsuke/robust-http-client"/>
+ <item name="Issues" href="http://java.net/jira/browse/ROBUST_HTTP_CLIENT"/>
+ </menu>
+ ${reports}
+ </body>
+</project>
hooks/post-receive
--
robust-http-client packaging
More information about the pkg-java-commits
mailing list