java-sig-commits November 2013

java-sig-commits@lists.fedoraproject.org

18 participants
410 discussions

[tycho/f20] Reduce length of file lock name when file is in build directory.
by Roland Grunberg 18 Nov '13

18 Nov '13

Summary of changes: a9422dc... Reduce length of file lock name when file is in build direc (*) (*) This commit already existed in another branch; no separate mail sent

1 0

[tycho] Reduce length of file lock name when file is in build directory.
by Roland Grunberg 18 Nov '13

18 Nov '13

commit a9422dc67c7e36e5bd44982c4d0afb1b8766f2a8 Author: Roland Grunberg <rgrunber(a)redhat.com> Date: Mon Nov 18 14:27:38 2013 -0500 Reduce length of file lock name when file is in build directory. tycho-use-custom-resolver.patch | 16 +++++++++------- tycho.spec | 5 ++++- 2 files changed, 13 insertions(+), 8 deletions(-) --- diff --git a/tycho-use-custom-resolver.patch b/tycho-use-custom-resolver.patch index c8f1329..3290a5a 100644 --- a/tycho-use-custom-resolver.patch +++ b/tycho-use-custom-resolver.patch @@ -1,4 +1,4 @@ -From 8242049f30a7271ff801748976922edff03e05fe Mon Sep 17 00:00:00 2001 +From 8cd8f81a6716b84acc5daf5ff9362db1b317f5cf Mon Sep 17 00:00:00 2001 From: Roland Grunberg <rgrunber(a)redhat.com> Date: Tue, 12 Jun 2012 10:38:51 -0400 Subject: [PATCH] Implement a custom resolver for Tycho in local mode. @@ -33,14 +33,14 @@ Change-Id: Ia1ece07ece2412bc4a88901631f3f651ad2b634b .../tycho/p2/repository/LocalRepositoryReader.java | 31 +++++++++++++- .../facade/TargetPlatformConfigurationStub.java | 5 ++- tycho-core/pom.xml | 5 +++ - .../eclipse/tycho/core/locking/FileLockerImpl.java | 24 ++++++++--- + .../eclipse/tycho/core/locking/FileLockerImpl.java | 26 ++++++++--- .../core/maven/TychoMavenLifecycleParticipant.java | 29 +++++++++++++ .../tycho/core/osgitools/AbstractTychoProject.java | 24 +++++++++++ .../tycho/core/osgitools/OsgiBundleProject.java | 29 ++++++++++++- .../DefaultTargetPlatformConfigurationReader.java | 6 ++- .../osgi/runtime/TychoOsgiRuntimeLocator.java | 17 ++++++++ .../p2/resolver/P2TargetPlatformResolver.java | 10 +++++ - 13 files changed, 226 insertions(+), 30 deletions(-) + 13 files changed, 228 insertions(+), 30 deletions(-) diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java index b008768..77c1443 100644 @@ -261,10 +261,10 @@ index 853bcf4..b29017f 100644 <dependency> <groupId>org.eclipse.tycho</groupId> diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/locking/FileLockerImpl.java b/tycho-core/src/main/java/org/eclipse/tycho/core/locking/FileLockerImpl.java -index 86253bd..247b2b2 100644 +index 86253bd..cef15d2 100644 --- a/tycho-core/src/main/java/org/eclipse/tycho/core/locking/FileLockerImpl.java +++ b/tycho-core/src/main/java/org/eclipse/tycho/core/locking/FileLockerImpl.java -@@ -27,22 +27,34 @@ public class FileLockerImpl implements FileLocker { +@@ -27,22 +27,36 @@ public class FileLockerImpl implements FileLocker { final File lockMarkerFile; public FileLockerImpl(File file, Location anyLocation) { @@ -290,11 +290,13 @@ index 86253bd..247b2b2 100644 throw new RuntimeException("Could not create parent directory " + parentDir + " of lock marker file"); } + -+ String reactorCache = System.getProperty("user.dir") + "/.m2/"; ++ String baseDir = System.getProperty("user.dir"); ++ String reactorCache = baseDir + "/.m2/"; + // In Fedora we can only assume reactor cache is safe for read/write. + if (!lockFileCandidate.getAbsolutePath().startsWith(reactorCache)) { + String lockFileDir = reactorCache + LOCKFILE_SUFFIX; -+ String lockFileName = file.getAbsolutePath().replace("/", "-").replaceFirst("-", "/") + LOCKFILE_SUFFIX; ++ // If the file is located within baseDir, no need to repeat ++ String lockFileName = file.getAbsolutePath().replace(baseDir, "").replace("/", "-").replaceFirst("-", "/") + LOCKFILE_SUFFIX; + lockFileCandidate = new File(lockFileDir, lockFileName); + } + diff --git a/tycho.spec b/tycho.spec index 2bfc2a3..3ddbbf2 100644 --- a/tycho.spec +++ b/tycho.spec @@ -9,7 +9,7 @@ Name: tycho Version: 0.19.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven Group: Development/Libraries @@ -308,6 +308,9 @@ sed -i 's|<maven>|&<extension>zip</extension>|' \ %{_javadocdir}/%{name} %changelog +* Mon Nov 18 2013 Roland Grunberg <rgrunber(a)redhat.com> - 0.19.0-2 +- Reduce length of file lock name when file is in build directory. + * Thu Oct 24 2013 Roland Grunberg <rgrunber(a)redhat.com> - 0.19.0-1 - Update to 0.19.0 Release.

1 0

Broken dependencies: maven-doxia
by Fedora Koji Build System 18 Nov '13

18 Nov '13

maven-doxia has broken dependencies in the rawhide tree: On x86_64: maven-doxia-module-itext-1.4-4.fc21.noarch requires mvn(com.lowagie:itext:2.1.7) On i386: maven-doxia-module-itext-1.4-4.fc21.noarch requires mvn(com.lowagie:itext:2.1.7) On armhfp: maven-doxia-module-itext-1.4-4.fc21.noarch requires mvn(com.lowagie:itext:2.1.7) Please resolve this as soon as possible.

1 0

[openjpa] use objectweb-asm3
by gil 18 Nov '13

18 Nov '13

commit e95d422553980d0d8800b280637f1c8508656040 Author: gil <puntogil(a)libero.it> Date: Mon Nov 18 06:24:42 2013 +0100 use objectweb-asm3 openjpa.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --- diff --git a/openjpa.spec b/openjpa.spec index 4a3d742..e0f85c2 100644 --- a/openjpa.spec +++ b/openjpa.spec @@ -213,7 +213,7 @@ done %pom_disable_module %{name}-examples %pom_disable_module %{name}-integration %pom_disable_module %{name}-project -%pom_disable_module openbooks %{name}a-examples +%pom_disable_module openbooks %{name}-examples # break build in f19 %pom_remove_plugin :maven-invoker-plugin %{name}-tools/%{name}-maven-plugin

1 0

[openjpa] use objectweb-asm3
by gil 18 Nov '13

18 Nov '13

commit dad185e2908077ae29667df9c292611bc4e3f329 Author: gil <puntogil(a)libero.it> Date: Mon Nov 18 06:16:42 2013 +0100 use objectweb-asm3 openjpa.spec | 61 +++++++++++++++++++++++++++++++-------------------------- 1 files changed, 33 insertions(+), 28 deletions(-) --- diff --git a/openjpa.spec b/openjpa.spec index 093b6ff..4a3d742 100644 --- a/openjpa.spec +++ b/openjpa.spec @@ -3,7 +3,7 @@ Name: openjpa Version: 2.2.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Java Persistence 2.0 API Group: Development/Libraries # For a breakdown of the licensing, see NOTICE file @@ -51,7 +51,7 @@ BuildRequires: log4j BuildRequires: mvn(org.apache.maven:maven-plugin-api) BuildRequires: mvn(org.apache.maven:maven-project) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) -BuildRequires: objectweb-asm +BuildRequires: objectweb-asm3 BuildRequires: plexus-utils BuildRequires: postgresql-jdbc BuildRequires: serp @@ -94,7 +94,7 @@ Summary: Javadoc for %{name} This package contains javadoc for %{name}. %prep -%setup -q -n apache-openjpa-%{version}-source +%setup -q -n apache-%{name}-%{version}-source find . -name "*.class" -delete find . -name "*.jar" -delete # openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/0.0.1/websphere_uow_api-0.0.1.jar @@ -130,29 +130,29 @@ find . -name "*.jar" -delete <version>0.5</version> </dependency>" -%pom_remove_dep com.ibm.websphere:websphere_uow_api openjpa-kernel +%pom_remove_dep com.ibm.websphere:websphere_uow_api %{name}-kernel # require non free com.ibm.websphere websphere_uow_api 0.0.1 -rm openjpa-kernel/src/main/java/org/apache/openjpa/ee/WASRegistryManagedRuntime.java -rm openjpa-kernel/src/main/java/org/apache/openjpa/ee/AutomaticManagedRuntime.java +rm %{name}-kernel/src/main/java/org/apache/openjpa/ee/WASRegistryManagedRuntime.java +rm %{name}-kernel/src/main/java/org/apache/openjpa/ee/AutomaticManagedRuntime.java for p in kernel persistence; do -%pom_remove_dep org.osgi:org.osgi.core openjpa-${p} +%pom_remove_dep org.osgi:org.osgi.core %{name}-${p} %pom_xpath_inject "pom:project/pom:dependencies" " <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.osgi.core</artifactId> <version>1.4.0</version> <scope>provided</scope> - </dependency>" openjpa-${p} + </dependency>" %{name}-${p} done -for p in openjpa-jest \ - openjpa-persistence \ - openjpa-tools/openjpa-maven-plugin \ - openjpa-tools/openjpa-maven-plugin/src/it/default_settings \ - openjpa-tools/openjpa-maven-plugin/src/it/dependingArtifact \ - openjpa-tools/openjpa-maven-plugin/src/it/nonDefaultPersistenceXml \ - openjpa-tools/openjpa-maven-plugin/src/it/testDependencies \ +for p in %{name}-jest \ + %{name}-persistence \ + %{name}-tools/%{name}-maven-plugin \ + %{name}-tools/%{name}-maven-plugin/src/it/default_settings \ + %{name}-tools/%{name}-maven-plugin/src/it/dependingArtifact \ + %{name}-tools/%{name}-maven-plugin/src/it/nonDefaultPersistenceXml \ + %{name}-tools/%{name}-maven-plugin/src/it/testDependencies \ ; do %pom_remove_dep org.apache.geronimo.specs:geronimo-jpa_2.0_spec ${p} %pom_xpath_inject "pom:project/pom:dependencies" " @@ -163,16 +163,16 @@ for p in openjpa-jest \ </dependency>" ${p} done -%pom_remove_dep org.apache.geronimo.specs:geronimo-jpa_2.0_spec openjpa-slice +%pom_remove_dep org.apache.geronimo.specs:geronimo-jpa_2.0_spec %{name}-slice %pom_xpath_inject "pom:project/pom:dependencies" " <dependency> <groupId>org.hibernate.javax.persistence</groupId> <artifactId>hibernate-jpa-2.0-api</artifactId> <version>1.0.1.Final</version> <scope>test</scope> - </dependency>" openjpa-slice + </dependency>" %{name}-slice -%pom_remove_dep org.apache.bval:org.apache.bval.bundle openjpa-tools/openjpa-maven-plugin +%pom_remove_dep org.apache.bval:org.apache.bval.bundle %{name}-tools/%{name}-maven-plugin %pom_xpath_inject "pom:project/pom:dependencies" " <dependency> <groupId>org.apache.bval</groupId> @@ -183,14 +183,14 @@ done <groupId>org.apache.bval</groupId> <artifactId>bval-jsr303</artifactId> <version>0.5</version> - </dependency>" openjpa-tools/openjpa-maven-plugin + </dependency>" %{name}-tools/%{name}-maven-plugin # remove testing profiles for unavailable drivers: # db2jcc informix-driver jcc-driver jdbc-driver jdbc-oracle jtds sqljdbc #%%pom_xpath_remove "pom:profiles/pom:profile[pom:id='test-mysql']" openjpa-persistence-jdbc %pom_xpath_remove "pom:project/pom:profiles/pom:profile[pom:id='test-sybase-jconnect']" openjpa-persistence-jdbc %pom_xpath_remove "pom:project/pom:profiles/pom:profile[pom:id='test-soliddb']" openjpa-persistence-jdbc -for p in openjpa-persistence-jdbc openjpa-persistence-locking; do +for p in %{name}-persistence-jdbc %{name}-persistence-locking; do %pom_xpath_remove "pom:project/pom:profiles/pom:profile[pom:id='test-custom']" ${p} %pom_xpath_remove "pom:project/pom:profiles/pom:profile[pom:id='test-custom2']" ${p} %pom_xpath_remove "pom:project/pom:profiles/pom:profile[pom:id='test-db2-jcc']" ${p} @@ -208,24 +208,26 @@ done #%%pom_remove_plugin org.codehaus.mojo:buildnumber-maven-plugin -%pom_disable_module openjpa -%pom_disable_module openjpa-all -%pom_disable_module openjpa-examples -%pom_disable_module openjpa-integration -%pom_disable_module openjpa-project -%pom_disable_module openbooks openjpa-examples +%pom_disable_module %{name} +%pom_disable_module %{name}-all +%pom_disable_module %{name}-examples +%pom_disable_module %{name}-integration +%pom_disable_module %{name}-project +%pom_disable_module openbooks %{name}a-examples # break build in f19 -%pom_remove_plugin :maven-invoker-plugin openjpa-tools/openjpa-maven-plugin +%pom_remove_plugin :maven-invoker-plugin %{name}-tools/%{name}-maven-plugin %pom_xpath_inject "pom:project/pom:dependencies/pom:dependency[pom:artifactId='hsqldb']" " -<version>1</version>" openjpa-jdbc +<version>1</version>" %{name}-jdbc sed -i 's|<hsqldb.version>1.8.0.10</hsqldb.version>|<hsqldb.version>1</hsqldb.version>|' pom.xml #%%pom_remove_dep org.apache.maven:maven-project openjpa-tools/openjpa-maven-plugin #%%pom_add_dep org.apache.maven:maven-core openjpa-tools/openjpa-maven-plugin +%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:groupId='asm']/pom:version" 3 %{name}-kernel + %build %mvn_package ":%{name}-tools" tools %mvn_package ":%{name}-maven-plugin" tools @@ -261,6 +263,9 @@ install -p -m 644 %{name}-ant %{buildroot}%{_sysconfdir}/ant.d/%{name} %doc LICENSE NOTICE %changelog +* Mon Nov 18 2013 gil cattaneo <puntogil(a)libero.it> 2.2.2-6 +- use objectweb-asm3 + * Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.2.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild

1 0

[jersey] use objectweb-asm3
by gil 18 Nov '13

18 Nov '13

commit 0b74e51ecf0f1fd0b2ca9ccc43d05c061008a94d Author: gil <puntogil(a)libero.it> Date: Mon Nov 18 05:39:02 2013 +0100 use objectweb-asm3 jersey.spec | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) --- diff --git a/jersey.spec b/jersey.spec index be740e3..d0bba7f 100644 --- a/jersey.spec +++ b/jersey.spec @@ -1,7 +1,7 @@ %global with_grizzly 1 Name: jersey Version: 1.17.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: JAX-RS (JSR 311) production quality Reference Implementation # One file in jersey-core/ is under ASL 2.0 license License: (CDDL or GPLv2 with exceptions) and ASL 2.0 @@ -53,7 +53,7 @@ BuildRequires: jboss-servlet-3.0-api BuildRequires: jdom BuildRequires: jettison BuildRequires: jsr-311 -BuildRequires: objectweb-asm +BuildRequires: objectweb-asm3 BuildRequires: rome >= 0.9-11 BuildRequires: tomcat-lib BuildRequires: weld-core @@ -242,6 +242,8 @@ sed -i "s|<artifactId>maven-istack-commons-plugin|<artifactId>istack-commons-mav sed -i "s|<finalName>jersey-test-framework</finalName>||" \ jersey-test-framework/jersey-test-framework-core/pom.xml +%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:groupId='asm']/pom:version" 3 %{name}-server + %build # Do not install source jars @@ -301,6 +303,9 @@ install -p -m 644 ant-wadl-task %{buildroot}%{_sysconfdir}/ant.d/ant-wadl-task %doc license.html legal/LICENSE.txt legal/maintenance/copyright.txt LICENSE-2.0.txt %changelog +* Mon Nov 18 2013 gil cattaneo <puntogil(a)libero.it> 1.17.1-8 +- use objectweb-asm3 + * Tue Oct 15 2013 gil cattaneo <puntogil(a)libero.it> 1.17.1-7 - Do not install source jars

1 0

[Bug 652183] Java SIG tracker bug
by Red Hat Bugzilla 17 Nov '13

17 Nov '13

https://bugzilla.redhat.com/show_bug.cgi?id=652183 Gerard Ryan <gerard(a)ryan.lt> changed: What |Removed |Added ---------------------------------------------------------------------------- Depends On| |1031437 Referenced Bugs: https://bugzilla.redhat.com/show_bug.cgi?id=1031437 [Bug 1031437] Review Request: truecommons - Common components for open source projects -- You are receiving this mail because: You are the QA Contact for the bug. You are the assignee for the bug.

1 0

Broken dependencies: maven-doxia
by Fedora Koji Build System 17 Nov '13

17 Nov '13

1 0

Broken dependencies: maven-doxia
by Fedora Koji Build System 16 Nov '13

16 Nov '13

1 0

[Bug 652183] Java SIG tracker bug
by Red Hat Bugzilla 15 Nov '13

15 Nov '13

https://bugzilla.redhat.com/show_bug.cgi?id=652183 Timothy St. Clair <tstclair(a)redhat.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Depends On| |1029142 Referenced Bugs: https://bugzilla.redhat.com/show_bug.cgi?id=1029142 [Bug 1029142] Review Request: amplab-tachyon - Reliable File Sharing at Memory Speed Across Cluster Frameworks -- You are receiving this mail because: You are the QA Contact for the bug. You are the assignee for the bug.

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

java-sig-commits November 2013