Author: cschneider
Date: Fri Jun 2 06:54:02 2017
New Revision: 1797322
URL: http://svn.apache.org/viewvc?rev=1797322&view=rev
Log:
Fix errors reported by Dominik
Modified:
aries/trunk/util/pom.xml
aries/trunk/util/src/main/java/org/apache/aries/util/manifest/ManifestHeaderProcessor.java
Modified: aries/trunk/util/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/util/pom.xml?rev=1797322&r1=1797321&r2=1797322&view=diff
==============================================================================
--- aries/trunk/util/pom.xml (original)
+++ aries/trunk/util/pom.xml Fri Jun 2 06:54:02 2017
@@ -25,7 +25,7 @@
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
<version>2.0.1</version>
- <relativePath>../../parent/pom.xml</relativePath>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<artifactId>org.apache.aries.util</artifactId>
@@ -36,7 +36,11 @@
This bundle contains the OSGi common util for Apache Aries
</description>
- <!-- no scm info since this and the util-r42 project must be built
together to produce the util bundle -->
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/util</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/util</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/util</url>
+ </scm>
<properties>
<!-- Export package versions are maintained in packageinfo files -->
Modified:
aries/trunk/util/src/main/java/org/apache/aries/util/manifest/ManifestHeaderProcessor.java
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/manifest/ManifestHeaderProcessor.java?rev=1797322&r1=1797321&r2=1797322&view=diff
==============================================================================
---
aries/trunk/util/src/main/java/org/apache/aries/util/manifest/ManifestHeaderProcessor.java
(original)
+++
aries/trunk/util/src/main/java/org/apache/aries/util/manifest/ManifestHeaderProcessor.java
Fri Jun 2 06:54:02 2017
@@ -385,7 +385,7 @@ public class ManifestHeaderProcessor
/**
* Parse a generic capability header. For example<br>
- * com.acme.myns;mylist:List String
="nl,be,fr,uk";myver:Version=1.3;long:Long="1234";d:Double="3.14";myattr=xyz,
+ *
com.acme.myns;mylist:List<String>="nl,be,fr,uk";myver:Version=1.3;long:Long="1234";d:Double="3.14";myattr=xyz,
* com.acme.myns;myattr=abc
* @param s The header to be parsed
* @return A list of GenericMetadata objects each representing an individual
capability. The values in the attribute map
@@ -397,7 +397,7 @@ public class ManifestHeaderProcessor
/**
* Parse a generic capability header. For example<br>
- * com.acme.myns;mylist:List String
="nl,be,fr,uk";myver:Version=1.3;long:Long="1234";d:Double="3.14";myattr=xyz,
+ *
com.acme.myns;mylist:List<String>="nl,be,fr,uk";myver:Version=1.3;long:Long="1234";d:Double="3.14";myattr=xyz,
* com.acme.myns;myattr=abc
* @param s The header to be parsed
* @return A list of GenericMetadata objects each representing an individual
capability. The values in the attribute map
