ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dpav...@apache.org
Subject ignite git commit: IGNITE-7814 wrap on h2database for overwrite Export-Package - Fixes #3572.
Date Fri, 23 Mar 2018 10:58:20 GMT
Repository: ignite
Updated Branches:
  refs/heads/master ee0f4c068 -> 19c2df967


IGNITE-7814 wrap on h2database for overwrite Export-Package - Fixes #3572.

Signed-off-by: dpavlov <dpavlov@gridgain.com>


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/19c2df96
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/19c2df96
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/19c2df96

Branch: refs/heads/master
Commit: 19c2df9672269a64883cc406d7d77c382bc0d568
Parents: ee0f4c0
Author: Anton Kalashnikov <kaa.dev@yandex.ru>
Authored: Fri Mar 23 13:57:40 2018 +0300
Committer: dpavlov <dpavlov@gridgain.com>
Committed: Fri Mar 23 13:57:40 2018 +0300

----------------------------------------------------------------------
 modules/osgi-karaf/src/main/resources/features.xml | 11 +++++++++--
 parent/pom.xml                                     |  1 +
 2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/19c2df96/modules/osgi-karaf/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/modules/osgi-karaf/src/main/resources/features.xml b/modules/osgi-karaf/src/main/resources/features.xml
index 9846d97..b4c5299 100644
--- a/modules/osgi-karaf/src/main/resources/features.xml
+++ b/modules/osgi-karaf/src/main/resources/features.xml
@@ -71,10 +71,14 @@
 
     <feature name="ignite-aws" version="${project.version}" description="Apache Ignite
:: AWS">
         <details><![CDATA[The Apache Ignite AWS module + dependencies.]]></details>
+        <feature prerequisite="true">wrap</feature>
         <bundle start="true" dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore.version}</bundle>
         <bundle start="true" dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient.version}</bundle>
         <bundle start="true" dependency="true">mvn:commons-codec/commons-codec/${commons.codec.version}</bundle>
-        <bundle start="true" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aws-java-sdk/${aws.sdk.bundle.version}</bundle>
+        <bundle start="true" dependency="true">wrap:mvn:com.amazonaws/aws-java-sdk-s3/${aws.sdk.version}$Bundle-SymbolicName=aws-java-sdk-s3&amp;Bundle-Version=${aws.sdk.version}&amp;Export-Package=!com.amazonaws.auth,*</bundle>
+        <bundle start="true" dependency="true">wrap:mvn:com.amazonaws/aws-java-sdk-elasticloadbalancing/${aws.sdk.version}$Bundle-SymbolicName=aws-java-sdk-elasticloadbalancing&amp;Bundle-Version=${aws.sdk.version}</bundle>
+        <bundle start="true" dependency="true">wrap:mvn:com.amazonaws/aws-java-sdk-ec2/${aws.sdk.version}$Bundle-SymbolicName=aws-java-sdk-ec2&amp;Bundle-Version=${aws.sdk.version}</bundle>
+        <bundle start="true" dependency="true">wrap:mvn:com.amazonaws/aws-java-sdk-core/${aws.sdk.version}$Bundle-SymbolicName=aws-java-sdk-core&amp;Bundle-Version=${aws.sdk.version}</bundle>
         <bundle start="true">mvn:org.apache.ignite/ignite-aws/${project.version}</bundle>
     </feature>
 
@@ -119,9 +123,12 @@
             
             Be sure to refresh ignite-core manually in case it is not refreshed automatically.]]>
         </details>
+        <feature prerequisite="true">wrap</feature>
         <bundle start="true" dependency="true">mvn:org.osgi/org.osgi.enterprise/${osgi.enterprise.version}</bundle>
         <bundle start="true" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.lucene/${lucene.bundle.version}</bundle>
-        <bundle start="true" dependency="true">mvn:com.h2database/h2/${h2.version}</bundle>
+        <bundle start="true" dependency="true">wrap:mvn:com.h2database/h2/${h2.version}$overwrite=merge&amp;Export-Package=*;version=&quot;${h2.version}&quot;</bundle>
+        <bundle start="true" dependency="true">wrap:mvn:org.apache.lucene/lucene-analyzers-common/${lucene.version}$Bundle-SymbolicName=lucene-analyzers-common&amp;Bundle-Version=${lucene.version}</bundle>
+        <bundle start="true" dependency="true">wrap:mvn:org.apache.lucene/lucene-queryparser/${lucene.version}$Bundle-SymbolicName=lucene-queryparser&amp;Bundle-Version=${lucene.version}</bundle>
         <bundle start="false">mvn:org.apache.ignite/ignite-indexing/${project.version}</bundle>
     </feature>
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/19c2df96/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 0e591f8..17e45f0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -106,6 +106,7 @@
         <rocketmq.version>4.2.0</rocketmq.version>
         <scala210.jline.version>2.10.4</scala210.jline.version>
         <scala210.library.version>2.10.6</scala210.library.version>
+        <scala211.library.version>2.11.8</scala211.library.version>
         <scala.library.version>2.11.8</scala.library.version>
         <slf4j.version>1.7.7</slf4j.version>
         <slf4j16.version>1.6.4</slf4j16.version>


Mime
View raw message