rpms/sisu
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove patch for Eclipse bug 429369

Browse Source
This commit is contained in:
Mikolaj Izdebski 2014-04-22 12:59:18 +02:00
parent b566b6d319
commit 80782b7527
2 changed files with 1 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
0001-Bug-429369-fallback-to-relaxed-unchecked-values-Map-.patch
View File

@ -1,51 +0,0 @@
From 210d3f409d57f83a644b69000ae8399d5c0dc07b Mon Sep 17 00:00:00 2001
From: Stuart McCulloch <mcculls@gmail.com>
Date: Wed, 16 Apr 2014 02:18:15 +0100
Subject: [PATCH] Bug 429369: fallback to relaxed (unchecked values) Map
conversion with warning
---
.../converters/composite/MapConverter.java | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/composite/MapConverter.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/composite/MapConverter.java
index 277f267..c343004 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/composite/MapConverter.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/composite/MapConverter.java
@@ -26,6 +26,7 @@ import org.codehaus.plexus.component.configurator.converters.ParameterizedConfig
import org.codehaus.plexus.component.configurator.converters.lookup.ConverterLookup;
import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
import org.codehaus.plexus.configuration.PlexusConfiguration;
+import org.eclipse.sisu.inject.Logs;
public class MapConverter
extends AbstractConfigurationConverter
@@ -72,9 +73,23 @@ public class MapConverter
final ConfigurationConverter converter = lookup.lookupConverterForType( elementType );
for ( int i = 0, size = configuration.getChildCount(); i < size; i++ )
{
+ Object elementValue;
final PlexusConfiguration element = configuration.getChild( i );
- map.put( element.getName(), converter.fromConfiguration( lookup, element, elementType, enclosingType,
- loader, evaluator, listener ) );
+ try
+ {
+ elementValue = converter.fromConfiguration( lookup, element, elementType, enclosingType, //
+ loader, evaluator, listener );
+ }
+ // TEMP: remove when http://jira.codehaus.org/browse/MSHADE-168 is fixed
+ catch ( final ComponentConfigurationException e )
+ {
+ elementValue = fromExpression( element, evaluator );
+
+ Logs.warn( "Map in " + enclosingType + " declares value type as: {} but saw: {} at runtime",
+ elementType, null != elementValue ? elementValue.getClass() : null );
+ }
+ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ map.put( element.getName(), elementValue );
}
return map;
}
--
1.9.0

9
sisu.spec
View File

@ -13,10 +13,6 @@ URL: http://eclipse.org/sisu
Source0: http://git.eclipse.org/c/%{name}/org.eclipse.%{name}.inject.git/snapshot/releases/%{version}.tar.bz2#/org.eclipse.%{name}.inject-%{version}.tar.bz2
Source1: http://git.eclipse.org/c/%{name}/org.eclipse.%{name}.plexus.git/snapshot/releases/%{version}.tar.bz2#/org.eclipse.%{name}.plexus-%{version}.tar.bz2
# Upstream patch to fix a regression
# See: https://bugs.eclipse.org/bugs/show_bug.cgi?id=429369
Patch0: 0001-Bug-429369-fallback-to-relaxed-unchecked-values-Map-.patch
BuildArch: noarch
# FIXME: sisu fails to build under Java 8
@ -119,10 +115,6 @@ This package contains %{summary}.
tar xf %{SOURCE0} && mv releases/* sisu-inject && rmdir releases
tar xf %{SOURCE1} && mv releases/* sisu-plexus && rmdir releases
pushd sisu-plexus
%patch0 -p1
popd
%mvn_file ":{*}" @1
%mvn_package ":*{inject,plexus}" @1
%mvn_package : __noinstall
@ -207,6 +199,7 @@ done
%changelog
* Tue Apr 22 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.2.1-1
- Update to upstream version 0.2.1
- Remove patch for Eclipse bug 429369
* Wed Apr 16 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.2.0-5
- Update upstream patch for bug 429369