diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d5b9334 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/shibboleth-java-support-7.1.1.tar.xz diff --git a/dead.package b/dead.package deleted file mode 100644 index 5204a84..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -Orphaned for 6+ weeks diff --git a/shibboleth-java-support-7.1.1-port-to-servlet-3.1.patch b/shibboleth-java-support-7.1.1-port-to-servlet-3.1.patch new file mode 100644 index 0000000..ca63e44 --- /dev/null +++ b/shibboleth-java-support-7.1.1-port-to-servlet-3.1.patch @@ -0,0 +1,44 @@ +diff -Nru shibboleth-java-support-7.1.1/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletRequestProxy.java shibboleth-java-support-7.1.1.servlet/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletRequestProxy.java +--- shibboleth-java-support-7.1.1/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletRequestProxy.java 2015-03-25 18:56:37.000000000 +0100 ++++ shibboleth-java-support-7.1.1.servlet/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletRequestProxy.java 2016-07-14 10:57:47.628924060 +0200 +@@ -38,6 +38,7 @@ + import javax.servlet.http.HttpServletRequest; + import javax.servlet.http.HttpServletResponse; + import javax.servlet.http.HttpSession; ++import javax.servlet.http.HttpUpgradeHandler; + import javax.servlet.http.Part; + + import net.shibboleth.utilities.java.support.logic.Constraint; +@@ -390,4 +391,19 @@ + "Current HttpServletRequest has not been loaded via HttpServletRequestResponseContext"); + } + ++ @Override ++ public String changeSessionId() { ++ throw new UnsupportedOperationException("Not implemented yet"); ++ } ++ ++ @Override ++ public long getContentLengthLong() { ++ throw new UnsupportedOperationException("Not implemented yet"); ++ } ++ ++ @Override ++ public T upgrade(Class arg0) throws IOException, ServletException { ++ throw new UnsupportedOperationException("Not implemented yet"); ++ } ++ + } +diff -Nru shibboleth-java-support-7.1.1/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletResponseProxy.java shibboleth-java-support-7.1.1.servlet/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletResponseProxy.java +--- shibboleth-java-support-7.1.1/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletResponseProxy.java 2015-03-25 18:56:37.000000000 +0100 ++++ shibboleth-java-support-7.1.1.servlet/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletResponseProxy.java 2016-07-14 10:47:06.202496287 +0200 +@@ -227,4 +227,9 @@ + "Current HttpServletResponse has not been loaded via HttpServletRequestResponseContext"); + } + ++ @Override ++ public void setContentLengthLong(long arg0) { ++ throw new UnsupportedOperationException("Not implemented yet"); ++ } ++ + } diff --git a/shibboleth-java-support.spec b/shibboleth-java-support.spec new file mode 100644 index 0000000..a725df3 --- /dev/null +++ b/shibboleth-java-support.spec @@ -0,0 +1,102 @@ +Name: shibboleth-java-support +Version: 7.1.1 +Release: 9%{?dist} +Summary: Java Support for Shibboleth projects +License: ASL 2.0 and BSD +URL: http://shibboleth.net/ +# git clone git://git.shibboleth.net/java-support +# (cd java-support/ && git archive --format=tar --prefix=shibboleth-java-support-7.1.1/ 7.1.1 | xz > ../shibboleth-java-support-7.1.1.tar.xz) +Source0: %{name}-%{version}.tar.xz +Patch0: shibboleth-java-support-7.1.1-port-to-servlet-3.1.patch + +BuildRequires: maven-local +BuildRequires: mvn(ch.qos.logback:logback-classic) +BuildRequires: mvn(ch.qos.logback:logback-core) +BuildRequires: mvn(com.beust:jcommander) +BuildRequires: mvn(com.google.code.findbugs:jsr305) +BuildRequires: mvn(com.google.guava:guava) +BuildRequires: mvn(commons-codec:commons-codec) +BuildRequires: mvn(javax.servlet:javax.servlet-api) +BuildRequires: mvn(joda-time:joda-time) +BuildRequires: mvn(net.shibboleth:parent-v3:pom:) +BuildRequires: mvn(org.apache.httpcomponents:httpclient) +BuildRequires: mvn(org.apache.httpcomponents:httpclient-cache) +BuildRequires: mvn(org.apache.velocity:velocity) +BuildRequires: mvn(org.bouncycastle:bcprov-jdk15on) +BuildRequires: mvn(org.bouncycastle:bcpkix-jdk15on) +BuildRequires: mvn(org.springframework:spring-core) +BuildRequires: mvn(org.springframework:spring-test) +# test deps listed in net.shibboleth:parent-v3:pom: +BuildRequires: mvn(org.slf4j:jcl-over-slf4j) +BuildRequires: mvn(org.slf4j:jul-to-slf4j) +BuildRequires: mvn(org.slf4j:log4j-over-slf4j) +BuildRequires: mvn(org.testng:testng) +BuildRequires: mvn(xmlunit:xmlunit) + +BuildArch: noarch + +%description +Java Support for Shibboleth projects. + +%package javadoc +Summary: Javadoc for %{name} + +%description javadoc +This package contains javadoc for %{name}. + +%prep +%setup -q -n %{name}-%{version} +%patch0 -p1 + +# Use web connection +# UnknownHostException: buildvm-19.phx2.fedoraproject.org: buildvm-19.phx2.fedoraproject.org: unknown error +rm src/test/java/net/shibboleth/utilities/java/support/net/IPRangeTest.java +# AssertionError only on koji builders +rm src/test/java/net/shibboleth/utilities/java/support/collection/LazyMapTest.java \ + src/test/java/net/shibboleth/utilities/java/support/collection/ClassToInstanceMultiMapTest.java \ + src/test/java/net/shibboleth/utilities/java/support/httpclient/IdleConectionSweeperTest.java + +%mvn_file : %{name} java-support +%mvn_package :java-support::tests: + +%build + +%mvn_build + +%install +%mvn_install + +%files -f .mfiles +%doc doc/RELEASE-NOTES.txt +%license doc/LICENSE.txt doc/NOTICE.txt doc/OWASP-LICENSE.txt + +%files javadoc -f .mfiles-javadoc +%license doc/LICENSE.txt doc/NOTICE.txt doc/OWASP-LICENSE.txt + +%changelog +* Fri Jul 26 2019 Fedora Release Engineering - 7.1.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Feb 02 2019 Fedora Release Engineering - 7.1.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 7.1.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 7.1.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 7.1.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 7.1.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sat Sep 24 2016 gil cattaneo 7.1.1-3 +- remove test failure + +* Mon Jul 25 2016 gil cattaneo 7.1.1-2 +- review fixes + +* Thu Jul 14 2016 gil cattaneo 7.1.1-1 +- initial rpm diff --git a/sources b/sources new file mode 100644 index 0000000..9849168 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +7c57424535fa5635cf38f7f7045ae6f3 shibboleth-java-support-7.1.1.tar.xz