Repository: incubator-unomi Updated Branches: refs/heads/master a7963e16f -> 14001a7d0
UNOMI-13 Remove binaries from source code - Remove binaries from Sigar - Replace with dynamic extraction using Maven dependencies goal and antrun plugin. Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/14001a7d Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/14001a7d Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/14001a7d Branch: refs/heads/master Commit: 14001a7d056399cbffdef679f0cabfaf7e37234a Parents: a7963e1 Author: Serge Huber <[email protected]> Authored: Wed Jan 27 22:57:54 2016 +0100 Committer: Serge Huber <[email protected]> Committed: Wed Jan 27 22:57:54 2016 +0100 ---------------------------------------------------------------------- package/pom.xml | 42 ++++++++++++++++++- .../lib/sigar/libsigar-amd64-freebsd-6.so | Bin 210641 -> 0 bytes .../resources/lib/sigar/libsigar-amd64-linux.so | Bin 246605 -> 0 bytes .../lib/sigar/libsigar-amd64-solaris.so | Bin 251360 -> 0 bytes .../resources/lib/sigar/libsigar-ia64-linux.so | Bin 494929 -> 0 bytes .../lib/sigar/libsigar-sparc-solaris.so | Bin 285004 -> 0 bytes .../lib/sigar/libsigar-sparc64-solaris.so | Bin 261896 -> 0 bytes .../lib/sigar/libsigar-universal-macosx.dylib | Bin 377668 -> 0 bytes .../lib/sigar/libsigar-universal64-macosx.dylib | Bin 397440 -> 0 bytes .../lib/sigar/libsigar-x86-freebsd-5.so | Bin 179751 -> 0 bytes .../lib/sigar/libsigar-x86-freebsd-6.so | Bin 179379 -> 0 bytes .../resources/lib/sigar/libsigar-x86-linux.so | Bin 233385 -> 0 bytes .../resources/lib/sigar/libsigar-x86-solaris.so | Bin 242880 -> 0 bytes .../resources/lib/sigar/sigar-amd64-winnt.dll | Bin 402432 -> 0 bytes .../resources/lib/sigar/sigar-x86-winnt.dll | Bin 266240 -> 0 bytes .../resources/lib/sigar/sigar-x86-winnt.lib | Bin 99584 -> 0 bytes persistence-elasticsearch/pom.xml | 1 - pom.xml | 1 + 18 files changed, 42 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/14001a7d/package/pom.xml ---------------------------------------------------------------------- diff --git a/package/pom.xml b/package/pom.xml index 4cf10a0..38c17d2 100644 --- a/package/pom.xml +++ b/package/pom.xml @@ -125,9 +125,28 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>2.9</version> + <version>2.10</version> <executions> <execution> + <id>unpack-sigar</id> + <phase>generate-resources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.elasticsearch</groupId> + <artifactId>elasticsearch</artifactId> + <version>${elasticsearch.version}</version> + <type>tar.gz</type> + <includes>**/lib/sigar/**</includes> + <outputDirectory>${project.build.directory}/assembly</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + <execution> <id>copy</id> <phase>package</phase> <goals> @@ -186,6 +205,27 @@ </executions> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>copy-karaf</id> + <phase>generate-resources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target> + <move todir="${project.build.directory}/assembly/lib/sigar"> + <fileset dir="${project.build.directory}/assembly/elasticsearch-${elasticsearch.version}/lib/sigar" /> + </move> + </target> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> <groupId>org.apache.karaf.tooling</groupId> <artifactId>karaf-maven-plugin</artifactId> <version>3.0.2</version> http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/14001a7d/package/src/main/resources/lib/sigar/libsigar-amd64-freebsd-6.so ---------------------------------------------------------------------- diff --git a/package/src/main/resources/lib/sigar/libsigar-amd64-freebsd-6.so b/package/src/main/resources/lib/sigar/libsigar-amd64-freebsd-6.so deleted file mode 100644 index 3e94f0d..0000000 Binary files a/package/src/main/resources/lib/sigar/libsigar-amd64-freebsd-6.so and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/14001a7d/package/src/main/resources/lib/sigar/libsigar-amd64-linux.so ---------------------------------------------------------------------- diff --git a/package/src/main/resources/lib/sigar/libsigar-amd64-linux.so b/package/src/main/resources/lib/sigar/libsigar-amd64-linux.so deleted file mode 100644 index 5a2e4c2..0000000 Binary files a/package/src/main/resources/lib/sigar/libsigar-amd64-linux.so and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/14001a7d/package/src/main/resources/lib/sigar/libsigar-amd64-solaris.so ---------------------------------------------------------------------- diff --git a/package/src/main/resources/lib/sigar/libsigar-amd64-solaris.so b/package/src/main/resources/lib/sigar/libsigar-amd64-solaris.so deleted file mode 100644 index 6396482..0000000 Binary files a/package/src/main/resources/lib/sigar/libsigar-amd64-solaris.so and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/14001a7d/package/src/main/resources/lib/sigar/libsigar-ia64-linux.so ---------------------------------------------------------------------- diff --git a/package/src/main/resources/lib/sigar/libsigar-ia64-linux.so b/package/src/main/resources/lib/sigar/libsigar-ia64-linux.so deleted file mode 100644 index 2bd2fc8..0000000 Binary files a/package/src/main/resources/lib/sigar/libsigar-ia64-linux.so and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/14001a7d/package/src/main/resources/lib/sigar/libsigar-sparc-solaris.so ---------------------------------------------------------------------- diff --git a/package/src/main/resources/lib/sigar/libsigar-sparc-solaris.so b/package/src/main/resources/lib/sigar/libsigar-sparc-solaris.so deleted file mode 100644 index aa847d2..0000000 Binary files a/package/src/main/resources/lib/sigar/libsigar-sparc-solaris.so and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/14001a7d/package/src/main/resources/lib/sigar/libsigar-sparc64-solaris.so ---------------------------------------------------------------------- diff --git a/package/src/main/resources/lib/sigar/libsigar-sparc64-solaris.so b/package/src/main/resources/lib/sigar/libsigar-sparc64-solaris.so deleted file mode 100644 index 6c4fe80..0000000 Binary files a/package/src/main/resources/lib/sigar/libsigar-sparc64-solaris.so and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/14001a7d/package/src/main/resources/lib/sigar/libsigar-universal-macosx.dylib ---------------------------------------------------------------------- diff --git a/package/src/main/resources/lib/sigar/libsigar-universal-macosx.dylib b/package/src/main/resources/lib/sigar/libsigar-universal-macosx.dylib deleted file mode 100644 index 27ab107..0000000 Binary files a/package/src/main/resources/lib/sigar/libsigar-universal-macosx.dylib and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/14001a7d/package/src/main/resources/lib/sigar/libsigar-universal64-macosx.dylib ---------------------------------------------------------------------- diff --git a/package/src/main/resources/lib/sigar/libsigar-universal64-macosx.dylib b/package/src/main/resources/lib/sigar/libsigar-universal64-macosx.dylib deleted file mode 100644 index 0c721fe..0000000 Binary files a/package/src/main/resources/lib/sigar/libsigar-universal64-macosx.dylib and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/14001a7d/package/src/main/resources/lib/sigar/libsigar-x86-freebsd-5.so ---------------------------------------------------------------------- diff --git a/package/src/main/resources/lib/sigar/libsigar-x86-freebsd-5.so b/package/src/main/resources/lib/sigar/libsigar-x86-freebsd-5.so deleted file mode 100644 index 8c50c61..0000000 Binary files a/package/src/main/resources/lib/sigar/libsigar-x86-freebsd-5.so and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/14001a7d/package/src/main/resources/lib/sigar/libsigar-x86-freebsd-6.so ---------------------------------------------------------------------- diff --git a/package/src/main/resources/lib/sigar/libsigar-x86-freebsd-6.so b/package/src/main/resources/lib/sigar/libsigar-x86-freebsd-6.so deleted file mode 100644 index f080027..0000000 Binary files a/package/src/main/resources/lib/sigar/libsigar-x86-freebsd-6.so and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/14001a7d/package/src/main/resources/lib/sigar/libsigar-x86-linux.so ---------------------------------------------------------------------- diff --git a/package/src/main/resources/lib/sigar/libsigar-x86-linux.so b/package/src/main/resources/lib/sigar/libsigar-x86-linux.so deleted file mode 100644 index a0b64ed..0000000 Binary files a/package/src/main/resources/lib/sigar/libsigar-x86-linux.so and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/14001a7d/package/src/main/resources/lib/sigar/libsigar-x86-solaris.so ---------------------------------------------------------------------- diff --git a/package/src/main/resources/lib/sigar/libsigar-x86-solaris.so b/package/src/main/resources/lib/sigar/libsigar-x86-solaris.so deleted file mode 100644 index c6452e5..0000000 Binary files a/package/src/main/resources/lib/sigar/libsigar-x86-solaris.so and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/14001a7d/package/src/main/resources/lib/sigar/sigar-amd64-winnt.dll ---------------------------------------------------------------------- diff --git a/package/src/main/resources/lib/sigar/sigar-amd64-winnt.dll b/package/src/main/resources/lib/sigar/sigar-amd64-winnt.dll deleted file mode 100644 index 1ec8a03..0000000 Binary files a/package/src/main/resources/lib/sigar/sigar-amd64-winnt.dll and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/14001a7d/package/src/main/resources/lib/sigar/sigar-x86-winnt.dll ---------------------------------------------------------------------- diff --git a/package/src/main/resources/lib/sigar/sigar-x86-winnt.dll b/package/src/main/resources/lib/sigar/sigar-x86-winnt.dll deleted file mode 100644 index 6afdc01..0000000 Binary files a/package/src/main/resources/lib/sigar/sigar-x86-winnt.dll and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/14001a7d/package/src/main/resources/lib/sigar/sigar-x86-winnt.lib ---------------------------------------------------------------------- diff --git a/package/src/main/resources/lib/sigar/sigar-x86-winnt.lib b/package/src/main/resources/lib/sigar/sigar-x86-winnt.lib deleted file mode 100644 index 04924a1..0000000 Binary files a/package/src/main/resources/lib/sigar/sigar-x86-winnt.lib and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/14001a7d/persistence-elasticsearch/pom.xml ---------------------------------------------------------------------- diff --git a/persistence-elasticsearch/pom.xml b/persistence-elasticsearch/pom.xml index 0b56cb1..2c699a1 100644 --- a/persistence-elasticsearch/pom.xml +++ b/persistence-elasticsearch/pom.xml @@ -30,7 +30,6 @@ <packaging>pom</packaging> <properties> - <elasticsearch.version>1.6.2</elasticsearch.version> </properties> <modules> http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/14001a7d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b58de59..4f3ff25 100644 --- a/pom.xml +++ b/pom.xml @@ -67,6 +67,7 @@ <version.jackson.jaxb>2.4.0</version.jackson.jaxb> <!-- version used by CXF --> <version.karaf>3.0.2</version.karaf> <version.pax.exam>4.4.0</version.pax.exam> + <elasticsearch.version>1.6.2</elasticsearch.version> </properties> <mailingLists>
