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.

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

1.2.0 #29

Merged
merged 38 commits into from
Apr 11, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
43094e2
adjust start
lakhoune Dec 5, 2020
1e3f924
adjust start_network
lakhoune Dec 6, 2020
33c131e
gitignore
lakhoune Dec 9, 2020
1bcbd2d
send xAPI statements to bots
Leogomat Dec 10, 2020
9a22889
dos2unix
lakhoune Jan 11, 2021
4938cf4
Merge pull request #23 from rwth-acis/chatbotCCA
AlexanderNeumann May 6, 2021
dd53569
Merge branch 'develop' into ba-matta
AlexanderNeumann May 6, 2021
3b9bc59
Merge pull request #24 from rwth-acis/ba-matta
AlexanderNeumann May 6, 2021
05eb21e
Send to Learning Locker Service
AlexanderNeumann May 7, 2021
2eee5b8
remove password from properties
Navidda May 25, 2021
de0b862
Merge pull request #25 from rwth-acis/Navidda-patch-1
AlexanderNeumann May 25, 2021
1f50275
bundle las2peer 1.1.2
Aran30 Jun 30, 2021
4f1b0ee
added forwarding of forum messages to bots
Leogomat Sep 17, 2021
cbcec0f
added bot manager invocation
Aran30 Oct 15, 2021
4ecbb73
added forwarding of forum messages to bots
Oct 15, 2021
d35c77d
Merge branch 'bot-statements' into develop
Oct 15, 2021
eb420ac
changed check of xAPI forwarding to bots
Oct 26, 2021
4c04768
Replaced ant with gradle & using l2p v1.2-SNAPSHOT with Java 17
pdolif Oct 31, 2021
2e1b819
Add bin directory
pdolif Oct 31, 2021
fba8255
Workflow: setup db
pdolif Oct 31, 2021
705bfba
Remove travis
pdolif Oct 31, 2021
fd3dc2f
Update Dockerfile (Java 17 & gradle)
pdolif Oct 31, 2021
e620913
Updated README (build status badge & build command)
pdolif Oct 31, 2021
810055b
update to use correct java version
Aran30 Jan 11, 2022
ee7c39d
Merge pull request #27 from rwth-acis/java17
Aran30 Jan 11, 2022
ff9d28d
use las2peer 1.2.2
AlexanderNeumann Mar 14, 2022
cf705ba
adjust project path
lakhoune Mar 20, 2022
291c317
gitignore
lakhoune Mar 20, 2022
c60c52a
Merge branch 'develop' into 1.2.0
lakhoune Apr 9, 2022
1f43fc7
bump version
lakhoune Apr 9, 2022
1b72d6f
add test to build pipeline
lakhoune Apr 9, 2022
9a07450
full build
lakhoune Apr 9, 2022
54b3872
Revert "full build"
lakhoune Apr 9, 2022
ab9cec6
remove gradle ci since it is contained in docker-ci
lakhoune Apr 9, 2022
d2cfc8c
update gradlew to 7.3 for official java17 support
lakhoune Apr 9, 2022
c31f7cb
remove branch from ci
lakhoune Apr 11, 2022
1523869
remove launcher.ini
lakhoune Apr 11, 2022
ed1d7d1
rename folder
lakhoune Apr 11, 2022
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
6 changes: 6 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#
# https://help.github.com/articles/dealing-with-line-endings/
#
# These are explicitly windows files and should use crlf
*.bat text eol=crlf

19 changes: 19 additions & 0 deletions .github/workflows/docker-CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,26 @@ on:
branches: [ master, develop ]

jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 17
- name: Set up MySQL
run: |
sudo /etc/init.d/mysql start
mysql -e 'CREATE DATABASE LAS2PEERMON;' -uroot -proot
- name: Create db tables
run: mysql -u root -proot LAS2PEERMON < etc/create_database.sql
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Run tests with Gradle
run: ./gradlew test
build:
needs: test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
Expand Down
19 changes: 15 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,23 @@
/tmp
/node-storage
/log
/export
/mobsos-data-processing/export
/output
/lib
/etc/ivy/ivy.jar
/service
/bin
/bin/*
.DS_Store
.DS_Store*
.DS_Store*
etc/launcher-configuration.ini
/.idea/
*.iml
# Ignore Gradle project-specific cache directory
.gradle

# Ignore Gradle build output directory
build

export
mobsos-data-processing/output
etc/launcher-configuration.ini
app/output/*
4 changes: 2 additions & 2 deletions .project
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
<arguments>
</arguments>
</buildCommand>
Expand All @@ -18,7 +18,7 @@
</buildSpec>
<natures>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
</natures>
<filteredResources>
<filter>
Expand Down
8 changes: 0 additions & 8 deletions .travis.install-mysql-5.7.sh

This file was deleted.

18 changes: 0 additions & 18 deletions .travis.yml

This file was deleted.

8 changes: 5 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
FROM openjdk:14-jdk-alpine
FROM openjdk:17-jdk-alpine

ENV LAS2PEER_PORT=9011

RUN apk add --update bash mysql-client apache-ant curl && rm -f /var/cache/apk/*
RUN apk add --update bash mysql-client curl && rm -f /var/cache/apk/*
RUN addgroup -g 1000 -S las2peer && \
adduser -u 1000 -S las2peer -G las2peer

COPY --chown=las2peer:las2peer . /src
WORKDIR /src

RUN dos2unix docker-entrypoint.sh

# run the rest as unprivileged user
USER las2peer
RUN ant jar
RUN chmod +x gradlew && ./gradlew build --exclude-task test

EXPOSE $LAS2PEER_PORT
ENTRYPOINT ["/src/docker-entrypoint.sh"]
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MobSOS Data Processing

[![Build Status](https://travis-ci.org/rwth-acis/mobsos-data-processing.svg?branch=master)](https://travis-ci.org/rwth-acis/mobsos-data-processing) [![codecov](https://codecov.io/gh/rwth-acis/mobsos-data-processing/branch/master/graph/badge.svg)](https://codecov.io/gh/rwth-acis/mobsos-data-processing) [![Join the chat at https://gitter.im/rwth-acis/mobsos](https://badges.gitter.im/rwth-acis/mobsos.svg)](https://gitter.im/rwth-acis/mobsos?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![Build Status](https://github.com/rwth-acis/mobsos-data-processing/workflows/Java%20CI%20with%20Gradle/badge.svg?branch=master)](https://github.com/rwth-acis/mobsos-data-processing/actions?query=workflow%3A%22Java+CI+with+Gradle%22+branch%3Amaster) [![codecov](https://codecov.io/gh/rwth-acis/mobsos-data-processing/branch/master/graph/badge.svg)](https://codecov.io/gh/rwth-acis/mobsos-data-processing) [![Join the chat at https://gitter.im/rwth-acis/mobsos](https://badges.gitter.im/rwth-acis/mobsos.svg)](https://gitter.im/rwth-acis/mobsos?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

This service is part of the MobSOS monitoring concept and processes incoming monitoring data.

Expand All @@ -17,7 +17,7 @@ After that, configure the [property](etc/i5.las2peer.services.mobsos.dataProcess
Execute the following command on your shell:

```shell
ant all
./gradlew build
```

### Start
Expand Down
Loading