Skip to content

Commit d493195

Browse files
ctruedenctrueden
committed
Update pombast.toml to current standards
* The name 'bombast' was already taken on PyPI * Add SciJava Maven repository to pombast config * Various key additions, renames, reorganization * Use Unlicense instead of CC0 in mega-melt POM template
1 parent 32481b4 commit d493195

2 files changed

Lines changed: 103 additions & 57 deletions

File tree

bombast.toml renamed to pombast.toml

Lines changed: 101 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,19 @@
1-
[filter]
2-
includes = [
3-
"ca.mcgill:*",
4-
"io.scif:*",
5-
"jitk:*",
6-
"mpicbg:*",
7-
"net.imagej:*",
8-
"net.imglib2:*",
9-
"net.preibisch:*",
10-
"org.bonej:*",
11-
"org.janelia.saalfeldlab:*",
12-
"org.janelia:*",
13-
"org.morphonets:*",
14-
"org.scijava:*",
15-
"sc.fiji:*",
16-
]
1+
[common]
2+
default-java-version = 8
3+
repositories = ["scijava.public=https://maven.scijava.org/content/groups/public"]
4+
5+
[melt]
6+
java-version = 11
7+
template = "tests/mega-melt-template.xml"
178
excludes = [
189
# TEMP: Exclude org.bytedeco:hdf5 until cisd:jhdf5 is gone.
1910
'org.bytedeco:hdf5',
2011
# TEMP: Skip components within multi-module reactors.
21-
# Neither melting-pot.sh nor release-version.sh understand
22-
# multi-module repositories; release-version.sh needs to learn
23-
# how to tag and release individual components from multi-module
24-
# repos, so that when melting-pot.sh shallow clones the repo at
25-
# that tag and invokes a build, it will be building only the
12+
# Neither pombast nor release-version.sh understand multi-
13+
# module repositories; release-version.sh needs to learn how
14+
# to tag and release individual components from multi-module
15+
# repos, so that when pombast shallow clones the repo at that
16+
# tag and invokes a build, it will be building only the
2617
# released component as it does with single-component repos.
2718
'org.scijava:scijava-collections',
2819
'org.scijava:scijava-common3',
@@ -49,23 +40,23 @@ excludes = [
4940
'org.scijava:scijava-testutil',
5041
'org.scijava:scijava-types',
5142
'mpicbg:mpicbg', 'mpicbg:mpicbg_',
52-
# NB: Skip artifacts requiring minimum Java version >8.
53-
'*:algart-tiff',
54-
'*:javafx-base',
55-
'*:javafx-controls',
56-
'*:javafx-fxml',
57-
'*:javafx-graphics',
58-
'*:javafx-media',
59-
'*:javafx-swing',
60-
'*:javafx-web',
61-
'*:SNT',
43+
# NB: Skip artifacts requiring minimum Java version >11.
44+
'net.algart:algart-tiff',
45+
'org.openjfx:javafx-base',
46+
'org.openjfx:javafx-controls',
47+
'org.openjfx:javafx-fxml',
48+
'org.openjfx:javafx-graphics',
49+
'org.openjfx:javafx-media',
50+
'org.openjfx:javafx-swing',
51+
'org.openjfx:javafx-web',
52+
'org.morphonets:SNT',
6253
# NB: Skip closed-source artifacts.
63-
'*:bonej-plus',
54+
'org.bonej:bonej-plus',
6455
# NB: The following artifacts have messy dependency trees.
6556
# Too many problems to test as part of the mega-melt.
6657
# See WARNING block in pom-scijava's pom.xml for details.
6758
'net.imagej:imagej-server',
68-
'*:spark-core_2.11',
59+
'org.apache.spark:spark-core_2.11',
6960
# NB: Skip scijava forks of third-party projects.
7061
# These are very stable, with few/no dependencies, and
7162
# don't need to be retested as pom-scijava evolves.
@@ -75,25 +66,25 @@ excludes = [
7566
'org.scijava:junit-benchmarks',
7667
'org.scijava:vecmath',
7768
# NB: Skip alternate flavors of other managed components.
78-
'*:gluegen', # uberjar flavor of gluegen-rt
79-
'*:jogl-all-noawt', # slimmed down flavor of jogl-all
69+
'org.jogamp.gluegen:gluegen', # uberjar flavor of gluegen-rt
70+
'org.jogamp.jogl:jogl-all-noawt', # slimmed down flavor of jogl-all
8071
# NB: All the SWT platform JARs have the same classes.
8172
# The current platform will be brought in transitively.
82-
'*:org.eclipse.swt.cocoa.macosx',
83-
'*:org.eclipse.swt.cocoa.macosx.x86_64',
84-
'*:org.eclipse.swt.gtk.aix.ppc',
85-
'*:org.eclipse.swt.gtk.aix.ppc64',
86-
'*:org.eclipse.swt.gtk.hpux.ia64',
87-
'*:org.eclipse.swt.gtk.linux.ppc',
88-
'*:org.eclipse.swt.gtk.linux.ppc64',
89-
'*:org.eclipse.swt.gtk.linux.s390',
90-
'*:org.eclipse.swt.gtk.linux.s390x',
91-
'*:org.eclipse.swt.gtk.linux.x86',
92-
'*:org.eclipse.swt.gtk.linux.x86_64',
93-
'*:org.eclipse.swt.gtk.solaris.sparc',
94-
'*:org.eclipse.swt.gtk.solaris.x86',
95-
'*:org.eclipse.swt.win32.win32.x86',
96-
'*:org.eclipse.swt.win32.win32.x86_64',
73+
'org.eclipse.swt:org.eclipse.swt.cocoa.macosx',
74+
'org.eclipse.swt:org.eclipse.swt.cocoa.macosx.x86_64',
75+
'org.eclipse.swt:org.eclipse.swt.gtk.aix.ppc',
76+
'org.eclipse.swt:org.eclipse.swt.gtk.aix.ppc64',
77+
'org.eclipse.swt:org.eclipse.swt.gtk.hpux.ia64',
78+
'org.eclipse.swt:org.eclipse.swt.gtk.linux.ppc',
79+
'org.eclipse.swt:org.eclipse.swt.gtk.linux.ppc64',
80+
'org.eclipse.swt:org.eclipse.swt.gtk.linux.s390',
81+
'org.eclipse.swt:org.eclipse.swt.gtk.linux.s390x',
82+
'org.eclipse.swt:org.eclipse.swt.gtk.linux.x86',
83+
'org.eclipse.swt:org.eclipse.swt.gtk.linux.x86_64',
84+
'org.eclipse.swt:org.eclipse.swt.gtk.solaris.sparc',
85+
'org.eclipse.swt:org.eclipse.swt.gtk.solaris.x86',
86+
'org.eclipse.swt:org.eclipse.swt.win32.win32.x86',
87+
'org.eclipse.swt:org.eclipse.swt.win32.win32.x86_64',
9788
# NB: All SLF4J bindings have the same classes.
9889
# We'll rely on logback-classic being present here.
9990
'org.slf4j:slf4j-jcl',
@@ -105,11 +96,66 @@ excludes = [
10596
'org.slf4j:jcl-over-slf4j',
10697
]
10798

108-
[build]
109-
min-java-version = 8
110-
111-
[skip-tests]
112-
components = [
99+
[smelt]
100+
includes = [
101+
"ca.mcgill:*",
102+
"io.scif:*",
103+
"jitk:*",
104+
"mpicbg:*",
105+
"net.imagej:*",
106+
"net.imglib2:*",
107+
"net.preibisch:*",
108+
"org.bonej:*",
109+
"org.janelia.saalfeldlab:*",
110+
"org.janelia:*",
111+
"org.morphonets:*",
112+
"org.scijava:*",
113+
"sc.fiji:*",
114+
]
115+
excludes = [
116+
# NB: Skip closed-source artifacts.
117+
'org.bonej:bonej-plus',
118+
# NB: Skip scijava forks of third-party projects.
119+
# These are very stable, with few/no dependencies, and
120+
# don't need to be retested as pom-scijava evolves.
121+
'org.scijava:j3dcore',
122+
'org.scijava:j3dutils',
123+
'org.scijava:jep',
124+
'org.scijava:junit-benchmarks',
125+
'org.scijava:vecmath',
126+
# TEMP: Skip components within multi-module reactors.
127+
# Neither pombast nor release-version.sh understand multi-
128+
# module repositories; release-version.sh needs to learn how
129+
# to tag and release individual components from multi-module
130+
# repos, so that when pombast shallow clones the repo at that
131+
# tag and invokes a build, it will be building only the
132+
# released component as it does with single-component repos.
133+
'org.scijava:scijava-collections',
134+
'org.scijava:scijava-common3',
135+
'org.scijava:scijava-concurrent',
136+
'org.scijava:scijava-discovery-test',
137+
'org.scijava:scijava-discovery',
138+
'org.scijava:scijava-function',
139+
'org.scijava:scijava-legacy',
140+
'org.scijava:scijava-meta',
141+
'org.scijava:scijava-ops-api',
142+
'org.scijava:scijava-ops-benchmarks',
143+
'org.scijava:scijava-ops-engine',
144+
'org.scijava:scijava-ops-ext-parser',
145+
'org.scijava:scijava-ops-flim',
146+
'org.scijava:scijava-ops-image',
147+
'org.scijava:scijava-ops-indexer',
148+
'org.scijava:scijava-ops-opencv',
149+
'org.scijava:scijava-ops-spi',
150+
'org.scijava:scijava-ops-tutorial',
151+
'org.scijava:scijava-priority',
152+
'org.scijava:scijava-progress',
153+
'org.scijava:scijava-struct',
154+
'org.scijava:scijava-taglets',
155+
'org.scijava:scijava-testutil',
156+
'org.scijava:scijava-types',
157+
]
158+
skip-tests = [
113159
# java.lang.AssertionError
114160
# at org.scijava.minimaven.BasicTest.testClassifiers(BasicTest.java:216)
115161
"org.scijava:minimaven",

‎tests/mega-melt-template.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
</organization>
2020
<licenses>
2121
<license>
22-
<name>CC0 1.0 Universal License</name>
23-
<url>https://creativecommons.org/publicdomain/zero/1.0/</url>
22+
<name>Unlicense</name>
23+
<url>https://unlicense.org/</url>
2424
<distribution>repo</distribution>
2525
</license>
2626
</licenses>

0 commit comments

Comments
 (0)