You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by cs...@apache.org on 2017/03/31 13:00:04 UTC
maven-indexer git commit: MINDEXER-102: indexer-reader OSGI changes
forward ported
Repository: maven-indexer
Updated Branches:
refs/heads/master ceb8388e9 -> 0ee337936
MINDEXER-102: indexer-reader OSGI changes forward ported
Squashed from
https://github.com/apache/maven-indexer/pull/16
Project: http://git-wip-us.apache.org/repos/asf/maven-indexer/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-indexer/commit/0ee33793
Tree: http://git-wip-us.apache.org/repos/asf/maven-indexer/tree/0ee33793
Diff: http://git-wip-us.apache.org/repos/asf/maven-indexer/diff/0ee33793
Branch: refs/heads/master
Commit: 0ee33793657d37b5475e8b57c97af9ce1358f553
Parents: ceb8388
Author: Tamas Cservenak <ta...@cservenak.net>
Authored: Fri Mar 31 14:58:57 2017 +0200
Committer: Tamas Cservenak <ta...@cservenak.net>
Committed: Fri Mar 31 14:58:57 2017 +0200
----------------------------------------------------------------------
.../org/apache/maven/index/reader/Record.java | 28 ++++++++++++++++++++
.../maven/index/reader/RecordCompactor.java | 5 ++++
.../maven/index/reader/RecordExpander.java | 5 ++++
.../org/apache/maven/index/reader/packageinfo | 2 +-
4 files changed, 39 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/0ee33793/indexer-reader/src/main/java/org/apache/maven/index/reader/Record.java
----------------------------------------------------------------------
diff --git a/indexer-reader/src/main/java/org/apache/maven/index/reader/Record.java b/indexer-reader/src/main/java/org/apache/maven/index/reader/Record.java
index 1746845..fce1a19 100644
--- a/indexer-reader/src/main/java/org/apache/maven/index/reader/Record.java
+++ b/indexer-reader/src/main/java/org/apache/maven/index/reader/Record.java
@@ -247,6 +247,34 @@ public final class Record
public static final EntryKey<String> OSGI_REQUIRE_BUNDLE = new EntryKey<String>("Require-Bundle", String.class);
/**
+ * Key of OSGi "Provide-Capability" manifest entry, that contains {@link String}. Extracted by {@code
+ * OsgiArtifactIndexCreator}.
+ */
+ public static final EntryKey<String> OSGI_PROVIDE_CAPABILITY = new EntryKey<String>("Provide-Capability", String.class);
+ /**
+ * Key of OSGi "Require-Capability" manifest entry, that contains {@link String}. Extracted by {@code
+ * OsgiArtifactIndexCreator}.
+ */
+ public static final EntryKey<String> OSGI_REQUIRE_CAPABILITY = new EntryKey<String>("Require-Capability", String.class);
+ /**
+ * Key of OSGi "Fragment-Host" manifest entry, that contains {@link String}. Extracted by {@code
+ * OsgiArtifactIndexCreator}.
+ */
+ public static final EntryKey<String> OSGI_FRAGMENT_HOST = new EntryKey<String>("Fragment-Host", String.class);
+ /**
+ * Key of deprecated OSGi "Bundle-RequiredExecutionEnvironment" manifest entry, that contains {@link String}. Extracted by {@code
+ * OsgiArtifactIndexCreator}.
+ */
+ public static final EntryKey<String> OSGI_BREE = new EntryKey<String>("Bundle-RequiredExecutionEnvironment", String.class);
+
+ /**
+ * Key for SHA-256 checksum needed for OSGI content capability that contains {@link String}. Extracted by {@code
+ * OsgiArtifactIndexCreator}.
+ */
+ public static final EntryKey<String> SHA_256 = new EntryKey<String>("sha256", String.class);
+
+
+ /**
* Types of returned records returned from index.
*/
public enum Type
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/0ee33793/indexer-reader/src/main/java/org/apache/maven/index/reader/RecordCompactor.java
----------------------------------------------------------------------
diff --git a/indexer-reader/src/main/java/org/apache/maven/index/reader/RecordCompactor.java b/indexer-reader/src/main/java/org/apache/maven/index/reader/RecordCompactor.java
index 76fc1e5..b005400 100644
--- a/indexer-reader/src/main/java/org/apache/maven/index/reader/RecordCompactor.java
+++ b/indexer-reader/src/main/java/org/apache/maven/index/reader/RecordCompactor.java
@@ -137,6 +137,11 @@ public class RecordCompactor
putIfNotNull(record.get(Record.OSGI_EXPORT_DOCURL), result, "Bundle-DocURL");
putIfNotNull(record.get(Record.OSGI_IMPORT_PACKAGE), result, "Import-Package");
putIfNotNull(record.get(Record.OSGI_REQUIRE_BUNDLE), result, "Require-Bundle");
+ putIfNotNull(record.get(Record.OSGI_PROVIDE_CAPABILITY), result, "Provide-Capability");
+ putIfNotNull(record.get(Record.OSGI_REQUIRE_CAPABILITY), result, "Require-Capability");
+ putIfNotNull(record.get(Record.OSGI_FRAGMENT_HOST), result, "Fragment-Host");
+ putIfNotNull(record.get(Record.OSGI_BREE), result, "Bundle-RequiredExecutionEnvironment");
+ putIfNotNull(record.get(Record.SHA_256), result, "sha256");
return result;
}
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/0ee33793/indexer-reader/src/main/java/org/apache/maven/index/reader/RecordExpander.java
----------------------------------------------------------------------
diff --git a/indexer-reader/src/main/java/org/apache/maven/index/reader/RecordExpander.java b/indexer-reader/src/main/java/org/apache/maven/index/reader/RecordExpander.java
index 6d7f4be..5d97f2a 100644
--- a/indexer-reader/src/main/java/org/apache/maven/index/reader/RecordExpander.java
+++ b/indexer-reader/src/main/java/org/apache/maven/index/reader/RecordExpander.java
@@ -156,6 +156,11 @@ public class RecordExpander
putIfNotNull(raw, "Bundle-DocURL", result, Record.OSGI_EXPORT_DOCURL);
putIfNotNull(raw, "Import-Package", result, Record.OSGI_IMPORT_PACKAGE);
putIfNotNull(raw, "Require-Bundle", result, Record.OSGI_REQUIRE_BUNDLE);
+ putIfNotNull(raw, "Provide-Capability", result, Record.OSGI_PROVIDE_CAPABILITY);
+ putIfNotNull(raw, "Require-Capability", result, Record.OSGI_REQUIRE_CAPABILITY);
+ putIfNotNull(raw, "Fragment-Host", result, Record.OSGI_FRAGMENT_HOST);
+ putIfNotNull(raw, "Bundle-RequiredExecutionEnvironment", result, Record.OSGI_BREE);
+ putIfNotNull(raw, "sha256", result, Record.SHA_256);
return result;
}
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/0ee33793/indexer-reader/src/main/java/org/apache/maven/index/reader/packageinfo
----------------------------------------------------------------------
diff --git a/indexer-reader/src/main/java/org/apache/maven/index/reader/packageinfo b/indexer-reader/src/main/java/org/apache/maven/index/reader/packageinfo
index 9ad81f6..f1c19e5 100644
--- a/indexer-reader/src/main/java/org/apache/maven/index/reader/packageinfo
+++ b/indexer-reader/src/main/java/org/apache/maven/index/reader/packageinfo
@@ -1 +1 @@
-version 1.0.0
+version 6.0