BREAKING CHANGE: changing versions of libraries (#87)

remisultan · Jan 16, 2022 · cfae3ef · cfae3ef
1 parent 088956a
commit cfae3ef
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 46 deletions.
diff --git 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
@@ -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
- <repositories>
-    <repository>
-        <id>release.archiva.rsultan.org</id>
-        <name>Java ML repository</name>
-        <url>https://archiva.rsultan.org/repository/internal</url>
-    </repository>
- </repositories>
+Clone the repo and add the dependency according to your version
+
+```bash
+ $ git fetch --all --tags
+ $ git checkout tags/<latest-release> -b <your-branch>  
+ $ ./mvnw clean install
 ```
 
-And then add the corresponding dependency 
+And then add the corresponding dependency
 ```xml
     <dependency>
       <groupId>org.rsultan</groupId>
@@ -29,13 +26,6 @@ And then add the corresponding dependency
     </dependency>
 ```
 
-You can also clone the repo and add the dependency according to your version
-
-```bash
- $ git fetch --all --tags
- $ git checkout tags/<latest-release> -b <your-branch>  
- $ ./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
@@ -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">
   <modelVersion>4.0.0</modelVersion>
+  <properties>
+    <slf4j-simple.version>1.7.21</slf4j-simple.version>
+  </properties>
   <parent>
     <artifactId>java-ml-parent</artifactId>
     <groupId>org.rsultan</groupId>
@@ -18,6 +21,11 @@
       <artifactId>java-ml</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>${slf4j-simple.version}</version>
+    </dependency>
   </dependencies>
 
 </project>
diff --git a/java-ml-example/src/main/resources/log4j.properties b/java-ml-example/src/main/resources/log4j.properties
diff --git a/java-ml-example/src/main/resources/simplelogger.properties 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
diff --git a/java-ml/pom.xml b/java-ml/pom.xml
@@ -15,8 +15,9 @@
   <artifactId>java-ml</artifactId>
 
   <properties>
-    <nd4j.version>1.0.0-beta7</nd4j.version>
-    <univocity-parsers.version>2.8.2</univocity-parsers.version>
+    <nd4j.version>1.0.0-M1.1</nd4j.version>
+    <univocity-parsers.version>2.9.1</univocity-parsers.version>
+    <slf4j-simple.version>1.7.21</slf4j-simple.version>
   </properties>
 
   <dependencies>
@@ -35,6 +36,13 @@
       <artifactId>univocity-parsers</artifactId>
       <version>${univocity-parsers.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>${slf4j-simple.version}</version>
+      <scope>test</scope>
+    </dependency>
+
   </dependencies>
   <build>
     <finalName>java-ml</finalName>

diff --git a/java-ml/src/main/resources/log4j.properties b/java-ml/src/main/resources/log4j.properties
diff --git a/java-ml/src/test/resources/simplelogger.properties 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
diff --git a/pom.xml b/pom.xml
@@ -19,14 +19,13 @@
 
   <properties>
     <assertj-core.version>3.9.1</assertj-core.version>
-    <google-storage-wagon.version>1.0</google-storage-wagon.version>
     <java.version>16</java.version>
-    <junit-jupiter.version>5.7.0</junit-jupiter.version>
+    <junit-jupiter.version>5.8.2</junit-jupiter.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <slf4j-log4j12.version>2.0.0-alpha1</slf4j-log4j12.version>
     <univocity-parsers.version>2.9.0</univocity-parsers.version>
+    <junit-jupiter-params.version>5.8.2</junit-jupiter-params.version>
   </properties>
 
   <modules>
@@ -35,16 +34,6 @@
   </modules>
 
   <dependencies>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>${slf4j-log4j12.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>${slf4j-log4j12.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter</artifactId>
@@ -60,7 +49,7 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-params</artifactId>
-      <version>5.7.0</version>
+      <version>${junit-jupiter-params.version}</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

diff --git a/version.properties b/version.properties
@@ -1 +1 @@
-version.next=2.2.3
+version.next=3.0.0