| commit | 266b398b3511f96c27995cab8fd6dd3028699140 | [log] [tgz] |
|---|---|---|
| author | Stuart McCulloch <mcculls@gmail.com> | Tue Oct 07 01:31:30 2014 +0100 |
| committer | Stuart McCulloch <mcculls@gmail.com> | Tue Oct 07 01:31:30 2014 +0100 |
| tree | 624889232af1c04959c365eca9230dffba8f6099 | |
| parent | c350843e65c47d3e923d167439cd89dd91485199 [diff] |
Support compilation against latest plexus-utils
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusAnnotatedMetadata.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusAnnotatedMetadata.java index f59b4d8..b8ca075 100644 --- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusAnnotatedMetadata.java +++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusAnnotatedMetadata.java
@@ -31,7 +31,8 @@ // Implementation fields // ---------------------------------------------------------------------- - private final Map<?, ?> variables; + @SuppressWarnings( "rawtypes" ) + private final Map variables; // ---------------------------------------------------------------------- // Constructors
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusXmlScanner.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusXmlScanner.java index e04fb07..eee1361 100644 --- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusXmlScanner.java +++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusXmlScanner.java
@@ -107,7 +107,7 @@ * @param variables The filter variables * @return Reader that can automatically detect XML encodings and optionally interpolate variables */ - private static Reader filteredXmlReader( final InputStream in, final Map<?, ?> variables ) + private static Reader filteredXmlReader( final InputStream in, @SuppressWarnings( "rawtypes" ) final Map variables ) throws IOException { final Reader reader = ReaderFactory.newXmlReader( in );