Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dependencies updates #69

Merged
merged 4 commits into from
Sep 3, 2020
Merged

Dependencies updates #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d09de23
pom.xml: update to killbill-oss-parent 0.144.24-SNAPSHOT
pierre Aug 25, 2020
7af416e
osgi: add missing slf4j exports
pierre Aug 26, 2020
eacf16c
platform-test: remove unnedded version
pierre Aug 26, 2020
17cf6f8
pom.xml: update to killbill-oss-parent 0.144.26
pierre Sep 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
name: Setup dependencies
command: |
if [ "${CIRCLE_BRANCH}" != "master" ]; then
for i in killbill-oss-parent killbill-api killbill-plugin-api killbill-commons; do
for i in killbill-oss-parent killbill-api killbill-plugin-api killbill-commons killbill-plugin-framework-java; do
if [ -n "$(git ls-remote --heads https://github.com/killbill/$i.git ${CIRCLE_BRANCH})" ]; then
echo "*** Setting up $i"
mkdir -p /home/killbill/$i
Expand Down
3 changes: 3 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
0.40.2
Update to killbill-oss-parent 0.144.26

0.40.1
Update to killbill-oss-parent 0.144.21

Expand Down
1 change: 0 additions & 1 deletion lifecycle/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.5</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
3 changes: 3 additions & 0 deletions osgi/src/main/java/org/killbill/billing/osgi/config/OSGIConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,9 @@ public interface OSGIConfig extends KillbillPlatformConfig {
"org.apache.shiro;org.apache.shiro.subject;org.apache.shiro.util;version=1.3," +
// Let the world know the System bundle exposes the requirement (&(osgi.wiring.package=org.slf4j)(version>=1.7.0)(!(version>=2.0.0)))
"org.slf4j;version=1.7.2," +
"org.slf4j.event;version=1.7.2," +
"org.slf4j.helpers;version=1.7.2," +
"org.slf4j.spi;version=1.7.2," +
"org.osgi.service.log;version=1.3," +
// Let the world know the System bundle exposes (via org.osgi.compendium) the requirement (osgi.wiring.package=org.osgi.service.http)
"org.osgi.service.http;version=1.2.0," +
Expand Down
3 changes: 1 addition & 2 deletions platform-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
</dependency>
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP-java6</artifactId>
<artifactId>HikariCP</artifactId>
</dependency>
<dependency>
<groupId>io.airlift</groupId>
Expand Down Expand Up @@ -102,7 +102,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.5</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions platform-test/src/test/java/org/killbill/billing/beatrix/integration/osgi/TestOSGIBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,10 @@ public void afterMethod() throws Exception {
@AfterClass(groups = "slow")
public void afterClass() throws Exception {
if (dataSource instanceof ReferenceableDataSourceSpy && ((ReferenceableDataSourceSpy) dataSource).getDataSource() instanceof HikariDataSource) {
((HikariDataSource) ((ReferenceableDataSourceSpy) dataSource).getDataSource()).shutdown();
((HikariDataSource) ((ReferenceableDataSourceSpy) dataSource).getDataSource()).close();
}
if (osgiDataSource instanceof ReferenceableDataSourceSpy && ((ReferenceableDataSourceSpy) osgiDataSource).getDataSource() instanceof HikariDataSource) {
((HikariDataSource) ((ReferenceableDataSourceSpy) osgiDataSource).getDataSource()).shutdown();
((HikariDataSource) ((ReferenceableDataSourceSpy) osgiDataSource).getDataSource()).close();
}
}

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.kill-bill.billing</groupId>
<artifactId>killbill-oss-parent</artifactId>
<version>0.144.21</version>
<version>0.144.26</version>
</parent>
<artifactId>killbill-platform</artifactId>
<version>0.40.2-SNAPSHOT</version>
Expand Down
4 changes: 2 additions & 2 deletions server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
</dependency>
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP-java6</artifactId>
<artifactId>HikariCP</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -410,7 +410,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>1.1.7</version>
<version>${logback.version}</version>
</dependency>
</dependencies>
<configuration>
Expand Down