Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 91 additions & 0 deletions .idea/runConfigurations/Gemma_Rest.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion .jenkins/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down Expand Up @@ -210,7 +211,7 @@ pipeline {
}
stage('SonarQube Analysis') {
tools {
jdk 'Java 17'
jdk 'Java 25'
}
when {
anyOf {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -267,8 +267,8 @@ public Map<ExpressionExperimentDetailsValueObject, Collection<DifferentialExpres
Collection<ExpressionAnalysisResultSet> 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.

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1668,7 +1668,7 @@
<!-- You may override these in ~/.m2/settings.xml. On macOS install with the HDF Group
binary tarball (which ships libhdf5_java.dylib and jarhdf5-X.Y.Z.jar) and set
hdf5.libDir to the bundled lib/ directory. -->
<hdf5.version>1.12.3</hdf5.version>
<hdf5.version>1.12.1</hdf5.version>
<!-- directory containing the HDF5 JNI shared library -->
<hdf5.libDir>/usr/lib64/hdf5</hdf5.libDir>
<mysql.version>8.4.0</mysql.version>
Expand Down
Loading