Merge remote-tracking branch 'origin/master' into ppodsednik-changes

# Conflicts: # build.gradle # gradle.properties # gradle/wrapper/gradle-wrapper.properties
ceskaexpedice · Nov 20, 2024 · fe2620d · fe2620d
2 parents 0fb19c2 + 1d1c508
commit fe2620d
Show file tree

Hide file tree

Showing 20 changed files with 301 additions and 710 deletions.
diff --git a/.github/workflows/gradle-push.yml b/.github/workflows/gradle-push.yml
@@ -23,12 +23,15 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 11
+    - name: Set up JDK 21
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '21'
         distribution: 'temurin'
+
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@v4
+
     - name: Build with Gradle
-      uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1
-      with:
-        arguments: build
+      run: ./gradlew build
+
diff --git a/.github/workflows/gradle-release.yml b/.github/workflows/gradle-release.yml
@@ -45,15 +45,19 @@ jobs:
         password: ${{secrets.DOCKERHUB_TOKEN}}  
 
     - uses: actions/checkout@v3
-    - name: Set up JDK 11
+    - name: Set up JDK 21
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '21'
         distribution: 'temurin'
+
+
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@v4
+
     - name: Build with Gradle
-      uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1
-      with:
-        arguments: "clean build distZip jib"
+      run: ./gradlew build clean build distZip jib
+
 
     - uses: actions/upload-artifact@v3
       with:

diff --git a/.github/workflows/gradle-scheduled.yml b/.github/workflows/gradle-scheduled.yml
diff --git a/build.gradle b/build.gradle
@@ -200,6 +200,9 @@ allprojects {
     //~ overwrite windows encoding
     test {
         systemProperty "file.encoding", "utf-8"
+
+		jvmArgs "--add-opens", "java.base/java.lang=ALL-UNNAMED",
+				"--add-opens", "java.base/java.lang.reflect=ALL-UNNAMED"
     }
 
     tasks.withType(JavaCompile) {
@@ -285,13 +288,20 @@ allprojects {
 /**
  * Distribution task; zipInstallDir first
  */
-task distZip(type:Zip, dependsOn: 'zipInstallDir') {
+task distZip(type:Zip, dependsOn: ['zipInstallDir', ':search:war', ':processes:migration:distZip']) {
     description "Create full distribution zip"
     archiveBaseName.set('kramerius')
     group "Distribution"
-	// core war 
+
+	// Nastavení závislosti na spuštění po `:search:war`
+    //finalizedBy ':search:war'
+
+	// core war
 	from {'search/build/libs'}
-	// migration tool 
+
+	//inputs.files file('search/build/libs/search.war')
+
+	// migration tool
     from {'processes/migration/build/distributions'}
 	// installation.zip
     from {'build/installation/'}
@@ -330,8 +340,3 @@ task zipAllJavadocs(type: Zip) {
     }
 }
 
-task printJavaVersion {
-    doLast {
-        println "Running on Java version: ${System.getProperty('java.version')}"
-    }
-}
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,2 @@
 group=cz.incad.kramerius
-version=7.0.39-dev
-org.gradle.caching=true
-org.gradle.parallel=true
-#org.gradle.configuration-cache=true
+version=7.0.39
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Thu Jul 13 09:18:44 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip