Bump to 0.2.0-SNAPSHOT

DovOps · Dec 18, 2022 · 9c6cbb6 · 9c6cbb6
1 parent 5d51e01
commit 9c6cbb6
Show file tree

Hide file tree

Showing 19 changed files with 48 additions and 32 deletions.
diff --git a/backend/backend.gradle b/backend/backend.gradle
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  ********************************************************************************/
-
+apply from: "$rootDir/gradle/base.gradle"
 
 def COMMON = 'common'
 def WORKER = 'worker'

diff --git a/backend/common/common.gradle b/backend/common/common.gradle
@@ -14,6 +14,8 @@ plugins {
     id 'java-library'
 }
 
+apply from: "$rootDir/gradle/java.gradle"
+
 dependencies {
     api "org.apache.logging.log4j:log4j-slf4j-impl:2.17.1"
 

diff --git a/backend/gc-log-analyzer/gc-log-analyzer.gradle b/backend/gc-log-analyzer/gc-log-analyzer.gradle
@@ -10,12 +10,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  ********************************************************************************/
-
-
 plugins {
     id 'java-library'
 }
 
+apply from: "$rootDir/gradle/java.gradle"
+
 dependencies {
     implementation project(':backend:common')
 

diff --git a/backend/heap-dump-analyzer/api/api.gradle b/backend/heap-dump-analyzer/api/api.gradle
@@ -14,6 +14,8 @@ plugins {
     id 'java-library'
 }
 
+apply from: "$rootDir/gradle/java.gradle"
+
 dependencies {
     implementation project(':backend:common')
 }

diff --git a/backend/heap-dump-analyzer/eclipse-mat-deps/eclipse-mat-deps.gradle b/backend/heap-dump-analyzer/eclipse-mat-deps/eclipse-mat-deps.gradle
@@ -10,11 +10,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  ********************************************************************************/
-
 plugins {
     id 'com.diffplug.p2.asmaven' version '3.37.1'
 }
 
+apply from: "$rootDir/gradle/base.gradle"
+
 p2AsMaven {
     group 'eclipse-deps', {
         repoEclipse '4.22'

diff --git a/backend/heap-dump-analyzer/hook/hook.gradle b/backend/heap-dump-analyzer/hook/hook.gradle
@@ -10,11 +10,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  ********************************************************************************/
-
 plugins {
     id 'java-library'
 }
 
+apply from: "$rootDir/gradle/java.gradle"
+
 dependencies {
 
     def prefix = "${mat_deps_dir_path}/"

diff --git a/backend/heap-dump-analyzer/impl/impl.gradle b/backend/heap-dump-analyzer/impl/impl.gradle
@@ -14,6 +14,8 @@ plugins {
     id 'java-library'
 }
 
+apply from: "$rootDir/gradle/java.gradle"
+
 jar {
     manifest {
         attributes(
@@ -22,7 +24,7 @@ jar {
                 "Bundle-Activator": "org.eclipse.jifa.hda.impl.Activator",
                 "Import-Package":
                         "org.eclipse.mat.snapshot,org.eclipse.mat.util,org.eclipse.mat.query,org.eclipse.mat.parser.model,org.eclipse.mat.hprof.extension",
-                "Bundle-Version": "1.0"
+                "Bundle-Version": project.version
         )
     }
 
@@ -48,5 +50,5 @@ compileJava.dependsOn(':backend:heap-dump-analyzer:hook:hookPreferences')
 task installJar(type: Copy, dependsOn: jar) {
     from "${buildDir}/libs"
     into "${mat_deps_dir_path}"
-    include '*.jar'
+    include "*${project.version}.jar"
 }
diff --git a/backend/heap-dump-analyzer/provider/provider.gradle b/backend/heap-dump-analyzer/provider/provider.gradle
@@ -10,11 +10,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  ********************************************************************************/
-
 plugins {
     id 'java-library'
 }
 
+apply from: "$rootDir/gradle/java.gradle"
+
 dependencies {
     implementation project(':backend:common')
     implementation project(':backend:heap-dump-analyzer:api')

diff --git a/backend/master/master.gradle b/backend/master/master.gradle
@@ -14,6 +14,8 @@ plugins {
     id 'application'
 }
 
+apply from: "$rootDir/gradle/java.gradle"
+
 dependencies {
     implementation project(':backend:common')
 

diff --git a/backend/thread-dump-analyzer/thread-dump-analyzer.gradle b/backend/thread-dump-analyzer/thread-dump-analyzer.gradle
@@ -10,11 +10,12 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  ********************************************************************************/
-
 plugins {
     id 'java-library'
 }
 
+apply from: "$rootDir/gradle/java.gradle"
+
 dependencies {
     implementation project(':backend:common')
 

diff --git a/backend/worker/worker.gradle b/backend/worker/worker.gradle
@@ -14,6 +14,8 @@ plugins {
     id 'application'
 }
 
+apply from: "$rootDir/gradle/java.gradle"
+
 dependencies {
     implementation project(':backend:common')
     implementation project(':backend:heap-dump-analyzer:api')

diff --git a/docker/docker.gradle b/docker/docker.gradle
@@ -10,6 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  ********************************************************************************/
+apply from: "$rootDir/gradle/base.gradle"
 
 task buildWorkerImage(type: Exec) {
     dependsOn ':buildJifa'

diff --git a/frontend/frontend.gradle b/frontend/frontend.gradle
@@ -10,6 +10,8 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  ********************************************************************************/
+apply from: "$rootDir/gradle/base.gradle"
+
 buildscript {
     repositories {
         maven {

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "Jifa",
-  "version": "0.1.0",
+  "name": "jifa",
+  "version": "0.2.0-SNAPSHOT",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",

diff --git a/gradle/base.gradle b/gradle/base.gradle
@@ -0,0 +1,10 @@
+version = '0.2.0-SNAPSHOT'
+
+repositories {
+    maven {
+        url "https://plugins.gradle.org/m2/"
+    }
+    mavenCentral()
+}
+
+apply plugin: 'idea'
diff --git a/gradle/java.gradle b/gradle/java.gradle
@@ -0,0 +1 @@
+apply from: "$rootDir/gradle/base.gradle"
diff --git a/jifa.gradle b/jifa.gradle
@@ -10,19 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  ********************************************************************************/
-allprojects {
-    repositories {
-        maven {
-            url "https://plugins.gradle.org/m2/"
-        }
-        mavenCentral()
-    }
-}
-
-subprojects {
-    apply plugin: 'idea'
-    version = '1.0'
-}
+apply from: "$rootDir/gradle/base.gradle"
 
 task deleteSSHConfig(type: Delete) {
     delete "${rootProject.rootDir}/backend/config/jifa-ssh-key", "${rootProject.rootDir}/backend/config/jifa-ssh-key.pub"
@@ -39,20 +27,20 @@ task copySSHConfig(dependsOn: generateSSHConfig, type: Copy) {
 }
 
 task copyMasterDist(type: Copy, dependsOn: ':backend:master:build') {
-    from "${rootProject.rootDir}/backend/master/build/distributions/master-1.0.zip" as Object
+    from "${rootProject.rootDir}/backend/master/build/distributions/master-${project.version}.zip" as Object
     into "${rootProject.rootDir}/artifacts" as Object
 }
 
 task copyWorkerDist(type: Copy, dependsOn: ':backend:worker:build') {
-    from "${rootProject.rootDir}/backend/worker/build/distributions/worker-1.0.zip" as Object
+    from "${rootProject.rootDir}/backend/worker/build/distributions/worker-${project.version}.zip" as Object
     into "${rootProject.rootDir}/artifacts" as Object
 }
 
 task compressFrontendDist(type: Zip) {
     from "${rootProject.rootDir}/frontend/build"
     destinationDirectory = file("${rootProject.rootDir}/artifacts")
     archiveBaseName.set('frontend')
-    archiveVersion.set('1.0')
+    archiveVersion.set(project.version)
     archiveExtension.set('zip')
 }
 

diff --git a/settings.gradle b/settings.gradle
@@ -10,7 +10,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  ********************************************************************************/
-rootProject.name = 'Jifa'
+rootProject.name = 'jifa'
 
 include ':backend'
 include ':backend:common'