java-sig-commits July 2012

java-sig-commits@lists.fedoraproject.org

18 participants
566 discussions

Start a nNew thread

[javapackages] Created tag 0.5.0
by Stanislav Ochotnicky 25 Jul '12

25 Jul '12

The lightweight tag '0.5.0' was created pointing to: af32e5b... Add support for compat versions to add_maven_depmap

1 0

[javapackages] Add support for compat versions to add_maven_depmap
by Stanislav Ochotnicky 25 Jul '12

25 Jul '12

commit af32e5bf67d1957b20f973be2329b14911717eee Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com> Date: Wed Jul 25 10:28:00 2012 +0200 Add support for compat versions to add_maven_depmap -v argument makes it possible to create compatibility versions for muliple artifacts that share gid:aid but are incompatible between versions. Compat jar needs to be placed in the same place as orginal in %install section. -v switch will then make sure to move this file to a versioned location and add additional symlinks if necessary. macros.fjava | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) --- diff --git a/macros.fjava b/macros.fjava index 6f7965d..9da36fa 100644 --- a/macros.fjava +++ b/macros.fjava @@ -36,14 +36,19 @@ # add_maven_depmap is simplified version of jpackage-style add_to_maven_depmap # -f addition to fragment name # -a is "g1:a1,g2:a2" formatted string with additional depmaps (groupId:artifactId,...) +# -v is "v1,v2" formatted string with additional compatibility versions +# supposed to be provided (jar,pom will be renamed to -%{version} variants +# and additional symlinks optionally created) # %1 is the pom filename relative to mavenpomdir # %2 is the path to jar file (when omitted we deal with parent pom file without jar) # # add_maven_depmap automatically parses pom file and it will fail with incorrect pom # or jar filename # +# in the end add_maven_depmap optionally moves jar and pom file to +# -%{version} variant and can create additional versioned symlinks -%add_maven_depmap(f:a:) \ +%add_maven_depmap(f:a:v:) \ # default values \ %if %# == 0 \ _pompart="JPP-%{name}.pom" \ @@ -71,6 +76,24 @@ python -m %{_datadir}/java-utils/maven_depmap %{-a} \\\ "${_jpath}" \\\ %endif \ \ +# this part only works for jars for now (now war/other compat support) \ +if [[ "%{-v}" != "" ]];then \ +mv %{buildroot}%{_mavenpomdir}/$_pompart \\\ + %{buildroot}%{_mavenpomdir}/${_pompart/.pom/-%{version}.pom} \ +if [ -f ${_jpath} ]; then \ + mv ${_jpath} ${_jpath/.jar/-%{version}.jar} \ +fi \ +for ver in $(echo %{-v*} | tr ',' '\\n');do \ + ln -s ${_pompart/.pom/-%{version}.pom} \\\ + %{buildroot}/%{_mavenpomdir}/${_pompart/.pom/-$ver.pom} \ + # we can have pom-only artifacts \ + if [ -f ${_jpath/.jar/-%{version}.jar} ];then \ + ln -s `basename ${_jpath/.jar/-%{version}.jar}` \\\ + ${_jpath/.jar/-$ver.jar} \ + fi \ +done \ +fi \ +\ %{nil} #==============================================================================

1 0

[sshj] update to 0.8.1
by gil 25 Jul '12

25 Jul '12

