[apache-commons-jci] disable (unused) extensions
by gil
commit 0864b2c2fe361ee7cc52c23bbdd73b143a3e2622
Author: gil <puntogil(a)libero.it>
Date: Sat Mar 29 14:06:55 2014 +0100
disable (unused) extensions
apache-commons-jci.spec | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/apache-commons-jci.spec b/apache-commons-jci.spec
index 383d19e..e138ce6 100644
--- a/apache-commons-jci.spec
+++ b/apache-commons-jci.spec
@@ -129,6 +129,8 @@ find . -name "*.jar" -delete
%pom_disable_module compilers/javac
%pom_disable_module examples
+%pom_xpath_remove "pom:build/pom:extensions"
+
sed -i "s|<maven.compile.source>1.4<|<maven.compile.source>1.5<|" pom.xml
sed -i "s|<maven.compile.target>1.4<|<maven.compile.target>1.5<|" pom.xml
10 years, 2 months
[qpid-proton-java] try fix bouncycastle 1.50 support
by gil
commit eda6909037de7e03e63c0e7ed0c1e0191a76cd8c
Author: gil <puntogil(a)libero.it>
Date: Sat Mar 29 14:02:11 2014 +0100
try fix bouncycastle 1.50 support
qpid-proton-java.spec | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/qpid-proton-java.spec b/qpid-proton-java.spec
index d95fc14..5bc54db 100644
--- a/qpid-proton-java.spec
+++ b/qpid-proton-java.spec
@@ -42,6 +42,8 @@ rm -r tools docs config.sh examples/messenger/c \
#sed -i 's|bcpkix-jdk15on|bcprov-jdk16|' proton-j/proton/pom.xml
sed -i 's|PEMReader|PEMParser|' \
proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java
+sed -i 's|pemReader = new PEMParser(reader, passwordFinder);|pemReader = new PEMParser(reader);|' \
+ proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java
#%%pom_disable_module "tests"
%pom_remove_dep org.python:jython-standalone tests
10 years, 2 months
[qpid-proton-java] try fix bouncycastle 1.50 support
by gil
commit 4b9c823b4977258b76b2ee80f15ac2096c752a60
Author: gil <puntogil(a)libero.it>
Date: Sat Mar 29 13:40:22 2014 +0100
try fix bouncycastle 1.50 support
qpid-proton-java.spec | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/qpid-proton-java.spec b/qpid-proton-java.spec
index 91cdc6e..d95fc14 100644
--- a/qpid-proton-java.spec
+++ b/qpid-proton-java.spec
@@ -40,6 +40,8 @@ rm -r tools docs config.sh examples/messenger/c \
tests/smoke tests/ruby tests/python tests/tools
#sed -i 's|bcpkix-jdk15on|bcprov-jdk16|' proton-j/proton/pom.xml
+sed -i 's|PEMReader|PEMParser|' \
+ proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java
#%%pom_disable_module "tests"
%pom_remove_dep org.python:jython-standalone tests
10 years, 2 months
[qpid-proton-java] use default bouncycastle dep
by gil
commit 54a0e6a5e858cd6d9380380c920a5bba34742501
Author: gil <puntogil(a)libero.it>
Date: Sat Mar 29 13:11:47 2014 +0100
use default bouncycastle dep
qpid-proton-java.spec | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/qpid-proton-java.spec b/qpid-proton-java.spec
index ae8e936..91cdc6e 100644
--- a/qpid-proton-java.spec
+++ b/qpid-proton-java.spec
@@ -10,7 +10,7 @@ BuildRequires: maven-local
BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.apache.maven.doxia:doxia-module-markdown)
BuildRequires: mvn(org.apache.maven.plugins:maven-site-plugin)
-BuildRequires: mvn(org.bouncycastle:bcprov-jdk16)
+BuildRequires: mvn(org.bouncycastle:bcpkix-jdk15on)
BuildRequires: mvn(org.apache.geronimo.specs:geronimo-jms_1.1_spec)
BuildRequires: mvn(org.apache.geronimo.specs:specs)
BuildRequires: mvn(org.fusesource.hawtbuf:hawtbuf)
@@ -39,7 +39,7 @@ rm -r tools docs config.sh examples/messenger/c \
examples/include CMakeLists.txt bin proton-c \
tests/smoke tests/ruby tests/python tests/tools
-sed -i 's|bcpkix-jdk15on|bcprov-jdk16|' proton-j/proton/pom.xml
+#sed -i 's|bcpkix-jdk15on|bcprov-jdk16|' proton-j/proton/pom.xml
#%%pom_disable_module "tests"
%pom_remove_dep org.python:jython-standalone tests
10 years, 2 months
[jackson-core] disable (unused) extensions
by gil
commit 38125a90f466fee56f1f54b2c67da3881fa67fc4
Author: gil <puntogil(a)libero.it>
Date: Sat Mar 29 12:54:07 2014 +0100
disable (unused) extensions
jackson-core.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/jackson-core.spec b/jackson-core.spec
index 9742616..01272c7 100644
--- a/jackson-core.spec
+++ b/jackson-core.spec
@@ -41,7 +41,7 @@ This package contains javadoc for %{name}.
%prep
%setup -q -n %{name}-%{name}-%{version}
-%pom_xpath_remove "pom:build/pom:extensions/pom:extension[pom:artifactId='wagon-gitsite']"
+%pom_xpath_remove "pom:build/pom:extensions"
# remove unavailable com.google.doclava doclava 1.0.3
%pom_xpath_remove "pom:reporting/pom:plugins/pom:plugin[pom:artifactId='maven-javadoc-plugin']/pom:configuration"
%pom_xpath_inject "pom:reporting/pom:plugins/pom:plugin[pom:artifactId='maven-javadoc-plugin']" '
10 years, 2 months
[uimaj] disable some failed tests
by gil
commit 4e5850004b204dbe681e834a615fdcd8be20354d
Author: gil <puntogil(a)libero.it>
Date: Sat Mar 29 12:47:39 2014 +0100
disable some failed tests
uimaj.spec | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --git a/uimaj.spec b/uimaj.spec
index e1264db..2c5135c 100644
--- a/uimaj.spec
+++ b/uimaj.spec
@@ -130,6 +130,9 @@ rm -r %{name}-core/src/test/java/org/apache/uima/internal/util/UIMAClassLoaderTe
sed -i 's/\r//' NOTICE README
+# These tests fails with java8
+rm -r %{name}-tools/src/test/java/org/apache/uima/tools/viewer/CasAnnotationViewerTest.java
+
%build
%mvn_package :PearPackagingMavenPlugin uima-pear-maven-plugin
10 years, 2 months
[jersey] disable default profiles
by gil
commit 8f809441743e30be6ff650078b54cc0c99283bb6
Author: gil <puntogil(a)libero.it>
Date: Sat Mar 29 12:16:50 2014 +0100
disable default profiles
jersey.spec | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/jersey.spec b/jersey.spec
index f433f65..bcff3c5 100644
--- a/jersey.spec
+++ b/jersey.spec
@@ -248,6 +248,10 @@ rm -r jersey-server/src/test/java/com/sun/jersey/server/impl/BuildIdTest.java
# Cannot run program "svn"
%pom_remove_plugin org.codehaus.mojo:buildnumber-maven-plugin
+%pom_xpath_remove "pom:profiles" contribs/wadl-resourcedoc-doclet
+%pom_add_dep com.sun:tools contribs/wadl-resourcedoc-doclet
+%pom_add_dep com.sun.jersey:jersey-server:'${project.version}' contribs/wadl-resourcedoc-doclet
+
%build
# Do not install source jars
10 years, 2 months