[je] fix asm classpath
by gil
commit d784a826825f9bf838f16ee7d3ee5542b4f6d130
Author: gil <puntogil(a)libero.it>
Date: Sun Mar 30 14:19:50 2014 +0200
fix asm classpath
je.spec | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/je.spec b/je.spec
index 2b5839f..f6ea003 100644
--- a/je.spec
+++ b/je.spec
@@ -26,9 +26,8 @@ BuildRequires: android
%endif
BuildRequires: jboss-connector-1.6-api
BuildRequires: jboss-ejb-3.1-api
-BuildRequires: objectweb-asm4
-
-Requires: objectweb-asm4
+BuildRequires: mvn(org.ow2.asm:asm)
+Requires: mvn(org.ow2.asm:asm)
Requires: javapackages-tools
BuildArch: noarch
@@ -72,6 +71,9 @@ This package contains javadoc for %{name}-examples.
%patch0 -p0
cp -p %{SOURCE1} pom.xml
%patch1 -p1
+%if %{?fedora} >= 20
+sed -i "s|objectweb-asm4|objectweb-asm|" build.xml
+%endif
%build
10 years, 1 month
[ops4j-base] fix BR list
by gil
commit 0e5e34d8ca08dffb5bec2e5855036dd7c662fd34
Author: gil <puntogil(a)libero.it>
Date: Sun Mar 30 13:56:57 2014 +0200
fix BR list
ops4j-base.spec | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/ops4j-base.spec b/ops4j-base.spec
index 6a27500..cf3ceaf 100644
--- a/ops4j-base.spec
+++ b/ops4j-base.spec
@@ -25,6 +25,8 @@ BuildRequires: maven-local
BuildRequires: maven-enforcer-plugin
BuildRequires: maven-plugin-bundle
BuildRequires: maven-surefire-provider-junit4
+# used by ops4j-master
+BuildRequires: mvn(org.apache.maven.wagon:wagon-ssh-external)
BuildArch: noarch
10 years, 1 month
[openwebbeans] fix missing tomcat7 method
by gil
commit e996b584d98981392718ee27f11690221c0931d7
Author: gil <puntogil(a)libero.it>
Date: Sun Mar 30 13:37:57 2014 +0200
fix missing tomcat7 method
openwebbeans-1.2.0-tomcat7.patch | 14 ++++++++++++++
openwebbeans.spec | 3 +++
2 files changed, 17 insertions(+), 0 deletions(-)
---
diff --git a/openwebbeans-1.2.0-tomcat7.patch b/openwebbeans-1.2.0-tomcat7.patch
new file mode 100644
index 0000000..26aa510
--- /dev/null
+++ b/openwebbeans-1.2.0-tomcat7.patch
@@ -0,0 +1,14 @@
+--- webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/TomcatInstanceManager.java 2013-05-19 07:22:02.000000000 +0200
++++ webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/TomcatInstanceManager.java-gil 2014-03-30 13:34:41.888965995 +0200
+@@ -97,6 +97,11 @@
+ return object;
+ }
+
++ public Object newInstance(Class<?> clazz) throws IllegalAccessException, InvocationTargetException, NamingException, InstantiationException
++ {
++ return null;
++ }
++
+ private void inject(Object object)
+ {
+ try
diff --git a/openwebbeans.spec b/openwebbeans.spec
index ae33bc6..3f5d43e 100644
--- a/openwebbeans.spec
+++ b/openwebbeans.spec
@@ -9,6 +9,8 @@ Source0: http://www.apache.org/dist/openwebbeans/%{version}/%{name}-%{vers
Patch0: %{name}-1.1.6-webbeans-web-servlet30.patch
Patch1: %{name}-1.1.6-cditest-owb-servlet30.patch
Patch2: %{name}-1.2.0-xbean-312.patch
+# Add missing tomcat7 method
+Patch3: %{name}-1.2.0-tomcat7.patch
BuildRequires: java-devel
BuildRequires: mvn(asm:asm)
@@ -208,6 +210,7 @@ This package contains javadoc for %{name}.
%patch0 -p1
%patch1 -p0
%patch2 -p0
+%patch3 -p0
rm -r DEPENDENCIES
# require org.apache.openwebbeans.build-tools checkstyle-rules 1.2
10 years, 1 month
[openwebbeans] remove apache-rat-plugin
by gil
commit 483735659004f86527fcfb64145fb537c8103784
Author: gil <puntogil(a)libero.it>
Date: Sun Mar 30 13:05:55 2014 +0200
remove apache-rat-plugin
openwebbeans.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/openwebbeans.spec b/openwebbeans.spec
index c32dda9..ae33bc6 100644
--- a/openwebbeans.spec
+++ b/openwebbeans.spec
@@ -53,7 +53,7 @@ BuildRequires: mvn(org.ow2.asm:asm-all)
BuildRequires: mvn(asm:asm-commons)
BuildRequires: mvn(junit:junit)
-BuildRequires: apache-rat-plugin
+#BuildRequires: apache-rat-plugin
BuildRequires: apache-resource-bundles
BuildRequires: maven-local
BuildRequires: maven-dependency-plugin
@@ -439,6 +439,9 @@ rm -r webbeans-impl/src/test/java/org/apache/webbeans/portable/AnnotatedTypeImpl
rm -rf webbeans-clustering/src/test/java/org/apache/webbeans/web/failover/tests/MockServletContext.java \
webbeans-clustering/src/test/java/org/apache/webbeans/web/failover/tests/MockServletRequest.java
+# Break build
+%pom_remove_plugin org.apache.rat:apache-rat-plugin
+
%build
# merge parents poms with proper project subpackage
10 years, 1 month
[gemini-blueprint] fix multithreadedtc gId
by gil
commit 2cdc7227cfba02e36b4eda64ec4e514429083ce9
Author: gil <puntogil(a)libero.it>
Date: Sun Mar 30 13:02:34 2014 +0200
fix multithreadedtc gId
gemini-blueprint.spec | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/gemini-blueprint.spec b/gemini-blueprint.spec
index 8577516..4d4e530 100644
--- a/gemini-blueprint.spec
+++ b/gemini-blueprint.spec
@@ -27,7 +27,6 @@ BuildRequires: springframework-context-support
BuildRequires: mvn(org.slf4j:jcl-over-slf4j)
BuildRequires: mvn(org.slf4j:slf4j-api)
BuildRequires: mvn(org.slf4j:slf4j-log4j12)
-BuildRequires: mvn(edu.umd.cs.mtc:multithreadedtc)
BuildRequires: maven-local
BuildRequires: maven-plugin-bundle
@@ -111,7 +110,7 @@ rm -r core/src/test/java/org/eclipse/gemini/blueprint/internal/util/BeanFactoryU
%pom_remove_dep org.aopalliance: extender
%pom_add_dep aopalliance:aopalliance::test extender
-%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:artifactId = 'multithreadedtc' ]/pom:groupId" edu.umd.cs.mtc core
+%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:artifactId = 'multithreadedtc' ]/pom:groupId" edu.umd.cs core
%pom_xpath_set "pom:project/pom:dependencyManagement/pom:dependencies/pom:dependency[pom:version = '1.0.0' ]/pom:artifactId" aopalliance
%pom_xpath_set "pom:project/pom:dependencyManagement/pom:dependencies/pom:dependency[pom:version = '1.0.0' ]/pom:groupId" aopalliance
10 years, 1 month
[gemini-blueprint] fix BR list
by gil
commit 292c3891ad7db83761f8a1c10d07f41182be5150
Author: gil <puntogil(a)libero.it>
Date: Sun Mar 30 12:48:28 2014 +0200
fix BR list
gemini-blueprint.spec | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/gemini-blueprint.spec b/gemini-blueprint.spec
index c2afa6a..8577516 100644
--- a/gemini-blueprint.spec
+++ b/gemini-blueprint.spec
@@ -27,6 +27,7 @@ BuildRequires: springframework-context-support
BuildRequires: mvn(org.slf4j:jcl-over-slf4j)
BuildRequires: mvn(org.slf4j:slf4j-api)
BuildRequires: mvn(org.slf4j:slf4j-log4j12)
+BuildRequires: mvn(edu.umd.cs.mtc:multithreadedtc)
BuildRequires: maven-local
BuildRequires: maven-plugin-bundle
10 years, 1 month