Skip to content

Commit 8e0abee

Browse files
committed
Merged changes from remote branch. Increased version to 1.0.23-SNAPSHOT.
2 parents 63f79ea + fb765d1 commit 8e0abee

File tree

7 files changed

+276
-206
lines changed

7 files changed

+276
-206
lines changed

.github/workflows/build.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: build
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
build:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: actions/checkout@v2
10+
- name: Start Rabbit
11+
run: make start-rabbit
12+
- name: Build project
13+
run: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
14+
- name: Run tests
15+
run: mvn jacoco:prepare-agent test -B jacoco:report
16+
- name: Upload tests
17+
env:
18+
CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}
19+
run: |
20+
LATEST_VERSION="$(curl -Ls https://api.bintray.com/packages/codacy/Binaries/codacy-coverage-reporter/versions/_latest | jq -r .name)"
21+
curl -Ls -o codacy-coverage-reporter "https://dl.bintray.com/codacy/Binaries/${LATEST_VERSION}/codacy-coverage-reporter-linux"
22+
chmod +x codacy-coverage-reporter
23+
./codacy-coverage-reporter report -l Java -r target/site/jacoco/jacoco.xml
24+

.travis.yml

Lines changed: 0 additions & 20 deletions
This file was deleted.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[![Build Status](https://travis-ci.org/hobbit-project/core.svg?branch=master)](https://travis-ci.org/hobbit-project/core)
1+
![Build Status](https://github.com/hobbit-project/core/workflows/build/badge.svg) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/cab3efc1ece64aa4ba189e3e3d465ede)](https://www.codacy.com/manual/MichaelRoeder/core/dashboard?utm_source=github.com&utm_medium=referral&utm_content=hobbit-project/core&utm_campaign=Badge_Grade) [![Codacy Badge](https://app.codacy.com/project/badge/Coverage/cab3efc1ece64aa4ba189e3e3d465ede)](https://www.codacy.com/manual/MichaelRoeder/core/dashboard?utm_source=github.com&utm_medium=referral&utm_content=hobbit-project/core&utm_campaign=Badge_Coverage)
22

33
# core
44
This library offers some main functionalities and utilities for the Hobbit platform project. For more information take a look at the project web page (<http://www.project-hobbit.eu>) or at the Hobbit platform project on github (<https://github.com/hobbit-project/platform>).

pom.xml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<modelVersion>4.0.0</modelVersion>
1313
<groupId>org.hobbit</groupId>
1414
<artifactId>core</artifactId>
15-
<version>1.0.21-SNAPSHOT</version>
15+
<version>1.0.23-SNAPSHOT</version>
1616

1717
<!-- LICENSE -->
1818
<licenses>
@@ -175,7 +175,7 @@
175175
<plugin>
176176
<groupId>org.jacoco</groupId>
177177
<artifactId>jacoco-maven-plugin</artifactId>
178-
<version>0.8.5</version>
178+
<version>0.8.7</version>
179179
<executions>
180180
<execution>
181181
<id>default-prepare-agent</id>
@@ -193,4 +193,16 @@
193193
</plugin>
194194
</plugins>
195195
</build>
196+
<distributionManagement>
197+
<repository>
198+
<id>org.aksw.maven.internal</id>
199+
<name>University Leipzig, AKSW Maven2 Repository</name>
200+
<url>https://maven.aksw.org/repository/internal</url>
201+
</repository>
202+
<snapshotRepository>
203+
<id>org.aksw.maven.snapshots</id>
204+
<name>University Leipzig, AKSW Maven2 Repository</name>
205+
<url>https://maven.aksw.org/repository/snapshots</url>
206+
</snapshotRepository>
207+
</distributionManagement>
196208
</project>

src/main/java/org/hobbit/core/components/AbstractComponent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public abstract class AbstractComponent implements Component {
8888
* </pre>
8989
*/
9090
public AbstractComponent() {
91-
HobbitConfiguration configuration = new HobbitConfiguration();
91+
configuration = new HobbitConfiguration();
9292
configuration.addConfiguration(new EnvironmentConfiguration());
9393
}
9494

src/main/java/org/hobbit/utils/rdf/RdfHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ protected static <T> List<T> getObjectNodes(Model model, Resource subject, Prope
329329
}
330330
}
331331
}
332-
return null;
332+
return result;
333333
}
334334

335335
/**

0 commit comments

Comments
 (0)