Skip to content

Commit

Permalink
fix assembly
Browse files Browse the repository at this point in the history
  • Loading branch information
carueda committed Mar 27, 2020
1 parent 431eff3 commit ec3f966
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 1 deletion.
5 changes: 5 additions & 0 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@ addCompilerPlugin(

mainClass in assembly := Some("org.mmisw.cf2rdf.cf2rdf")
assemblyJarName in assembly := s"cf2rdf-$cf2rdfVersion.jar"
assemblyMergeStrategy in assembly := {
case PathList("META-INF", "MANIFEST.MF") => MergeStrategy.discard
case path if path.endsWith("module-info.class") => MergeStrategy.discard
case _ => MergeStrategy.first
}

def setVersion(version: String): String = {
println(s"cf2rdf $version")
Expand Down
29 changes: 29 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,35 @@

Good testing with `$ sbt "run download convert"`

- fix `assembly`.

$ java -jar target/scala-2.12/cf2rdf-0.6.1.jar download convert
Downloading https://raw.githubusercontent.com/cf-convention/cf-convention.github.io/master/Data/cf-standard-names/current/src/cf-standard-name-table.xml
-> ./cf2rdf_output/cf-standard-name-table.xml

Downloading http://vocab.nerc.ac.uk/collection/P07/current/
-> ./cf2rdf_output/nvs_P07.rdf

[main] WARN org.apache.jena.riot - [line: 1, col: 121] {W119} A processing instruction is in RDF content. No processing was done.

Summary: (saved in ./cf2rdf_output/cf-standard-name-table.conv-stats.txt)
cf2rdf conversion
input: https://raw.githubusercontent.com/cf-convention/cf-convention.github.io/master/Data/cf-standard-names/current/src/cf-standard-name-table.xml
output: ./cf2rdf_output/cf-standard-name-table.rdf

vocabulary properties from input file:
version_number: 72; last_modified: 2020-03-10T11:52:02Z

conversion stats:
numConcepts = 4419
numEntries = 4418
numWithNoCanonicalUnits = 12
numWithNoDefinitions = 19

Mapping ontology:
mappingTermsAdded = 4418
mappingOutputFilename = ./cf2rdf_output/cfonmap.n3

2017-09-08 0.6.0

- watchdog adjustments
Expand Down
2 changes: 1 addition & 1 deletion project/assembly.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.5")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10")

0 comments on commit ec3f966

Please sign in to comment.