Skip to content

Commit

Permalink
Merge pull request #1 from jerolba/master
Browse files Browse the repository at this point in the history
Pull master
  • Loading branch information
amoraleda authored Oct 10, 2024
2 parents 8a6b3ff + c427101 commit 8cfe541
Show file tree
Hide file tree
Showing 223 changed files with 4,871 additions and 498 deletions.
42 changes: 7 additions & 35 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2.1
jobs:
build:
docker:
- image: circleci/openjdk:8-jdk
- image: eclipse-temurin:17.0.10_7-jdk-jammy
- image: circleci/mysql:5.7
environment:
- MYSQL_USER=test
Expand All @@ -20,33 +20,19 @@ jobs:
# Customize the JVM maximum heap limit
JVM_OPTS: -Xmx3200m
TERM: dumb

steps:
- checkout

# Download and cache dependencies
- restore_cache:
keys:
- v1-dependencies-{{ checksum "build.gradle" }}
# fallback to using the latest cache if no exact match is found
- v1-dependencies-

- run: ./gradlew dependencies
- run: ./gradlew test --console=plain -i

- save_cache:
paths:
- ~/.m2
key: v1-dependencies-{{ checksum "build.gradle" }}

- run: ./gradlew test --console=plain

# Jacoco and codecov
- run: ./gradlew jacocoTestReport
- run: bash <(curl -s https://codecov.io/bash)

build-latest:
docker:
- image: circleci/openjdk:8-jdk
- image: eclipse-temurin:17.0.10_7-jdk-jammy
- image: circleci/mysql:8.0
environment:
- MYSQL_USER=test
Expand All @@ -66,29 +52,15 @@ jobs:
# Customize the JVM maximum heap limit
JVM_OPTS: -Xmx3200m
TERM: dumb

steps:
- checkout

# Download and cache dependencies
- restore_cache:
keys:
- v1-dependencies-{{ checksum "build.gradle" }}
# fallback to using the latest cache if no exact match is found
- v1-dependencies-

- run: ./gradlew dependencies
- run: ./gradlew test -Pmysql8 --console=plain -i

- save_cache:
paths:
- ~/.m2
key: v1-dependencies-{{ checksum "build.gradle" }}

- run: ./gradlew test -Pmysql8 --console=plain

workflows:
version: 2.0
build-multiple:
jobs:
- build
- build-latest
- build-latest
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
[![Maven Central](https://img.shields.io/maven-central/v/org.jfleet/jfleet.svg)](https://maven-badges.herokuapp.com/maven-central/org.jfleet/jfleet)
[![Build Status](https://circleci.com/gh/jerolba/jfleet.svg?style=shield)](https://circleci.com/gh/jerolba/jfleet)
[![Codecov](https://codecov.io/gh/jerolba/jfleet/branch/master/graph/badge.svg)](https://codecov.io/gh/jerolba/jfleet/)
[ ![Download](https://api.bintray.com/packages/jerolba/JFleet/jfleet/images/download.svg) ](https://bintray.com/jerolba/JFleet/jfleet/_latestVersion)
[![License](http://img.shields.io/:license-apache-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)

# JFleet
Expand Down Expand Up @@ -180,11 +179,13 @@ JFleet is uploaded to Maven Central Repository and to use it, you need to add th
<dependency>
<groupId>org.jfleet</groupId>
<artifactId>jfleet</artifactId>
<version>0.6.4</version>
<version>0.6.7</version>
</dependency>
```

or download the single [jar](http://central.maven.org/maven2/org/jfleet/jfleet/0.6.4/jfleet-0.6.4.jar) from Maven repository.
```
implementation 'org.jfleet:jfleet:0.6.7'
```

You can always find the latest published version in the [MvnRepository searcher](https://mvnrepository.com/artifact/org.jfleet/jfleet).

Expand Down
24 changes: 12 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
plugins {
id "com.github.hierynomus.license" version "0.15.0"
id "com.github.hierynomus.license" version "0.16.1"
}

allprojects {
apply plugin: 'license'
license {
header rootProject.file("config/HEADER")
exclude "**/*.properties"
exclude "**/*.txt"
exclude "**/ReaderInputStream.java"
}
repositories {
jcenter()
}
apply plugin: 'license'
license {
header rootProject.file("config/HEADER")
exclude "**/*.properties"
exclude "**/*.txt"
exclude "**/ReaderInputStream.java"
}

repositories {
mavenCentral()
}
}
2 changes: 1 addition & 1 deletion config/HEADER
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright 2017 Jerónimo López Bezanilla
Copyright 2022 Jerónimo López Bezanilla

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
12 changes: 6 additions & 6 deletions config/checkstyle/checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@
<property name="message" value="Space needed around ':' character."/>
</module>

<!-- Checks for Size Violations. -->
<!-- See http://checkstyle.sf.net/config_sizes.html -->
<module name="LineLength">
<property name="max" value="120"/>
</module>

<module name="TreeWalker">

<!-- Checks for Naming Conventions. -->
Expand All @@ -45,12 +51,6 @@
<property name="processJavadoc" value="true"/>
</module>

<!-- Checks for Size Violations. -->
<!-- See http://checkstyle.sf.net/config_sizes.html -->
<module name="LineLength">
<property name="max" value="120"/>
</module>

<!-- Checks for whitespace -->
<!-- See http://checkstyle.sf.net/config_whitespace.html -->
<module name="GenericWhitespace"/>
Expand Down
6 changes: 5 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
group = org.jfleet
version = 0.6.4
version = 0.6.7

parquetVersion = 1.13.1
hadoopVersion = 3.3.5
junitVersion = 5.10.2
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 8cfe541

Please sign in to comment.