Skip to content

Commit

Permalink
develop --> master for release 2.0.0 (#69)
Browse files Browse the repository at this point in the history
develop --> master for release 2.0.0
  • Loading branch information
remisultan authored Aug 25, 2021
2 parents eb26006 + df383ab commit b41d9a5
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/compile-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-java@v1
with:
java-version: '15'
java-version: '16'
- run: ./mvnw clean test
6 changes: 3 additions & 3 deletions .github/workflows/master-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-java@v1
with:
java-version: '15'
java-version: '16'
- name: Master Compile
run: |
#Add maven settings.xml
Expand All @@ -34,7 +34,7 @@ jobs:
# Setting the Release version to pom
app_version=$(grep -rE "version.next=[0-9]+\.[0-9]+\.[0-9]+" version.properties | cut -d"=" -f2)
./set-version.sh release
git add pom.xml pom.xml version.properties
git add pom.xml */pom.xml version.properties
git commit -m "release: v-$app_version"
git tag -a -m "$app_version" "$app_version"
Expand All @@ -45,7 +45,7 @@ jobs:
# Setting the next developement iteration
./set-version.sh snapshot
git add pom.xml version.properties
git add pom.xml */pom.xml version.properties
git commit -m "chore: jumping onto next development iteration"
- name: Push changes made
uses: ad-m/github-push-action@master
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ You can check for examples in this package: ``src/main/java/org/rsultan/example`

## Requirements

- JDK15+
- JDK16+

## Getting started

Expand Down
6 changes: 3 additions & 3 deletions java-ml-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
<parent>
<artifactId>java-ml-parent</artifactId>
<groupId>org.rsultan</groupId>
<version>1.3.1-SNAPSHOT</version>
<version>1.4.1-SNAPSHOT</version>
</parent>

<artifactId>java-ml-example</artifactId>
<version>1.3.1-SNAPSHOT</version>
<version>1.4.1-SNAPSHOT</version>
<name>java-ml-example</name>

<dependencies>
<dependency>
<groupId>org.rsultan</groupId>
<artifactId>java-ml</artifactId>
<version>1.3.1-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>
</dependencies>

Expand Down
4 changes: 2 additions & 2 deletions java-ml/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
<parent>
<groupId>org.rsultan</groupId>
<artifactId>java-ml-parent</artifactId>
<version>1.3.1-SNAPSHOT</version>
<version>1.4.1-SNAPSHOT</version>
</parent>

<name>java-ml</name>
<version>1.3.1-SNAPSHOT</version>
<version>1.4.1-SNAPSHOT</version>
<artifactId>java-ml</artifactId>

<properties>
Expand Down
4 changes: 1 addition & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<properties>
<assertj-core.version>3.9.1</assertj-core.version>
<google-storage-wagon.version>1.0</google-storage-wagon.version>
<java.version>15</java.version>
<java.version>16</java.version>
<junit-jupiter.version>5.7.0</junit-jupiter.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
Expand Down Expand Up @@ -89,7 +89,6 @@
<BACKEND_PRIORITY_CPU>1</BACKEND_PRIORITY_CPU>
<BACKEND_PRIORITY_GPU>0</BACKEND_PRIORITY_GPU>
</environmentVariables>
<argLine>--enable-preview</argLine>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -121,7 +120,6 @@
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
<compilerArgs>--enable-preview</compilerArgs>
</configuration>
</plugin>
</plugins>
Expand Down
2 changes: 1 addition & 1 deletion version.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version.next=1.4.1
version.next=2.0.0

0 comments on commit b41d9a5

Please sign in to comment.