Skip to content
Open
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
Binary file removed .DS_Store
Binary file not shown.
31 changes: 31 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: build

on:
push:
branches:
- main
pull_request:
branches:
- main

jobs:
java:
strategy:
matrix:
java: [25]
os: ['ubuntu-latest']
runs-on: ${{ matrix.os }}
name: Build on ${{ matrix.os }} on Java ${{ matrix.java }}
steps:
- uses: actions/checkout@v6
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v5
with:
distribution: corretto
java-version: ${{ matrix.java }}
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v6
- name: Build with Gradle
run: |
cd java && ./gradlew --no-daemon -s :build
# TODO: add golang build
87 changes: 87 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
.DS_Store

# Go - https://github.com/github/gitignore/blob/main/Go.gitignore

# If you prefer the allow list template instead of the deny list, see community template:
# https://github.com/github/gitignore/blob/main/community/Golang/Go.AllowList.gitignore
#
# Binaries for programs and plugins
*.exe
*.exe~
*.dll
*.so
*.dylib

# Test binary, built with `go test -c`
*.test

# Code coverage profiles and other test artifacts
*.out
coverage.*
*.coverprofile
profile.cov

# Dependency directories (remove the comment below to include it)
# vendor/

# Go workspace file
go.work
go.work.sum

# env file
.env

# Editor/IDE
# .idea/
# .vscode/

# Java - https://github.com/github/gitignore/blob/main/Java.gitignore

# Compiled class file
*.class

# Log file
*.log

# BlueJ files
*.ctxt

# Mobile Tools for Java (J2ME)
.mtj.tmp/

# Package Files #
*.jar
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
replay_pid*

# Gradle - https://github.com/github/gitignore/blob/main/Gradle.gitignore

.gradle
**/build/
!**/src/**/build/

# Ignore Gradle GUI config
gradle-app.setting

# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
!gradle-wrapper.jar

# Avoid ignore Gradle wrapper properties
!gradle-wrapper.properties

# Cache of project
.gradletasknamecache

# Eclipse Gradle plugin generated files
# Eclipse Core
.project
# JDT-specific (Eclipse Java Development Tools)
.classpath
26 changes: 12 additions & 14 deletions java/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
plugins {
// Apply the java-library plugin for API and implementation separation.
`java-library`
id("io.freefair.lombok") version "8.6"
id("com.github.johnrengelman.shadow") version "7.1.2"
id("io.freefair.lombok") version "9.5.0"
id("com.gradleup.shadow") version "9.4.2"
jacoco
id("com.github.spotbugs") version "6.0.7"
id("com.github.spotbugs") version "6.5.6"
checkstyle
id("org.cyclonedx.bom") version "1.10.0"
id("org.cyclonedx.bom") version "3.2.4"
}

repositories {
Expand Down Expand Up @@ -49,7 +49,7 @@ dependencies {
implementation("org.apache.commons:commons-lang3:3.0")
implementation("com.jayway.jsonpath:json-path:2.9.0")
implementation("io.github.resilience4j:resilience4j-retry:2.2.0")
implementation(enforcedPlatform("com.fasterxml.jackson:jackson-bom:2.17.0"))
implementation(platform("com.fasterxml.jackson:jackson-bom:2.17.0"))
implementation("com.fasterxml.jackson.core:jackson-core")
implementation("com.fasterxml.jackson.core:jackson-annotations")
implementation("com.fasterxml.jackson.core:jackson-databind")
Expand All @@ -70,7 +70,7 @@ dependencies {
}

jacoco {
toolVersion = "0.8.9" // Use the latest version available
toolVersion = "0.8.15" // Use the latest version available
}

tasks.jacocoTestReport {
Expand Down Expand Up @@ -114,7 +114,7 @@ tasks.jacocoTestCoverageVerification {
}

spotbugs {
toolVersion.set("4.8.3")
toolVersion.set("4.10.2")
ignoreFailures.set(false)
showProgress.set(true)
effort.set(com.github.spotbugs.snom.Effort.MAX)
Expand Down Expand Up @@ -193,16 +193,14 @@ tasks.javadoc {
}
}

java {
withJavadocJar()
withSourcesJar()
}

tasks {
jar {
archiveBaseName.set("DemandDrivenTrafficEvaluator")
archiveClassifier.set("core")
archiveVersion.set("2.1.0") // Set your library version
}
named<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("shadowJar") {
archiveBaseName.set("DemandDrivenTrafficEvaluator")
archiveClassifier.set("fat")
archiveVersion.set("2.1.0") // Set your library version
destinationDirectory.set(layout.buildDirectory.dir("libs"))
configurations = listOf(project.configurations.runtimeClasspath.get())

Expand Down
5 changes: 3 additions & 2 deletions java/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
# This file was generated by the Gradle 'init' task.
# https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties

org.gradle.parallel=true
org.gradle.caching=true
version=2.1.0

org.gradle.parallel=true
org.gradle.caching=true
Binary file modified java/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion java/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
16 changes: 5 additions & 11 deletions java/gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 10 additions & 25 deletions java/gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions java/settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,4 @@ plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
}

rootProject.name = "DemandDrivenTrafficEvaluator"
include("lib")
rootProject.name = "demand-driven-traffic-evaluator"
4 changes: 2 additions & 2 deletions java/src/main/resources/log4j2.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
</Console>
<!-- File Appender -->
<RollingFile name="FileAppender"
fileName="logs/application.log"
filePattern="logs/application-%d{yyyy-MM-dd}-%i.log">
fileName="build/logs/application.log"
filePattern="build/logs/application-%d{yyyy-MM-dd}-%i.log">
<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
<Policies>
<SizeBasedTriggeringPolicy size="10MB"/>
Expand Down