[Bug 842349] New: Update maven-invoker-plugin to v1.6
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=842349
Bug ID: 842349
QA Contact: extras-qa(a)fedoraproject.org
Severity: unspecified
Version: rawhide
Priority: unspecified
CC: java-sig-commits(a)lists.fedoraproject.org,
tradej(a)redhat.com, weli(a)redhat.com
Assignee: weli(a)redhat.com
Summary: Update maven-invoker-plugin to v1.6
Regression: ---
Story Points: ---
Classification: Fedora
OS: Unspecified
Reporter: tradej(a)redhat.com
Type: Bug
Documentation: ---
Hardware: Unspecified
Mount Type: ---
Status: NEW
Component: maven-invoker-plugin
Product: Fedora
I'm updating maven-invoker-plugin to v1.6. So far, there have been some with
missing classes and such.
--
You are receiving this mail because:
You are on the CC list for the bug.
11 years, 7 months
[mockito/f18] (2 commits) ...Add aqute-bnd BR.
by jerboaa
Summary of changes:
4213781... Make mockito an OSGi bundle using upstream bnd config. (*)
160ee8b... Add aqute-bnd BR. (*)
(*) This commit already existed in another branch; no separate mail sent
11 years, 7 months
[Bug 852063] New: Mockito should be an OSGi bundle
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=852063
Bug ID: 852063
QA Contact: extras-qa(a)fedoraproject.org
Severity: unspecified
Version: 17
Priority: unspecified
CC: akurtako(a)redhat.com,
java-sig-commits(a)lists.fedoraproject.org,
jerboaa(a)gmail.com, omajid(a)redhat.com,
rkennke(a)redhat.com
Assignee: rkennke(a)redhat.com
Summary: Mockito should be an OSGi bundle
Regression: ---
Story Points: ---
Classification: Fedora
OS: Unspecified
Reporter: sgehwolf(a)redhat.com
Type: Bug
Documentation: ---
Hardware: Unspecified
Mount Type: ---
Status: NEW
Component: mockito
Product: Fedora
Description of problem:
Mockito is a bundle upstream and it should be the same in Fedora but is not.
Upstream => bundle, Fedora => jar; => no-happy-user :)
Version-Release number of selected component (if applicable):
mockito-1.9.0-6.fc17
How reproducible:
Always
Additional info:
Upstream uses Aqute BND to generate metadata. We should do the same using their
config files.
--
You are receiving this mail because:
You are on the CC list for the bug.
11 years, 7 months
[mockito] Add aqute-bnd BR.
by jerboaa
commit 160ee8b3a6882e7a9d99f4f9de02850aadd36a38
Author: Severin Gehwolf <sgehwolf(a)redhat.com>
Date: Fri Aug 31 18:21:29 2012 +0200
Add aqute-bnd BR.
mockito.spec | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/mockito.spec b/mockito.spec
index fcd1a07..503e68e 100644
--- a/mockito.spec
+++ b/mockito.spec
@@ -20,6 +20,7 @@ BuildRequires: objenesis
BuildRequires: cglib
BuildRequires: junit4
BuildRequires: hamcrest
+BuildRequires: aqute-bnd
Requires: jpackage-utils
Requires: java
11 years, 7 months
[mockito] Make mockito an OSGi bundle using upstream bnd config.
by jerboaa
commit 4213781c4df4ccf5f77243e194321057e1ee2498
Author: Severin Gehwolf <sgehwolf(a)redhat.com>
Date: Fri Aug 31 17:45:18 2012 +0200
Make mockito an OSGi bundle using upstream bnd config.
fix-bnd-config.patch | 27 +++++++++++++++++++++++++++
make-mockito-sourcetarball.sh | 14 ++++++++++----
mockito.spec | 15 +++++++++++++--
sources | 2 +-
4 files changed, 51 insertions(+), 7 deletions(-)
---
diff --git a/fix-bnd-config.patch b/fix-bnd-config.patch
new file mode 100644
index 0000000..cec2269
--- /dev/null
+++ b/fix-bnd-config.patch
@@ -0,0 +1,27 @@
+--- conf/mockito-core.bnd.orig 2012-08-31 17:38:35.605728658 +0200
++++ conf/mockito-core.bnd 2012-08-31 17:39:06.490980938 +0200
+@@ -1,8 +1,3 @@
+--classpath= lib/run/com.springsource.org.junit-4.5.0.jar, \
+- lib/run/com.springsource.org.hamcrest.core-1.1.0.jar, \
+- lib/run/com.springsource.org.objenesis-1.0.0.jar
+--versionpolicy=[${version;==;${@}},${version;+;${@}})
+-
+ Bundle-Name= Mockito Mock Library for Java. Core bundle requires Hamcrest-core and Objenesis.
+ Bundle-SymbolicName= org.mockito.mockito-core
+ Bundle-Version= 1.9.0
+@@ -10,7 +5,7 @@
+ Export-Package= !org.mockito.asm.*, \
+ !org.mockito.cglib.*, \
+ !org.mockito.internal.*, \
+- org.mockito.*;version=${version}
++ org.mockito.*
+
+ Import-Package= junit.*;resolution:=optional, \
+ org.junit.*;resolution:=optional, \
+@@ -21,4 +16,4 @@
+
+ Private-Package: org.mockito.*
+
+--removeheaders: Private-Package
+\ No newline at end of file
++-removeheaders: Private-Package
diff --git a/make-mockito-sourcetarball.sh b/make-mockito-sourcetarball.sh
index 54d1d6e..224d629 100644
--- a/make-mockito-sourcetarball.sh
+++ b/make-mockito-sourcetarball.sh
@@ -4,10 +4,16 @@ VERSION=1.9.0
SRCDIR=mockito-${VERSION}
hg clone https://code.google.com/p/mockito/ ${SRCDIR}
-cd $SRCDIR
-hg update ${VERSION}
-rm -rf `find -name *.jar` build.gradle cglib-and-asm conf doc gradle gradlew gradlew.bat
+pushd $SRCDIR
+hg archive --prefix ${SRCDIR} -t tar -r ${VERSION} ../${SRCDIR}.tar
+popd
+
+rm -rf ${SRCDIR}
+
+tar -xf ${SRCDIR}.tar
+pushd ${SRCDIR}
+rm -rf `find -name *.jar` build.gradle cglib-and-asm doc gradle gradlew gradlew.bat
dos2unix `find -name *.java`
-cd ..
+popd
tar -cvJf mockito-${VERSION}.tar.xz ${SRCDIR}
diff --git a/mockito.spec b/mockito.spec
index 45f8b41..fcd1a07 100644
--- a/mockito.spec
+++ b/mockito.spec
@@ -1,6 +1,6 @@
Name: mockito
Version: 1.9.0
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: A Java mocking framework
License: MIT
@@ -10,6 +10,7 @@ Source1: make-mockito-sourcetarball.sh
Patch0: fixup-ant-script.patch
Patch1: fix-cglib-refs.patch
Patch2: maven-cglib-dependency.patch
+Patch3: fix-bnd-config.patch
BuildArch: noarch
BuildRequires: jpackage-utils
@@ -46,14 +47,21 @@ This package contains the API documentation for %{name}.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+# Set Bundle-Version properly
+sed -i 's/Bundle-Version= ${version}/Bundle-Version= %{version}/' conf/mockito-core.bnd
+%patch3
%build
ant jar javadoc
+# Convert to OSGi bundle
+pushd target
+java -jar $(build-classpath aqute-bnd) wrap -output mockito-core-%{version}.bar -properties ../conf/mockito-core.bnd mockito-core-%{version}.jar
+popd
%install
mkdir -p $RPM_BUILD_ROOT%{_javadir}
sed -i -e "s|@version@|%{version}|g" maven/mockito-core.pom
-cp -p target/mockito-core-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+cp -p target/mockito-core-%{version}.bar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -pm 644 maven/mockito-core.pom \
@@ -77,6 +85,9 @@ cp -rp target/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%doc NOTICE
%changelog
+* Mon Aug 27 2012 Severin Gehwolf <sgehwolf(a)redhat.com> 1.9.0-8
+- Add aqute bnd instructions for OSGi metadata
+
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.9.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index 8ab5632..3d148e8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c358a9b514bee558dd78eaaa5d18cc15 mockito-1.9.0.tar.xz
+1c8f7d570579d7fbaa2a45fdeaf3e3e1 mockito-1.9.0.tar.xz
11 years, 7 months
[gentlyweb-utils] Initial import (#822831).
by gil
commit 67ad49ed382808a6799b4b71336dbf5bf882bb8b
Author: gil <puntogil(a)libero.it>
Date: Fri Aug 31 05:22:38 2012 +0200
Initial import (#822831).
.gitignore | 1 +
gentlyweb-utils-1.5-build.patch | 68 +++++++++++++++++++++++++++++++++
gentlyweb-utils-1.5.pom | 6 +++
gentlyweb-utils.spec | 80 +++++++++++++++++++++++++++++++++++++++
sources | 1 +
5 files changed, 156 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..b8819ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/gentlyWEB-src-utils-1.1.tar.gz
diff --git a/gentlyweb-utils-1.5-build.patch b/gentlyweb-utils-1.5-build.patch
new file mode 100644
index 0000000..1deec0f
--- /dev/null
+++ b/gentlyweb-utils-1.5-build.patch
@@ -0,0 +1,68 @@
+--- build-utils.xml 2011-06-19 20:19:48.000000000 +0200
++++ build-utils.xml-gil 2012-08-29 00:46:44.858057403 +0200
+@@ -15,20 +15,20 @@
+ <format property="TODAY" pattern="dd/MMM/yy" />
+ </tstamp>
+
+- <available file="f:/java/jars"
++ <!--available file="f:/java/jars"
+ type="dir"
+ property="commonJarsDir"
+ value="f:/java/jars" />
+
+- <fail unless="commonJarsDir">Unable to find common jars! Check paths in target "init".</fail>
++ <fail unless="commonJarsDir">Unable to find common jars! Check paths in target "init".</fail-->
+
+ <!--
+ Define where the common jar files are. It needs to be done here otherwise "commonJarsDir" would
+ not be allocated a value.
+ -->
+ <path id="commonJars">
+- <fileset defaultexcludes="yes" dir="${commonJarsDir}">
+- <include name="*.jar" />
++ <fileset defaultexcludes="yes" dir="/usr/share/java">
++ <include name="jdom.jar" />
+ </fileset>
+ </path>
+
+@@ -38,7 +38,8 @@
+ <javac srcdir="${srcDir}/utils"
+ destdir="${buildDir}"
+ debug="on"
+- source="1.4"
++ source="1.5"
++ target="1.5"
+ deprecation="on"
+ excludes="**/cvs/**">
+ <classpath refid="commonJars" />
+@@ -49,7 +50,7 @@
+ <target name="createUtilsJar" depends="compileUtils">
+
+ <property name="utilsTitle" value="utils - General purpose utilities" />
+- <property name="utilsVersion" value="1.1" />
++ <property name="utilsVersion" value="1.5" />
+ <property name="utilsPackage" value="com/gentlyweb/utils" />
+
+ <jar destfile="${projectName}-utils-${utilsVersion}.jar"
+@@ -67,4 +68,20 @@
+ </jar>
+ </target>
+
++ <target name="javadoc">
++ <mkdir dir="apidocs" />
++ <javadoc sourcepath="${srcDir}/utils"
++ destdir="apidocs"
++ source="1.5" charset="UTF-8"
++ >
++ <packageset dir="${srcDir}/utils"/>
++ <classpath>
++ <pathelement location="${buildDir}/*"/>
++ <fileset dir="/usr/share/java">
++ <include name="jdom.jar"/>
++ </fileset>
++ </classpath>
++ </javadoc>
++ </target>
++
+ </project>
+\ Manca newline alla fine del file
diff --git a/gentlyweb-utils-1.5.pom b/gentlyweb-utils-1.5.pom
new file mode 100644
index 0000000..db4a8ef
--- /dev/null
+++ b/gentlyweb-utils-1.5.pom
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>net.sf.josql</groupId>
+ <artifactId>gentlyweb-utils</artifactId>
+ <version>1.5</version>
+</project>
\ No newline at end of file
diff --git a/gentlyweb-utils.spec b/gentlyweb-utils.spec
new file mode 100644
index 0000000..dfcb8fa
--- /dev/null
+++ b/gentlyweb-utils.spec
@@ -0,0 +1,80 @@
+Name: gentlyweb-utils
+# there are no differences in the debian source taraball
+# http://ftp.de.debian.org/debian/pool/main/g/gentlyweb-utils/gentlyweb-uti...
+# the version is changed only in the activemq package see activemq-5.6.0/pom.xml
+Version: 1.5
+Release: 2%{?dist}
+Summary: Java utility library used by JoSQL for I/O
+Group: Development/Libraries
+License: ASL 2.0
+Url: http://josql.sourceforge.net/
+#Sour ce0: http://gentlyweb-utils.sourcearchive.com/downloads/1.5-1/gentlyweb-utils_...
+Source0: http://sourceforge.net/projects/josql/files/josql/stable-2.2/gentlyWEB-sr...
+Source1: http://repo.fusesource.com/nexus/content/groups/public/net/sf/josql/%{nam...
+# use system libraries
+# fix javac target/source 1.5, encoding
+# fix version
+# add javadoc task
+Patch0: %{name}-%{version}-build.patch
+
+
+BuildRequires: java-devel
+BuildRequires: jpackage-utils
+
+BuildRequires: ant
+BuildRequires: jdom
+
+Requires: java
+Requires: jpackage-utils
+BuildArch: noarch
+
+%description
+Simple java utility library used mainly by JoSQL for I/O.
+
+%package javadoc
+Group: Documentation
+Summary: Javadoc for %{name}
+Requires: jpackage-utils
+
+%description javadoc
+This package contains javadoc for %{name}.
+
+%prep
+%setup -q -n gentlyWEB-src-utils-1.1
+%patch0 -p0
+
+%build
+
+%ant -f build-utils.xml createUtilsJar javadoc
+
+%install
+
+mkdir -p %{buildroot}%{_javadir}
+install -m 644 gentlyWEB-utils-%{version}.jar \
+ %{buildroot}%{_javadir}/%{name}.jar
+ln -sf %{name}.jar %{buildroot}%{_javadir}/gentlyWEB-utils.jar
+
+mkdir -p %{buildroot}%{_mavenpomdir}
+install -pm 644 %SOURCE1 %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
+
+mkdir -p %{buildroot}%{_javadocdir}/%{name}
+cp -pr apidocs/* %{buildroot}%{_javadocdir}/%{name}
+
+%files
+%{_javadir}/%{name}.jar
+%{_javadir}/gentlyWEB-utils.jar
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
+%doc LICENSE-2.0.txt
+
+%files javadoc
+%{_javadocdir}/%{name}
+%doc LICENSE-2.0.txt
+
+%changelog
+* Thu Aug 30 2012 gil cattaneo <puntogil(a)libero.it> 1.5-2
+- changed SOURCE0 no more available at http://gentlyweb-utils.sourcearchive.com/downloads/1.5-1
+
+* Fri May 18 2012 gil cattaneo <puntogil(a)libero.it> 1.5-1
+- initial rpm
\ No newline at end of file
diff --git a/sources b/sources
index e69de29..7a39b23 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+9f2378c384cae0ce63cb00056d1f95e2 gentlyWEB-src-utils-1.1.tar.gz
11 years, 7 months