This is an automated email from the ASF dual-hosted git repository.
dzamo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/drill.git
The following commit(s) were added to refs/heads/master by this push:
new eec353e DRILL-8129: Storage-phoenix cannot resolve OSGi bundle
apache-ds.jdbm1 (#2457)
eec353e is described below
commit eec353eb675dda2ecba1ef0fe2b524d7e5468848
Author: James Turton <[email protected]>
AuthorDate: Thu Feb 10 06:21:13 2022 +0200
DRILL-8129: Storage-phoenix cannot resolve OSGi bundle apache-ds.jdbm1
(#2457)
* Add maven-bundle-plugin to storage-phoenix pom for -Phadoop-2.
Also correct the jdbc-all jar size limits, esp. hadoop-2 profile.
* Move storage-phoenix maven-bundle-plugin into hadoop-2 profile.
---
contrib/storage-phoenix/pom.xml | 19 +++++++++++++++++++
exec/jdbc-all/pom.xml | 4 ++--
2 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/contrib/storage-phoenix/pom.xml b/contrib/storage-phoenix/pom.xml
index 6e6e67f..b925f38 100644
--- a/contrib/storage-phoenix/pom.xml
+++ b/contrib/storage-phoenix/pom.xml
@@ -266,6 +266,10 @@
<groupId>org.slf4j</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -328,4 +332,19 @@
</plugin>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>hadoop-2</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>5.1.4</version>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/exec/jdbc-all/pom.xml b/exec/jdbc-all/pom.xml
index 3cc84a6..a439eca 100644
--- a/exec/jdbc-all/pom.xml
+++ b/exec/jdbc-all/pom.xml
@@ -33,7 +33,7 @@
"package.namespace.prefix" equals to "oadd.". It can be overridden if
necessary within any profile -->
<properties>
<package.namespace.prefix>oadd.</package.namespace.prefix>
- <jdbc-all-jar.maxsize>49300000</jdbc-all-jar.maxsize>
+ <jdbc-all-jar.maxsize>49400000</jdbc-all-jar.maxsize>
</properties>
<dependencies>
@@ -886,7 +886,7 @@
<profile>
<id>hadoop-2</id>
<properties>
- <jdbc-all-jar.maxsize>47700000</jdbc-all-jar.maxsize>
+ <jdbc-all-jar.maxsize>50300000</jdbc-all-jar.maxsize>
</properties>
</profile>
</profiles>
