From cfae3efd4053098d6f5e7b324f16d47e269eac86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Sultan?= Date: Sun, 16 Jan 2022 20:20:12 +0100 Subject: [PATCH] BREAKING CHANGE: changing versions of libraries (#87) --- .github/workflows/master-deploy.yml | 6 ++--- README.md | 24 ++++++------------- java-ml-example/pom.xml | 8 +++++++ .../src/main/resources/log4j.properties | 4 ---- .../main/resources/simplelogger.properties | 4 ++++ java-ml/pom.xml | 12 ++++++++-- java-ml/src/main/resources/log4j.properties | 4 ---- .../test/resources/simplelogger.properties | 4 ++++ pom.xml | 17 +++---------- version.properties | 2 +- 10 files changed, 39 insertions(+), 46 deletions(-) delete mode 100644 java-ml-example/src/main/resources/log4j.properties create mode 100644 java-ml-example/src/main/resources/simplelogger.properties delete mode 100644 java-ml/src/main/resources/log4j.properties create mode 100644 java-ml/src/test/resources/simplelogger.properties diff --git a/.github/workflows/master-deploy.yml b/.github/workflows/master-deploy.yml index 1766ce8..754b9a6 100644 --- a/.github/workflows/master-deploy.yml +++ b/.github/workflows/master-deploy.yml @@ -38,10 +38,8 @@ jobs: git commit -m "release: v-$app_version" git tag -a -m "$app_version" "$app_version" - # Deploy to GCP with maven - ./mvnw clean deploy \ - -Drelease.archiva.rsultan.username=${ARCHIVA_USERNAME} \ - -Drelease.archiva.rsultan.password=${ARCHIVA_PASSWORD} + # Build and Install to verify + ./mvnw clean install # Setting the next developement iteration ./set-version.sh snapshot diff --git a/README.md b/README.md index 856af8a..b228890 100644 --- a/README.md +++ b/README.md @@ -9,18 +9,15 @@ You can check for examples in this package: ``src/main/java/org/rsultan/example` ## Getting started -Add this repository to your `pom.xml` -```xml - - - release.archiva.rsultan.org - Java ML repository - https://archiva.rsultan.org/repository/internal - - +Clone the repo and add the dependency according to your version + +```bash + $ git fetch --all --tags + $ git checkout tags/ -b + $ ./mvnw clean install ``` -And then add the corresponding dependency +And then add the corresponding dependency ```xml org.rsultan @@ -29,13 +26,6 @@ And then add the corresponding dependency ``` -You can also clone the repo and add the dependency according to your version - -```bash - $ git fetch --all --tags - $ git checkout tags/ -b - $ ./mvnw clean install -``` Once your are good with this, you can go read the [wiki](https://github.com/remisultan/java-ml/wiki) diff --git a/java-ml-example/pom.xml b/java-ml-example/pom.xml index 229bbe1..4714478 100644 --- a/java-ml-example/pom.xml +++ b/java-ml-example/pom.xml @@ -3,6 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + 1.7.21 + java-ml-parent org.rsultan @@ -18,6 +21,11 @@ java-ml ${project.version} + + org.slf4j + slf4j-simple + ${slf4j-simple.version} + diff --git a/java-ml-example/src/main/resources/log4j.properties b/java-ml-example/src/main/resources/log4j.properties deleted file mode 100644 index 8b6bab5..0000000 --- a/java-ml-example/src/main/resources/log4j.properties +++ /dev/null @@ -1,4 +0,0 @@ -log4j.rootLogger=DEBUG, Console -log4j.appender.Console=org.apache.log4j.ConsoleAppender -log4j.appender.Console.layout=org.apache.log4j.PatternLayout -log4j.appender.Console.layout.ConversionPattern=%d{ABSOLUTE} %-5p ~ %m%n diff --git a/java-ml-example/src/main/resources/simplelogger.properties b/java-ml-example/src/main/resources/simplelogger.properties new file mode 100644 index 0000000..ed9c358 --- /dev/null +++ b/java-ml-example/src/main/resources/simplelogger.properties @@ -0,0 +1,4 @@ +org.slf4j.simpleLogger.logFile=System.out +org.slf4j.simpleLogger.defaultLogLevel=info +org.slf4j.simpleLogger.showDateTime=true +org.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss.SSS \ No newline at end of file diff --git a/java-ml/pom.xml b/java-ml/pom.xml index e70b128..6489e9b 100644 --- a/java-ml/pom.xml +++ b/java-ml/pom.xml @@ -15,8 +15,9 @@ java-ml - 1.0.0-beta7 - 2.8.2 + 1.0.0-M1.1 + 2.9.1 + 1.7.21 @@ -35,6 +36,13 @@ univocity-parsers ${univocity-parsers.version} + + org.slf4j + slf4j-simple + ${slf4j-simple.version} + test + + java-ml diff --git a/java-ml/src/main/resources/log4j.properties b/java-ml/src/main/resources/log4j.properties deleted file mode 100644 index 8b6bab5..0000000 --- a/java-ml/src/main/resources/log4j.properties +++ /dev/null @@ -1,4 +0,0 @@ -log4j.rootLogger=DEBUG, Console -log4j.appender.Console=org.apache.log4j.ConsoleAppender -log4j.appender.Console.layout=org.apache.log4j.PatternLayout -log4j.appender.Console.layout.ConversionPattern=%d{ABSOLUTE} %-5p ~ %m%n diff --git a/java-ml/src/test/resources/simplelogger.properties b/java-ml/src/test/resources/simplelogger.properties new file mode 100644 index 0000000..ed9c358 --- /dev/null +++ b/java-ml/src/test/resources/simplelogger.properties @@ -0,0 +1,4 @@ +org.slf4j.simpleLogger.logFile=System.out +org.slf4j.simpleLogger.defaultLogLevel=info +org.slf4j.simpleLogger.showDateTime=true +org.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss.SSS \ No newline at end of file diff --git a/pom.xml b/pom.xml index 87c330f..3f5aa90 100644 --- a/pom.xml +++ b/pom.xml @@ -19,14 +19,13 @@ 3.9.1 - 1.0 16 - 5.7.0 + 5.8.2 ${java.version} ${java.version} UTF-8 - 2.0.0-alpha1 2.9.0 + 5.8.2 @@ -35,16 +34,6 @@ - - org.slf4j - slf4j-log4j12 - ${slf4j-log4j12.version} - - - org.slf4j - slf4j-api - ${slf4j-log4j12.version} - org.junit.jupiter junit-jupiter @@ -60,7 +49,7 @@ org.junit.jupiter junit-jupiter-params - 5.7.0 + ${junit-jupiter-params.version} compile diff --git a/version.properties b/version.properties index 4aa888d..52b5b72 100755 --- a/version.properties +++ b/version.properties @@ -1 +1 @@ -version.next=2.2.3 \ No newline at end of file +version.next=3.0.0 \ No newline at end of file