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

Java21 #15

Merged
merged 3 commits into from
Sep 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .travis.settings.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
~ Copyright (c) 2017 OBiBa. All rights reserved.
~ Copyright (c) 2024 OBiBa. All rights reserved.
~
~ This program and the accompanying materials
~ are made available under the terms of the GNU Public License v3.0.
Expand Down
16 changes: 9 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
language: java
jdk:
- openjdk21
addons:
apt:
packages:
- rpm
- devscripts
- fakeroot
- debhelper
- rpm
- devscripts
- fakeroot
- debhelper
deploy:
- provider: script
script: cp .travis.settings.xml $HOME/.m2/settings.xml && mvn -Prelease deploy
Expand All @@ -15,11 +17,11 @@ deploy:
tags: true
cache:
directories:
- $HOME/.cache
- $HOME/.m2
- $HOME/.cache
- $HOME/.m2
notifications:
email:
recipients:
- dev@obiba.org
- dev@obiba.org
on_success: change
on_failure: always
53 changes: 16 additions & 37 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,20 @@
</modules>

<properties>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.release>21</maven.compiler.release>
<maven.compiler.target>21</maven.compiler.target>
<maven.compiler.source>21</maven.compiler.source>

<assertj-core.version>1.7.1</assertj-core.version>
<junit.version>4.12</junit.version>
<logback.version>1.1.3</logback.version>
<obiba-commons.version>1.12-SNAPSHOT</obiba-commons.version>
<opal.version>2.13-SNAPSHOT</opal.version>
<slf4j.version>1.5.6</slf4j.version>
<junit.version>4.13.1</junit.version>
<logback.version>1.5.6</logback.version>
<obiba-commons.version>4.2.0</obiba-commons.version>
<opal.version>5.0-SNAPSHOT</opal.version>
<slf4j.version>2.0.12</slf4j.version>

<!-- maven plugins -->
<github-release-plugin.version>1.2.0</github-release-plugin.version>
<maven-antrun-plugin.version>1.7</maven-antrun-plugin.version>
<maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
<maven-assembly-plugin.version>3.0.0</maven-assembly-plugin.version>
<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
<maven-dependency-plugin.version>3.1.0</maven-dependency-plugin.version>
Expand Down Expand Up @@ -83,7 +84,7 @@

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl104-over-slf4j</artifactId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
<type>jar</type>
</dependency>
Expand Down Expand Up @@ -144,7 +145,7 @@

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl104-over-slf4j</artifactId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>

<dependency>
Expand Down Expand Up @@ -261,24 +262,6 @@
</configuration>
</plugin>

<!-- JAVA 8 is not supported yet by PMD -->
<!--<plugin>-->
<!--<artifactId>maven-pmd-plugin</artifactId>-->
<!--<version>${maven-pmd-plugin.version}</version>-->
<!--<configuration>-->
<!--<linkXref>false</linkXref>-->
<!--<sourceEncoding>${project.build.sourceEncoding}</sourceEncoding>-->
<!--<minimumTokens>30</minimumTokens>-->
<!--<targetJdk>${java.version}</targetJdk>-->
<!--<excludeRoots>-->
<!--<excludeRoot>target/generated-sources</excludeRoot>-->
<!--</excludeRoots>-->
<!--<rulesets>-->
<!--<ruleset>http://github.com/obiba/conventions/raw/master/obiba-pmd-ruleset.xml</ruleset>-->
<!--</rulesets>-->
<!--</configuration>-->
<!--</plugin>-->

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
Expand Down Expand Up @@ -329,7 +312,7 @@
<repository>
<id>obiba-releases</id>
<name>Obiba Maven Releases Repository</name>
<url>https://dl.bintray.com/obiba/maven</url>
<url>https://obiba.jfrog.io/obiba/libs-release</url>
<releases>
<enabled>true</enabled>
</releases>
Expand All @@ -350,18 +333,14 @@
</repository>
</repositories>

<prerequisites>
<maven>3.0.0</maven>
</prerequisites>

<distributionManagement>
<repository>
<id>obiba-bintray</id>
<url>https://api.bintray.com/obiba/maven/</url>
<id>obiba-release-local</id>
<url>https://obiba.jfrog.io/obiba/libs-release-local</url>
</repository>
<snapshotRepository>
<id>obiba-artifactory</id>
<url>https://obiba.jfrog.io/obiba/libs-snapshot</url>
<id>obiba-snapshot-local</id>
<url>https://obiba.jfrog.io/obiba/libs-snapshot-local</url>
</snapshotRepository>
</distributionManagement>

Expand Down