Skip to content

Commit

Permalink
Merge 24.11 to 25.1
Browse files Browse the repository at this point in the history
  • Loading branch information
labkey-teamcity committed Jan 14, 2025
2 parents 4a294d8 + 774f130 commit 6489d51
Showing 1 changed file with 0 additions and 13 deletions.
13 changes: 0 additions & 13 deletions nextflow/webapp/WEB-INF/nextflow/nextflowContext.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,10 @@
<bean id="nextFlowPipelineTask" class="org.labkey.api.pipeline.TaskId">
<constructor-arg><value type="java.lang.Class">org.labkey.nextflow.pipeline.NextFlowRunTask</value></constructor-arg>
</bean>
<ref bean="xarGeneratorNextFlow"/>
</list>
</property>
</bean>
</list>
</property>
</bean>

<!-- Experiment derived tasks -->
<bean id="xarGeneratorNextFlow" class="org.labkey.api.exp.pipeline.XarGeneratorFactorySettings">
<constructor-arg value="xarGeneratorNextFlow"/>
<!-- Import in the same thread pool as other Skyline doc imports -->
<property name="location" value="webserver-high-priority" />
</bean>

<!-- Tasks registered in experiment module -->
<bean id="xarGeneratorId" class="org.labkey.api.pipeline.TaskId">
<constructor-arg><value type="java.lang.Class">org.labkey.api.exp.pipeline.XarGeneratorId</value></constructor-arg>
</bean>
</beans>

0 comments on commit 6489d51

Please sign in to comment.