diff --git a/.idea/runConfigurations/Gemma_Rest.xml b/.idea/runConfigurations/Gemma_Rest.xml
new file mode 100644
index 0000000000..e04a1ab8fa
--- /dev/null
+++ b/.idea/runConfigurations/Gemma_Rest.xml
@@ -0,0 +1,91 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.jenkins/Jenkinsfile b/.jenkins/Jenkinsfile
index fa9f7613a2..5a5df54732 100644
--- a/.jenkins/Jenkinsfile
+++ b/.jenkins/Jenkinsfile
@@ -23,6 +23,7 @@ pipeline {
agent any
tools {
maven 'Maven 3.6.3'
+ jdk 'Java 25'
}
environment {
GEMMA_CLI_WIKI_DEPLOY_TOKEN = credentials('confluence-wiki-token')
@@ -210,7 +211,7 @@ pipeline {
}
stage('SonarQube Analysis') {
tools {
- jdk 'Java 17'
+ jdk 'Java 25'
}
when {
anyOf {
diff --git a/gemma-core/src/main/java/ubic/gemma/persistence/service/analysis/expression/diff/DifferentialExpressionAnalysisReadServiceImpl.java b/gemma-core/src/main/java/ubic/gemma/persistence/service/analysis/expression/diff/DifferentialExpressionAnalysisReadServiceImpl.java
index 0e92f47228..86b5478e12 100644
--- a/gemma-core/src/main/java/ubic/gemma/persistence/service/analysis/expression/diff/DifferentialExpressionAnalysisReadServiceImpl.java
+++ b/gemma-core/src/main/java/ubic/gemma/persistence/service/analysis/expression/diff/DifferentialExpressionAnalysisReadServiceImpl.java
@@ -267,8 +267,8 @@ public Map results = analysis.getResultSets();
DifferentialExpressionAnalysisValueObject avo = new DifferentialExpressionAnalysisValueObject( analysis );
-
- BioAssaySet experimentAnalyzed = analysis.getExperimentAnalyzed();
+
+ BioAssaySet experimentAnalyzed = ( BioAssaySet ) Hibernate.unproxy( analysis.getExperimentAnalyzed() );
avo.setExperimentAnalyzedId( experimentAnalyzed.getId() ); // might be a subset.
diff --git a/pom.xml b/pom.xml
index 6f984f2170..ddb47ef604 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1668,7 +1668,7 @@
- 1.12.3
+ 1.12.1
/usr/lib64/hdf5
8.4.0