Skip to content

Commit 15c7b4a

Browse files
larsbengellarsbengel
committed
Merge remote-tracking branch 'origin/main'
2 parents 0a82f6c + 314a039 commit 15c7b4a

113 files changed

Lines changed: 4352 additions & 573 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/package.yml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Package
2+
3+
on:
4+
push:
5+
branches: [ "main" ]
6+
pull_request:
7+
branches: [ "main" ]
8+
9+
jobs:
10+
build:
11+
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- uses: actions/checkout@v4
16+
- name: Set up JDK 21
17+
uses: actions/setup-java@v4
18+
with:
19+
# Compile source and target are still specified in pom.xml
20+
java-version: '21'
21+
distribution: 'temurin'
22+
cache: maven
23+
- name: Build with Maven
24+
run: mvn --batch-mode package
25+
26+
# Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
27+
- name: Update dependency graph
28+
uses: advanced-security/maven-dependency-submission-action@v4

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,4 @@ testBuild
3636

3737
gurobi-9.1.0.jar
3838
isula-1.1.1.jar
39+
logs/server.log.lck

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ If you want to make your own contributions to the code, follow the usual steps:
2727
* Create a pull request`
2828

2929
## Documentation
30-
* **API:** The most recent version of the technical documentation for all TweetyProject libraries in form of the JavaDoc API can be found here: [TweetyProject API 1.28](http://tweetyproject.org/api/1.28/index.html)
30+
* **API:** The most recent version of the technical documentation for all TweetyProject libraries in form of the JavaDoc API can be found here: [TweetyProject API 1.29](http://tweetyproject.org/api/1.29/index.html)
3131
* **Integration of third-party solvers:** The following pages give some more detailed information on how third-party products such as SAT solvers and optimization solvers can be integrated in TweetyProject:
3232
* [Integration of SAT Solvers](http://tweetyproject.org/doc/sat-solvers.html)
3333
* [Integration of first-order logic theorem provers](http://tweetyproject.org/doc/fol-provers.html)

‎org-tweetyproject-action/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,29 @@
99
<parent>
1010
<groupId>org.tweetyproject</groupId>
1111
<artifactId>parent-pom</artifactId>
12-
<version>1.28-SNAPSHOT</version>
12+
<version>1.29-SNAPSHOT</version>
1313
<relativePath>..</relativePath>
1414
</parent>
1515
<dependencies>
1616
<dependency>
1717
<groupId>org.tweetyproject</groupId>
1818
<artifactId>commons</artifactId>
19-
<version>1.28-SNAPSHOT</version>
19+
<version>1.29-SNAPSHOT</version>
2020
</dependency>
2121
<dependency>
2222
<groupId>org.tweetyproject.logics</groupId>
2323
<artifactId>fol</artifactId>
24-
<version>1.28-SNAPSHOT</version>
24+
<version>1.29-SNAPSHOT</version>
2525
</dependency>
2626
<dependency>
2727
<groupId>org.tweetyproject.lp</groupId>
2828
<artifactId>asp</artifactId>
29-
<version>1.28-SNAPSHOT</version>
29+
<version>1.29-SNAPSHOT</version>
3030
</dependency>
3131
<dependency>
3232
<groupId>org.tweetyproject.logics</groupId>
3333
<artifactId>commons</artifactId>
34-
<version>1.28-SNAPSHOT</version>
34+
<version>1.29-SNAPSHOT</version>
3535
</dependency>
3636
</dependencies>
3737
</project>

‎org-tweetyproject-agents-dialogues/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>org.tweetyproject</groupId>
1515
<artifactId>parent-pom</artifactId>
16-
<version>1.28-SNAPSHOT</version>
16+
<version>1.29-SNAPSHOT</version>
1717
<relativePath>..</relativePath>
1818
</parent>
1919

@@ -26,17 +26,17 @@
2626
<dependency>
2727
<groupId>org.tweetyproject</groupId>
2828
<artifactId>agents</artifactId>
29-
<version>1.28-SNAPSHOT</version>
29+
<version>1.29-SNAPSHOT</version>
3030
</dependency>
3131
<dependency>
3232
<groupId>org.tweetyproject.arg</groupId>
3333
<artifactId>saf</artifactId>
34-
<version>1.28-SNAPSHOT</version>
34+
<version>1.29-SNAPSHOT</version>
3535
</dependency>
3636
<dependency>
3737
<groupId>org.tweetyproject.arg</groupId>
3838
<artifactId>prob</artifactId>
39-
<version>1.28-SNAPSHOT</version>
39+
<version>1.29-SNAPSHOT</version>
4040
</dependency>
4141

4242
</dependencies>

‎org-tweetyproject-agents/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
<dependency>
1313
<groupId>org.tweetyproject</groupId>
1414
<artifactId>commons</artifactId>
15-
<version>1.28-SNAPSHOT</version>
15+
<version>1.29-SNAPSHOT</version>
1616
</dependency>
1717
</dependencies>
1818
<parent>
1919
<groupId>org.tweetyproject</groupId>
2020
<artifactId>parent-pom</artifactId>
21-
<version>1.28-SNAPSHOT</version>
21+
<version>1.29-SNAPSHOT</version>
2222
<relativePath>..</relativePath>
2323
</parent>
2424
</project>

‎org-tweetyproject-arg-aba/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>org.tweetyproject</groupId>
1515
<artifactId>parent-pom</artifactId>
16-
<version>1.28-SNAPSHOT</version>
16+
<version>1.29-SNAPSHOT</version>
1717
<relativePath>..</relativePath>
1818
</parent>
1919
<dependencies>
@@ -26,22 +26,22 @@
2626
<dependency>
2727
<groupId>org.tweetyproject</groupId>
2828
<artifactId>commons</artifactId>
29-
<version>1.28-SNAPSHOT</version>
29+
<version>1.29-SNAPSHOT</version>
3030
</dependency>
3131
<dependency>
3232
<groupId>org.tweetyproject</groupId>
3333
<artifactId>graphs</artifactId>
34-
<version>1.28-SNAPSHOT</version>
34+
<version>1.29-SNAPSHOT</version>
3535
</dependency>
3636
<dependency>
3737
<groupId>org.tweetyproject.arg</groupId>
3838
<artifactId>dung</artifactId>
39-
<version>1.28-SNAPSHOT</version>
39+
<version>1.29-SNAPSHOT</version>
4040
</dependency>
4141
<dependency>
4242
<groupId>org.tweetyproject.arg</groupId>
4343
<artifactId>aspic</artifactId>
44-
<version>1.28-SNAPSHOT</version>
44+
<version>1.29-SNAPSHOT</version>
4545
</dependency>
4646
</dependencies>
4747
</project>

‎org-tweetyproject-arg-adf/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>org.tweetyproject</groupId>
1515
<artifactId>parent-pom</artifactId>
16-
<version>1.28-SNAPSHOT</version>
16+
<version>1.29-SNAPSHOT</version>
1717
<relativePath>..</relativePath>
1818
</parent>
1919
<dependencies>
@@ -26,7 +26,7 @@
2626
<dependency>
2727
<groupId>org.tweetyproject.arg</groupId>
2828
<artifactId>dung</artifactId>
29-
<version>1.28-SNAPSHOT</version>
29+
<version>1.29-SNAPSHOT</version>
3030
</dependency>
3131
</dependencies>
3232
</project>

‎org-tweetyproject-arg-aspic/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>org.tweetyproject</groupId>
1515
<artifactId>parent-pom</artifactId>
16-
<version>1.28-SNAPSHOT</version>
16+
<version>1.29-SNAPSHOT</version>
1717
<relativePath>..</relativePath>
1818
</parent>
1919
<dependencies>
@@ -26,22 +26,22 @@
2626
<dependency>
2727
<groupId>org.tweetyproject</groupId>
2828
<artifactId>commons</artifactId>
29-
<version>1.28-SNAPSHOT</version>
29+
<version>1.29-SNAPSHOT</version>
3030
</dependency>
3131
<dependency>
3232
<groupId>org.tweetyproject</groupId>
3333
<artifactId>graphs</artifactId>
34-
<version>1.28-SNAPSHOT</version>
34+
<version>1.29-SNAPSHOT</version>
3535
</dependency>
3636
<dependency>
3737
<groupId>org.tweetyproject.arg</groupId>
3838
<artifactId>dung</artifactId>
39-
<version>1.28-SNAPSHOT</version>
39+
<version>1.29-SNAPSHOT</version>
4040
</dependency>
4141
<dependency>
4242
<groupId>org.tweetyproject</groupId>
4343
<artifactId>comparator</artifactId>
44-
<version>1.28-SNAPSHOT</version>
44+
<version>1.29-SNAPSHOT</version>
4545
</dependency>
4646
</dependencies>
4747
</project>

‎org-tweetyproject-arg-bipolar/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>org.tweetyproject</groupId>
1515
<artifactId>parent-pom</artifactId>
16-
<version>1.28-SNAPSHOT</version>
16+
<version>1.29-SNAPSHOT</version>
1717
<relativePath>..</relativePath>
1818
</parent>
1919

@@ -27,17 +27,17 @@
2727
<dependency>
2828
<groupId>org.tweetyproject.arg</groupId>
2929
<artifactId>dung</artifactId>
30-
<version>1.28-SNAPSHOT</version>
30+
<version>1.29-SNAPSHOT</version>
3131
</dependency>
3232
<dependency>
3333
<groupId>org.tweetyproject</groupId>
3434
<artifactId>commons</artifactId>
35-
<version>1.28-SNAPSHOT</version>
35+
<version>1.29-SNAPSHOT</version>
3636
</dependency>
3737
<dependency>
3838
<groupId>org.tweetyproject</groupId>
3939
<artifactId>graphs</artifactId>
40-
<version>1.28-SNAPSHOT</version>
40+
<version>1.29-SNAPSHOT</version>
4141
</dependency>
4242
</dependencies>
4343
</project>

0 commit comments

Comments
 (0)