Skip to content

Update to a newer Omero version that's proxied in LabKey's Artifactory#65

Merged
labkey-jeckels merged 6 commits into
developfrom
fb_omeroArtifactory
Oct 19, 2020
Merged

Update to a newer Omero version that's proxied in LabKey's Artifactory#65
labkey-jeckels merged 6 commits into
developfrom
fb_omeroArtifactory

Conversation

@labkey-jeckels
Copy link
Copy Markdown

Rationale

openmicroscopy.org is down, so try a new Artifactory-based proxying and update to an official release version of Omero artifacts

Changes

  • Remove third-party, currently offline Artifactory reference. Bump to newer point releases.

Copy link
Copy Markdown
Collaborator

@bbimber bbimber left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@labkey-jeckels @labkey-susanh this is working for me locally.

@labkey-jeckels
Copy link
Copy Markdown
Author

@bbimber This is failing tests because it's got a conflicting version of org.json classes. Looking at the jar files that it's including, there are a lot more than before the changes.

@labkey-susanh did your changes end up with a similar overlap? It may be somewhat random in terms of which version of the org.json classes get loaded first

JARs in this FB:

JWlz-1.4.0.jar				ini4j-0.4.1.jar				okio-1.12.0.jar
aggdesigner-algorithm-6.0.jar		jackson-dataformat-yaml-2.9.8.jar	ome-codecs-0.2.5.jar
avatica-core-1.15.0.jar			janino-3.0.11.jar			ome-common-6.0.4.jar
avatica-metrics-1.15.0.jar		javax.activation-1.2.0.jar		ome-jai-0.1.0.jar
bufr-3.0.jar				jcip-annotations-1.0.jar		ome-mdbtools-5.3.2.jar
c3p0-0.9.5.3.jar			jgoodies-common-1.7.0.jar		ome-poi-5.3.3.jar
calcite-core-1.20.0.jar			jgoodies-forms-1.7.2.jar		ome-xml-6.0.1.jar
calcite-linq4j-1.20.0.jar		jhdf5-14.12.6.jar			omero-blitz-5.5.6.jar
cdm-4.6.13.jar				joda-time-2.8.1.jar			omero-common-5.5.5.jar
commons-collections4-4.1.jar		json-20090211.jar			omero-gateway-5.6.3.jar
commons-compiler-3.0.11.jar		json-path-2.4.0.jar			omero-model-5.5.5.jar
commons-dbcp2-2.6.0.jar			jxrlib-all-0.2.1.jar			omero-renderer-5.5.5.jar
commons-pool2-2.6.1.jar			kryo-2.24.0.jar				omero-romio-5.5.5.jar
esri-geometry-api-2.2.0.jar		logback-classic-1.1.1.jar		omero-server-5.5.6.jar
formats-api-6.3.1.jar			logback-core-1.1.1.jar			omerointegration-20.11-SNAPSHOT.jar
formats-bsd-6.3.1.jar			mchange-commons-java-0.2.15.jar		perf4j-0.9.16.jar
formats-gpl-6.3.1.jar			memory-0.9.0.jar			protobuf-java-3.6.1.jar
glacier2-3.6.5.jar			metadata-extractor-2.11.0.jar		sketches-core-0.9.0.jar
google-http-client-1.20.0.jar		metakit-5.3.2.jar			snakeyaml-1.23.jar
google-http-client-xml-1.20.0.jar	minio-5.0.2.jar				specification-6.0.1.jar
httpservices-4.6.13.jar			minlog-1.2.jar				turbojpeg-6.3.1.jar
ice-3.6.5.jar				native-lib-loader-2.1.4.jar		udunits-4.5.5.jar
icegrid-3.6.5.jar			objenesis-2.1.jar			xmpcore-5.1.3.jar
icestorm-3.6.4.jar			okhttp-3.7.0.jar			xpp3-1.1.4c.jar

JARs from develop:

aspectjrt-1.6.8.jar				model-psql-5.5.0-m1-ice36-b102.jar		specification-5.6.3.jar
aspectjweaver-1.6.8.jar				ome-codecs-0.2.2.jar				spring-context-support-3.0.1.RELEASE.jar
blitz-5.5.0-m2-ice36-b103.jar			ome-common-5.3.6.jar				spring-ldap-core-1.3.0.RELEASE.jar
common-5.5.0-m2-ice36-b103.jar			ome-jai-0.1.0.jar				spring-orm-3.0.1.RELEASE.jar
formats-api-5.9.2.jar				ome-xml-5.6.3.jar				spring-security-config-3.0.2.RELEASE.jar
formats-bsd-5.9.2.jar				omerointegration-20.11-SNAPSHOT.jar		spring-security-core-3.0.2.RELEASE.jar
glacier2-3.6.4.jar				rendering-5.5.0-m2-ice36-b103.jar		spring-security-ldap-3.0.2.RELEASE.jar
ice-3.6.4.jar					romio-5.5.0-m2-ice36-b103.jar
logback-core-1.1.1.jar				server-5.5.0-m2-ice36-b103.jar

@labkey-susanh
Copy link
Copy Markdown

@labkey-jeckels Yes, that looks in line with the jars I got from this feature branch locally, though I've not verified exactly.

@bbimber
Copy link
Copy Markdown
Collaborator

bbimber commented Oct 16, 2020

I'll directly ask the omero people if there is a best practice template for a genuinely minimal omero Java client. The Labkey module uses the most basic of omero APIs.

@bbimber
Copy link
Copy Markdown
Collaborator

bbimber commented Oct 18, 2020

@labkey-susanh omero functionality works for me w/ this.

@labkey-jeckels
Copy link
Copy Markdown
Author

Tests are happy (both automated and Ben's manual Omero validation), JARs seem reasonable, and we're now serving through our Artifactory and on a release version. Seems like we should be ready to merge.

Comment thread omerointegration/build.gradle Outdated
}

BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: ":server:modules:LabDevKitModules:LDK", depProjectConfig: "apiJarFile")
external (group: 'org.openmicroscopy', name: 'omero-gateway', version: '5.6.3')
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the excludes are not being done, the comment above can be removed. I think we need to exclude the json jar as we've done in several other places in our build:

{
      // exclude this because it gets in the way of our own JSON object implementations from server/api
      exclude group: "org.json", module:"json"
}

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants