Latest bnd code
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1350613 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundleplugin/src/main/java/aQute/bnd/maven/PomFromManifest.java b/bundleplugin/src/main/java/aQute/bnd/maven/PomFromManifest.java
index 5b8c149..782c282 100644
--- a/bundleplugin/src/main/java/aQute/bnd/maven/PomFromManifest.java
+++ b/bundleplugin/src/main/java/aQute/bnd/maven/PomFromManifest.java
@@ -70,11 +70,13 @@
this.manifest = manifest;
}
- @Override public long lastModified() {
+ @Override
+ public long lastModified() {
return 0;
}
- @Override public void write(OutputStream out) throws IOException {
+ @Override
+ public void write(OutputStream out) throws IOException {
PrintWriter ps = IO.writer(out);
String name = manifest.getMainAttributes().getValue(Analyzer.BUNDLE_NAME);
@@ -148,8 +150,7 @@
String xname = email;
String organization = null;
- Matcher m = Pattern.compile("([^@]+)@([\\d\\w\\-_\\.]+)\\.([\\d\\w\\-_\\.]+)")
- .matcher(email);
+ Matcher m = Pattern.compile("([^@]+)@([\\d\\w\\-_\\.]+)\\.([\\d\\w\\-_\\.]+)").matcher(email);
if (m.matches()) {
xname = m.group(1);
organization = m.group(2);
@@ -167,8 +168,7 @@
Tag ls = new Tag(project, "licenses");
Parameters map = Processor.parseHeader(licenses, null);
- for (Iterator<Entry<String, Attrs>> e = map.entrySet().iterator(); e
- .hasNext();) {
+ for (Iterator<Entry<String,Attrs>> e = map.entrySet().iterator(); e.hasNext();) {
// Bundle-License:
// http://www.opensource.org/licenses/apache2.0.php; \
@@ -182,9 +182,9 @@
// <distribution>repo</distribution>
// </license>
- Entry<String, Attrs> entry = e.next();
+ Entry<String,Attrs> entry = e.next();
Tag l = new Tag(ls, "license");
- Map<String, String> values = entry.getValue();
+ Map<String,String> values = entry.getValue();
String url = entry.getKey();
if (values.containsKey("description"))
@@ -209,8 +209,7 @@
* @param tag
* @param object
*/
- private Tag tagFromMap(Tag parent, Map<String, String> values, String string, String tag,
- String object) {
+ private Tag tagFromMap(Tag parent, Map<String,String> values, String string, String tag, String object) {
String value = values.get(string);
if (value == null)
value = object;