commit 309f1bd9fe6edce89d5b47a7825de74e66b78bd7 Author: gil <puntogil(a)libero.it> Date: Wed Jul 25 10:24:31 2012 +0200 update to 0.8.1 .gitignore | 1 + sources | 2 +- sshj.spec | 11 +++++++---- 3 files changed, 9 insertions(+), 5 deletions(-) --- diff --git a/.gitignore b/.gitignore index ce99c0d..7f68548 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /sshj-0.8.0.tar.xz +/sshj-0.8.1.tar.xz diff --git a/sources b/sources index aa0f680..c1553d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fd99ed13c09a65f518d18b71ab5db192 sshj-0.8.0.tar.xz +f8da50e2c5f5c93bd1603dcc7d196488 sshj-0.8.1.tar.xz diff --git a/sshj.spec b/sshj.spec index 7ddb081..0b9ac38 100644 --- a/sshj.spec +++ b/sshj.spec @@ -1,15 +1,15 @@ Name: sshj -Version: 0.8.0 +Version: 0.8.1 Release: 1%{?dist} Summary: SSHv2 library for Java Group: Development/Libraries License: ASL 2.0 URL: http://schmizz.net/sshj/ -# git clone git://github.com/shikhar/sshj.git sshj-0.8.0 -# cd sshj-0.8.0 && git archive --format=tar --prefix=sshj-0.8.0/ v0.8.0 | xz > sshj-0.8.0.tar.xz +# git clone git://github.com/shikhar/sshj.git sshj-0.8.1 +# cd sshj-0.8.1 && git archive --format=tar --prefix=sshj-0.8.1/ v0.8.1 | xz > sshj-0.8.1.tar.xz Source0: %{name}-%{version}.tar.xz -Patch0: %{name}-%{version}-use-jzlib-as-system-dependency.patch +Patch0: %{name}-0.8.0-use-jzlib-as-system-dependency.patch BuildRequires: java-devel BuildRequires: jpackage-utils @@ -85,5 +85,8 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} %doc LICENSE NOTICE %changelog +* Wed Jul 25 2012 gil cattaneo <puntogil(a)libero.it> 0.8.1-1 +- Update to 0.8.1 + * Mon Jul 02 2012 gil cattaneo <puntogil(a)libero.it> 0.8.0-1 - initial rpm \ No newline at end of file

1 0

File sshj-0.8.1.tar.xz uploaded to lookaside cache by gil
by gil 25 Jul '12

25 Jul '12

A file has been added to the lookaside cache for sshj: f8da50e2c5f5c93bd1603dcc7d196488 sshj-0.8.1.tar.xz

1 0

[Bug 842616] New: openjpa - compile with -target 1.5 or greater
by Red Hat Bugzilla 25 Jul '12

25 Jul '12

https://bugzilla.redhat.com/show_bug.cgi?id=842616 Bug ID: 842616 QA Contact: extras-qa(a)fedoraproject.org Severity: medium Version: rawhide Priority: medium CC: java-sig-commits(a)lists.fedoraproject.org, puntogil(a)libero.it Assignee: puntogil(a)libero.it Summary: openjpa - compile with -target 1.5 or greater Regression: --- Story Points: --- Classification: Fedora OS: Linux Reporter: mizdebsk(a)redhat.com Type: --- Documentation: --- Hardware: All Mount Type: --- Status: NEW Component: openjpa Product: Fedora Package openjpa appears to be using Java generics, but generates class files in format older than 49.0, which corresponds to J2SE 5.0, in which generics were introduced. Please update this package to generate classes in format 49.0 or above. This corresponds to -target 1.5 option of javac (or ecj). For more information, see bug #842394 -- You are receiving this mail because: You are on the CC list for the bug.

1 2

