You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2018/07/04 16:50:09 UTC
servicemix-bundles git commit: [SM-3743] Fix Bundle-NativeCode used
bundles for Equinox
Repository: servicemix-bundles
Updated Branches:
refs/heads/master a9f23d617 -> c34a4154b
[SM-3743] Fix Bundle-NativeCode used bundles for Equinox
Project: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/commit/c34a4154
Tree: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/tree/c34a4154
Diff: http://git-wip-us.apache.org/repos/asf/servicemix-bundles/diff/c34a4154
Branch: refs/heads/master
Commit: c34a4154b60cf9ede3374e7ca1278bae901e4260
Parents: a9f23d6
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Wed Jul 4 18:48:52 2018 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Wed Jul 4 18:48:52 2018 +0200
----------------------------------------------------------------------
fastjson-1.2.47/pom.xml | 17 ++---------------
jsendnsca-2.1.1/pom.xml | 16 +---------------
mustache-compiler-0.9.5/pom.xml | 14 --------------
pom.xml | 5 +++++
solr-solrj-7.2.1/pom.xml | 16 ++--------------
sparkjava-core-2.7.2/pom.xml | 1 -
6 files changed, 10 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/c34a4154/fastjson-1.2.47/pom.xml
----------------------------------------------------------------------
diff --git a/fastjson-1.2.47/pom.xml b/fastjson-1.2.47/pom.xml
index 13969ca..d9f5b14 100644
--- a/fastjson-1.2.47/pom.xml
+++ b/fastjson-1.2.47/pom.xml
@@ -47,7 +47,7 @@
<pkgArtifactId>fastjson</pkgArtifactId>
<pkgVersion>1.2.47</pkgVersion>
<servicemix.osgi.export>
- com.alibaba.fastjson*;version=1.2.47;-split-package:=merge-first
+ com.alibaba.fastjson*;version=1.2.47;-split-package:=merge-first
</servicemix.osgi.export>
<servicemix.osgi.import.pkg>
</servicemix.osgi.import.pkg>
@@ -84,6 +84,7 @@
<artifactSet>
<includes>
<include>${pkgGroupId}:${pkgArtifactId}</include>
+ <include>META-INF/services/**</include>
</includes>
</artifactSet>
<filters>
@@ -100,20 +101,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.5.3</version>
- <extensions>true</extensions>
- <inherited>false</inherited>
- <configuration>
- <instructions>
- <Export-Package>${servicemix.osgi.export}</Export-Package>
- <Import-Package>${servicemix.osgi.import.pkg}</Import-Package>
- <Bundle-NativeCode>*</Bundle-NativeCode>
- </instructions>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/c34a4154/jsendnsca-2.1.1/pom.xml
----------------------------------------------------------------------
diff --git a/jsendnsca-2.1.1/pom.xml b/jsendnsca-2.1.1/pom.xml
index f4caa66..f087b57 100644
--- a/jsendnsca-2.1.1/pom.xml
+++ b/jsendnsca-2.1.1/pom.xml
@@ -47,7 +47,7 @@
<pkgArtifactId>jsendnsca</pkgArtifactId>
<pkgVersion>2.1.1</pkgVersion>
<servicemix.osgi.export>
- com.googlecode.jsendnsca*;version=2.1.1;-split-package:=merge-first
+ com.googlecode.jsendnsca*;version=2.1.1;-split-package:=merge-first
</servicemix.osgi.export>
<servicemix.osgi.import.pkg>
</servicemix.osgi.import.pkg>
@@ -100,20 +100,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.5.3</version>
- <extensions>true</extensions>
- <inherited>false</inherited>
- <configuration>
- <instructions>
- <Export-Package>${servicemix.osgi.export}</Export-Package>
- <Import-Package>${servicemix.osgi.import.pkg}</Import-Package>
- <Bundle-NativeCode>*</Bundle-NativeCode>
- </instructions>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/c34a4154/mustache-compiler-0.9.5/pom.xml
----------------------------------------------------------------------
diff --git a/mustache-compiler-0.9.5/pom.xml b/mustache-compiler-0.9.5/pom.xml
index fb649a4..453480e 100644
--- a/mustache-compiler-0.9.5/pom.xml
+++ b/mustache-compiler-0.9.5/pom.xml
@@ -100,20 +100,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.5.3</version>
- <extensions>true</extensions>
- <inherited>false</inherited>
- <configuration>
- <instructions>
- <Export-Package>${servicemix.osgi.export}</Export-Package>
- <Import-Package>${servicemix.osgi.import.pkg}</Import-Package>
- <Bundle-NativeCode>*</Bundle-NativeCode>
- </instructions>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/c34a4154/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index feb646d..fc0207a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,6 +111,11 @@
<module>spring-data-keyvalue-2.0.8.RELEASE</module>
<module>spring-data-redis-2.0.8.RELEASE</module>
<module>azure-storage-8.0.0</module>
+ <module>fastjson-1.2.47</module>
+ <module>mustache-compiler-0.9.5</module>
+ <module>jsendnsca-2.1.1</module>
+ <module>solr-solrj-7.2.1</module>
+ <module>sparkjava-core-2.7.2</module>
</modules>
</project>
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/c34a4154/solr-solrj-7.2.1/pom.xml
----------------------------------------------------------------------
diff --git a/solr-solrj-7.2.1/pom.xml b/solr-solrj-7.2.1/pom.xml
index e3bb85e..2f7df10 100644
--- a/solr-solrj-7.2.1/pom.xml
+++ b/solr-solrj-7.2.1/pom.xml
@@ -148,6 +148,8 @@
<artifactSet>
<includes>
<include>${pkgGroupId}:${pkgArtifactId}</include>
+ <include>META-INF/services/**/*</include>
+ <include>apispec/**/*</include>
</includes>
</artifactSet>
<filters>
@@ -164,20 +166,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.5.3</version>
- <extensions>true</extensions>
- <inherited>false</inherited>
- <configuration>
- <instructions>
- <Export-Package>${servicemix.osgi.export}</Export-Package>
- <Import-Package>${servicemix.osgi.import.pkg}</Import-Package>
- <Bundle-NativeCode>*</Bundle-NativeCode>
- </instructions>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/servicemix-bundles/blob/c34a4154/sparkjava-core-2.7.2/pom.xml
----------------------------------------------------------------------
diff --git a/sparkjava-core-2.7.2/pom.xml b/sparkjava-core-2.7.2/pom.xml
index b799c2f..95928ed 100644
--- a/sparkjava-core-2.7.2/pom.xml
+++ b/sparkjava-core-2.7.2/pom.xml
@@ -112,7 +112,6 @@
org.eclipse.jetty*;version="[8,10)",
*
</Import-Package>
- <Bundle-NativeCode>*</Bundle-NativeCode>
</instructions>
</configuration>
</plugin>