Skip to content

Commit

Permalink
build: register dependency signatures; align managed dependencies wit…
Browse files Browse the repository at this point in the history
…h Daffodil dependencies (#383)

test: remove assertion which is causing a test to be flaky
  • Loading branch information
cjmamo authored Jan 24, 2025
1 parent 99e2710 commit 290b2c0
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 10 deletions.
1 change: 0 additions & 1 deletion edg/src/test/resources/parse.tdml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@

<tdml:validationErrors>
<tdml:error>Invalid content was found starting with element 'RFF'. One of '{DTM, SegGrp-1, SegGrp-2}' is expected.</tdml:error>
<tdml:error>RFF occurred '2' times when it was expected to be a minimum of '0' and a maximum of '1' times.</tdml:error>
</tdml:validationErrors>
</tdml:parserTestCase>

Expand Down
4 changes: 2 additions & 2 deletions keysmap.list
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
org.apache.daffodil:* = 0x03881AAE371C35A2C32CC940101EA16F63105E72, 0xB58C81142758101A43D5B17D36F3494B033AE661
org.apache.daffodil:* = 0x03881AAE371C35A2C32CC940101EA16F63105E72, 0xB58C81142758101A43D5B17D36F3494B033AE661, 0x212B19CFB545B97B40F35936989D39300ACC1866
org.scala-lang:* = 0x86DA41A5E1699C9CEBE964A8A9052B1B6D92E560
org.scala-lang.modules:scala-xml_2.12 = 0xF3D9FF1EE50634CC57D1E380C2952540150670BE
org.scala-lang.modules:scala-parser-combinators_2.12 = 0x052D3458525080E1C1F9DEB07CF1897E6E834E59
com.lihaoyi:* = 0x8F0D3BA7045AA84F4FCCA81866DB4638D2A8A7E9
com.typesafe:config = 0x0E6E990FD54E8532780086612B183B279DFD639E
com.typesafe.scala-logging:scala-logging_2.12 = 0xA5263F78869FD526AFB9F428707213974AB761AC
com.ibm.icu:icu4j = 0x87DFB6E009B27CA622B9204EC730DCAEF653215C
com.ibm.icu:icu4j = 0x87DFB6E009B27CA622B9204EC730DCAEF653215C, 0xE52F07877A5805F9AF4AB0ACD46C5610D06E7001
xerces:xercesImpl = 0x6CB87B18A453990EAC9453F87D713008CC07E9AD
xml-resolver:xml-resolver = noSig
org.eclipse.xsd:org.eclipse.xsd = 0x46C3B7A6025C27B71B11E8994AECD4CFA6127AE9
Expand Down
9 changes: 2 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -246,16 +246,11 @@
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>2.12.18</version>
</dependency>
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
<version>7.1.0</version>
<version>2.12.20</version>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.smooks</groupId>
Expand Down

0 comments on commit 290b2c0

Please sign in to comment.