[sshj] Initial import (#836940)
by gil 25 Jul '12

25 Jul '12

commit 94558d27019a6a1404f6ecb388d5d9c153aa8463 Author: gil <puntogil(a)libero.it> Date: Wed Jul 25 09:37:35 2012 +0200 Initial import (#836940) .gitignore | 1 + sources | 1 + sshj-0.8.0-use-jzlib-as-system-dependency.patch | 12 +++ sshj.spec | 89 +++++++++++++++++++++++ 4 files changed, 103 insertions(+), 0 deletions(-) --- diff --git a/.gitignore b/.gitignore index e69de29..ce99c0d 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/sshj-0.8.0.tar.xz diff --git a/sources b/sources index e69de29..aa0f680 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +fd99ed13c09a65f518d18b71ab5db192 sshj-0.8.0.tar.xz diff --git a/sshj-0.8.0-use-jzlib-as-system-dependency.patch b/sshj-0.8.0-use-jzlib-as-system-dependency.patch new file mode 100644 index 0000000..ac8d08b --- /dev/null +++ b/sshj-0.8.0-use-jzlib-as-system-dependency.patch @@ -0,0 +1,12 @@ +--- pom.xml 2012-05-12 22:48:39.000000000 +0200 ++++ pom.xml-gil 2012-07-02 09:02:06.723500208 +0200 +@@ -55,7 +55,8 @@ + <groupId>com.jcraft</groupId> + <artifactId>jzlib</artifactId> + <version>1.0.7</version> +- <scope>provided</scope> ++ <scope>system</scope> ++ <systemPath>${_javadir}/jzlib.jar</systemPath> + </dependency> + <dependency> + <groupId>org.apache.sshd</groupId> diff --git a/sshj.spec b/sshj.spec new file mode 100644 index 0000000..7ddb081 --- /dev/null +++ b/sshj.spec @@ -0,0 +1,89 @@ +Name: sshj +Version: 0.8.0 +Release: 1%{?dist} +Summary: SSHv2 library for Java +Group: Development/Libraries +License: ASL 2.0 +URL: http://schmizz.net/sshj/ +# git clone git://github.com/shikhar/sshj.git sshj-0.8.0 +# cd sshj-0.8.0 && git archive --format=tar --prefix=sshj-0.8.0/ v0.8.0 | xz > sshj-0.8.0.tar.xz +Source0: %{name}-%{version}.tar.xz + +Patch0: %{name}-%{version}-use-jzlib-as-system-dependency.patch + +BuildRequires: java-devel +BuildRequires: jpackage-utils + +BuildRequires: apache-sshd +BuildRequires: bouncycastle +BuildRequires: jzlib +BuildRequires: slf4j + +# test deps +BuildRequires: junit +BuildRequires: logback +BuildRequires: mockito + +BuildRequires: maven +BuildRequires: maven-assembly-plugin +BuildRequires: maven-compiler-plugin +BuildRequires: maven-javadoc-plugin +BuildRequires: maven-plugin-bundle +BuildRequires: maven-resources-plugin +BuildRequires: maven-source-plugin +BuildRequires: maven-surefire-plugin +BuildRequires: maven-surefire-provider-junit4 + +Requires: apache-sshd +Requires: bouncycastle +Requires: jzlib +Requires: slf4j + +Requires: java +Requires: jpackage-utils +BuildArch: noarch + +%description +SSH, scp and sftp library for Java. + +%package javadoc +Group: Documentation +Summary: Javadoc for %{name} +Requires: jpackage-utils + +%description javadoc +This package contains javadoc for %{name}. + +%prep +%setup -q +%patch0 -p0 + +%build + +mvn-rpmbuild -D_javadir=%{_javadir} install javadoc:aggregate + +%install + +mkdir -p %{buildroot}%{_javadir} +install -pm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar + +mkdir -p %{buildroot}%{_mavenpomdir} +install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom +%add_maven_depmap JPP-%{name}.pom %{name}.jar + +mkdir -p %{buildroot}%{_javadocdir}/%{name} +cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} + +%files +%{_javadir}/%{name}.jar +%{_mavenpomdir}/JPP-%{name}.pom +%{_mavendepmapfragdir}/%{name} +%doc CONTRIBUTORS LICENSE NOTICE README.rst + +%files javadoc +%{_javadocdir}/%{name} +%doc LICENSE NOTICE + +%changelog +* Mon Jul 02 2012 gil cattaneo <puntogil(a)libero.it> 0.8.0-1 +- initial rpm \ No newline at end of file

1 0

File sshj-0.8.0.tar.xz uploaded to lookaside cache by gil
by gil 25 Jul '12

25 Jul '12

A file has been added to the lookaside cache for sshj: fd99ed13c09a65f518d18b71ab5db192 sshj-0.8.0.tar.xz

1 0

[tycho] Detect OSGi jars using presence of the Bundle-SymbolicName entry.
by Roland Grunberg 24 Jul '12

24 Jul '12

commit 4fc2026190a6ff5c755cba3c1e9b5ab2895adb08 Author: Roland Grunberg <rgrunber(a)redhat.com> Date: Mon Jul 23 12:54:02 2012 -0400 Detect OSGi jars using presence of the Bundle-SymbolicName entry. copy-platform-all | 2 +- tycho-use-custom-resolver.patch | 3 ++- tycho.spec | 5 ++++- 3 files changed, 7 insertions(+), 3 deletions(-) --- diff --git a/copy-platform-all b/copy-platform-all index 0adfd14..8a44193 100755 --- a/copy-platform-all +++ b/copy-platform-all @@ -77,7 +77,7 @@ for f in $(ls -d $eclipse/features/*); do done for p in $(find /usr/share/java -name "*.jar"); do - unzip -p $p 'META-INF/MANIFEST.MF' | grep -q 'Bundle-ManifestVersion' + unzip -p $p 'META-INF/MANIFEST.MF' | grep -q 'Bundle-SymbolicName' if [ $? = 0 ]; then plugin=$(basename $p) [ ! -e plugins/$plugin ] && ln -s $p plugins/$plugin diff --git a/tycho-use-custom-resolver.patch b/tycho-use-custom-resolver.patch index db8b4b3..c1adedc 100644 --- a/tycho-use-custom-resolver.patch +++ b/tycho-use-custom-resolver.patch @@ -80,7 +80,7 @@ index 80810d6..24efc87 100644 import java.util.List; import org.apache.maven.AbstractMavenLifecycleParticipant; -@@ -51,6 +52,20 @@ public class TychoMavenLifecycleParticipant extends AbstractMavenLifecyclePartic +@@ -51,6 +52,21 @@ public class TychoMavenLifecycleParticipant extends AbstractMavenLifecyclePartic registerExecutionListener(session); configureComponents(session); @@ -89,6 +89,7 @@ index 80810d6..24efc87 100644 + try { + String[] cmd = new String[] { "/usr/share/java/tycho/copy-platform-all", + System.getProperty("user.dir") + "/.m2/p2/repo" }; ++ System.out.println("Building system local p2 repository..."); + Process p = Runtime.getRuntime().exec(cmd); + p.waitFor(); + } catch (IOException e) { diff --git a/tycho.spec b/tycho.spec index 7b5f46f..3c2c9c8 100644 --- a/tycho.spec +++ b/tycho.spec @@ -1,4 +1,4 @@ -%global bootstrap 0 +%global bootstrap 1 %if %{bootstrap} %global snap -SNAPSHOT @@ -199,6 +199,9 @@ install -pm 755 %{SOURCE3} %{buildroot}%{_javadir}/%{name}/copy-platform-all %{_javadocdir}/%{name} %changelog +* Mon Jul 23 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.14.1-6 +- Detect OSGi jars using presence of Bundle-SymbolicName entry (BZ #838513). + * Sun Jul 22 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.14.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

1 0

Update of httpcomponents-client in rawhide
by Mikolaj Izdebski 24 Jul '12

24 Jul '12

Hello all, I am going to update httpcomponents-client in rawhide to the newest upstream release, which is 4.2.1. Current version in rawhide is 4.1.3. There are some incompatible changes, as described in the upstream changelog: http://svn.apache.org/repos/asf/httpcomponents/httpclient/tags/4.2.1/RELEAS… There is Koji a scratch build available: http://koji.fedoraproject.org/koji/taskinfo?taskID=4326222 If you have any objections, please speak on Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=827985 Mikolaj Izdebski

1 0

File httpcomponents-client-4.2.1-src.tar.gz uploaded to lookaside cache by mizdebsk
by Mikolaj Izdebski 24 Jul '12

24 Jul '12

A file has been added to the lookaside cache for httpcomponents-client: 3cdaad501c542805a0c41244f6a8c416 httpcomponents-client-4.2.1-src.tar.gz

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
57
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

java-sig-commits July 2012