[stapler] Update to upstream version 1.218
Michal Srb
msrb at fedoraproject.org
Mon Sep 2 14:02:59 UTC 2013
commit ab3b36bd3adfee92224d1e2e92b86e15e3688c89
Author: Michal Srb <msrb at redhat.com>
Date: Mon Sep 2 16:00:01 2013 +0200
Update to upstream version 1.218
.gitignore | 1 +
0001-Remove-jellydoc-annotations.patch | 59 ++++++++++++++++++++++++++-----
create-tarball.sh | 7 +---
sources | 2 +-
stapler.spec | 7 +++-
5 files changed, 58 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 58179c4..d031505 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/stapler-1.209-clean.tar.gz
/LICENSE-2.0.txt
+/stapler-1.218-clean.tar.gz
diff --git a/0001-Remove-jellydoc-annotations.patch b/0001-Remove-jellydoc-annotations.patch
index 88b6b61..8db5a9d 100644
--- a/0001-Remove-jellydoc-annotations.patch
+++ b/0001-Remove-jellydoc-annotations.patch
@@ -1,6 +1,6 @@
-From 12702f84a63a4102cb532daa60949190b481458b Mon Sep 17 00:00:00 2001
+From d8c6009bbfa81185261119f9bdb35dd244df5c51 Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb at redhat.com>
-Date: Mon, 6 May 2013 16:31:31 +0200
+Date: Mon, 2 Sep 2013 15:47:01 +0200
Subject: [PATCH] Remove jellydoc annotations
We don't need to generate any reports with maven-jellydoc-plugin.
@@ -19,10 +19,11 @@ We don't need to generate any reports with maven-jellydoc-plugin.
jelly/src/main/java/org/kohsuke/stapler/jelly/NbspTag.java | 2 --
jelly/src/main/java/org/kohsuke/stapler/jelly/OutTag.java | 4 ----
jelly/src/main/java/org/kohsuke/stapler/jelly/RedirectTag.java | 4 ----
+ jelly/src/main/java/org/kohsuke/stapler/jelly/SetHeaderTag.java | 5 -----
jelly/src/main/java/org/kohsuke/stapler/jelly/StatusCodeTag.java | 4 ----
.../java/org/kohsuke/stapler/jelly/StructuredMessageFormatTag.java | 2 --
jelly/src/main/java/org/kohsuke/stapler/jelly/package-info.java | 2 --
- 17 files changed, 51 deletions(-)
+ 18 files changed, 56 deletions(-)
diff --git a/jelly/src/main/java/org/kohsuke/stapler/jelly/AdjunctTag.java b/jelly/src/main/java/org/kohsuke/stapler/jelly/AdjunctTag.java
index a36201f..da8d3da 100644
@@ -86,7 +87,7 @@ index bbd54c6..532b19b 100644
/**
diff --git a/jelly/src/main/java/org/kohsuke/stapler/jelly/BindTag.java b/jelly/src/main/java/org/kohsuke/stapler/jelly/BindTag.java
-index 1528ced..50b404a 100644
+index a8d0c21..701bc36 100644
--- a/jelly/src/main/java/org/kohsuke/stapler/jelly/BindTag.java
+++ b/jelly/src/main/java/org/kohsuke/stapler/jelly/BindTag.java
@@ -25,8 +25,6 @@ package org.kohsuke.stapler.jelly;
@@ -214,10 +215,10 @@ index 34318c3..bc6a455 100644
private String tag;
diff --git a/jelly/src/main/java/org/kohsuke/stapler/jelly/HeaderTag.java b/jelly/src/main/java/org/kohsuke/stapler/jelly/HeaderTag.java
-index 259c134..8771b0a 100644
+index 9d58782..785a33c 100644
--- a/jelly/src/main/java/org/kohsuke/stapler/jelly/HeaderTag.java
+++ b/jelly/src/main/java/org/kohsuke/stapler/jelly/HeaderTag.java
-@@ -26,15 +26,12 @@ package org.kohsuke.stapler.jelly;
+@@ -26,8 +26,6 @@ package org.kohsuke.stapler.jelly;
import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.XMLOutput;
@@ -226,14 +227,15 @@ index 259c134..8771b0a 100644
/**
* Adds an HTTP header to the response.
- *
+@@ -35,7 +33,6 @@ import org.jvnet.maven.jellydoc.annotation.Required;
* @author Kohsuke Kawaguchi
+ * @see SetHeaderTag
*/
- at NoContent
public class HeaderTag extends AbstractStaplerTag {
private String name;
private String value;
-@@ -42,7 +39,6 @@ public class HeaderTag extends AbstractStaplerTag {
+@@ -43,7 +40,6 @@ public class HeaderTag extends AbstractStaplerTag {
/**
* Header name.
*/
@@ -241,7 +243,7 @@ index 259c134..8771b0a 100644
public void setName(String name) {
this.name = name;
}
-@@ -50,7 +46,6 @@ public class HeaderTag extends AbstractStaplerTag {
+@@ -51,7 +47,6 @@ public class HeaderTag extends AbstractStaplerTag {
/**
* Header value.
*/
@@ -362,6 +364,43 @@ index 4479a1e..7595131 100644
public void setUrl(String url) {
this.url = url;
}
+diff --git a/jelly/src/main/java/org/kohsuke/stapler/jelly/SetHeaderTag.java b/jelly/src/main/java/org/kohsuke/stapler/jelly/SetHeaderTag.java
+index 4e34d6d..9fccfbc 100644
+--- a/jelly/src/main/java/org/kohsuke/stapler/jelly/SetHeaderTag.java
++++ b/jelly/src/main/java/org/kohsuke/stapler/jelly/SetHeaderTag.java
+@@ -2,8 +2,6 @@ package org.kohsuke.stapler.jelly;
+
+ import org.apache.commons.jelly.JellyTagException;
+ import org.apache.commons.jelly.XMLOutput;
+-import org.jvnet.maven.jellydoc.annotation.NoContent;
+-import org.jvnet.maven.jellydoc.annotation.Required;
+
+ /**
+ * Sets an HTTP header to the response.
+@@ -11,7 +9,6 @@ import org.jvnet.maven.jellydoc.annotation.Required;
+ * @author Kohsuke Kawaguchi
+ * @see HeaderTag
+ */
+- at NoContent
+ public class SetHeaderTag extends AbstractStaplerTag {
+ private String name;
+ private String value;
+@@ -19,7 +16,6 @@ public class SetHeaderTag extends AbstractStaplerTag {
+ /**
+ * Header name.
+ */
+- @Required
+ public void setName(String name) {
+ this.name = name;
+ }
+@@ -27,7 +23,6 @@ public class SetHeaderTag extends AbstractStaplerTag {
+ /**
+ * Header value.
+ */
+- @Required
+ public void setValue(String value) {
+ this.value = value;
+ }
diff --git a/jelly/src/main/java/org/kohsuke/stapler/jelly/StatusCodeTag.java b/jelly/src/main/java/org/kohsuke/stapler/jelly/StatusCodeTag.java
index 9c1db8e..848d6a5 100644
--- a/jelly/src/main/java/org/kohsuke/stapler/jelly/StatusCodeTag.java
@@ -424,5 +463,5 @@ index bf5fdf0..294a0b6 100644
-import org.jvnet.maven.jellydoc.annotation.TagLibUri;
\ No newline at end of file
--
-1.8.1.4
+1.8.3.1
diff --git a/create-tarball.sh b/create-tarball.sh
index c9d3471..f21f929 100755
--- a/create-tarball.sh
+++ b/create-tarball.sh
@@ -1,11 +1,8 @@
#!/bin/bash
-if [ $# -ne 1 ]; then
- echo "Usage: ./create-sources VERSION"
- exit 1
-fi
+VERSION=`grep Version: *spec | sed -e 's/Version:\s*\(.*\)/\1/'`
+echo $VERSION
-VERSION=${1}
NAME="stapler"
wget https://github.com/${NAME}/${NAME}/archive/${NAME}-parent-${VERSION}.tar.gz
diff --git a/sources b/sources
index 7077402..ecc88d9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-f6d9859b23696183224daec41f5ef760 stapler-1.209-clean.tar.gz
3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt
+fc2f3983c9f3eb53f0e0787e882f785c stapler-1.218-clean.tar.gz
diff --git a/stapler.spec b/stapler.spec
index 624996e..69c7f11 100644
--- a/stapler.spec
+++ b/stapler.spec
@@ -1,6 +1,6 @@
Name: stapler
-Version: 1.209
-Release: 3%{?dist}
+Version: 1.218
+Release: 1%{?dist}
Summary: Stapler Java web framework
# Project is licensed mostly under 2-clause BSD license
@@ -185,6 +185,9 @@ cp %{SOURCE1} LICENSE
%changelog
+* Mon Sep 02 2013 Michal Srb <msrb at redhat.com> - 1.218-1
+- Update to upstream version 1.218
+
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.209-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list