Skip to content

Update citeproc dependency to 1.0.1#2303

Merged
matthiasgeiger merged 2 commits into
masterfrom
citeproc-update
Nov 21, 2016
Merged

Update citeproc dependency to 1.0.1#2303
matthiasgeiger merged 2 commits into
masterfrom
citeproc-update

Conversation

@matthiasgeiger

@matthiasgeiger matthiasgeiger commented Nov 21, 2016

Copy link
Copy Markdown
Member

@matthiasgeiger

matthiasgeiger commented Nov 21, 2016

Copy link
Copy Markdown
Member Author

Test is failing:

net.sf.jabref.logic.citationstyle.CitationStyleGeneratorTest > testCarriageReturn FAILED

    org.junit.ComparisonFailure: expected:<...ight-inline">J. Doe [and J. ]Doe, .</div>

      </div...> but was:<...ight-inline">J. Doe [John and]Doe, .</div>

      </div...>

        at org.junit.Assert.assertEquals(Assert.java:115)

        at org.junit.Assert.assertEquals(Assert.java:144)

        at net.sf.jabref.logic.citationstyle.CitationStyleGeneratorTest.testCarriageReturn(CitationStyleGeneratorTest.java:24)

As I'm not an expert for the CSL styles... is this an issue or just an irrelevant change? @bartsch-dev @koppor

@Siedlerchr Siedlerchr mentioned this pull request Nov 21, 2016
Merged
@Siedlerchr

Siedlerchr commented Nov 21, 2016

Copy link
Copy Markdown
Member

We should update asap, because version 1.0.0 is no longer avaiable at jcenter/maven repo:
https://bintray.com/bintray/jcenter/de.undercouch%3Aciteproc-java

@koppor

koppor commented Nov 21, 2016 via email

Copy link
Copy Markdown
Member

@chriba

chriba commented Nov 21, 2016 •
edited
Loading

Copy link
Copy Markdown
Contributor

The new version just removes the carriage return (\r) which is bad as this possibly connects two lines. (michel-kraemer/citeproc-java@729ca2c#commitcomment-19902593)

@matthiasgeiger

matthiasgeiger commented Nov 21, 2016

Copy link
Copy Markdown
Member Author

Thanks for the explanation. I already adapted the test to be no longer failing.
Let's keep an eye on the discussion - but I'll merge this anyway as currently all builds are failing due to a missing citeproc dependency.

@matthiasgeiger matthiasgeiger merged commit 7362d02 into master Nov 21, 2016
@koppor koppor deleted the citeproc-update branch November 21, 2016 16:55
@koppor

koppor commented Nov 21, 2016

Copy link
Copy Markdown
Member

Side note: Maven Central still offers version 1.0.0 - https://mvnrepository.com/artifact/de.undercouch/citeproc-java/1.0.0

I don't get, why it is removed on bintray (https://bintray.com/bintray/jcenter/de.undercouch%3Aciteproc-java)

@michel-kraemer Could you give us a hint why version 1.0.0 was removed on bintray?

@matthiasgeiger

matthiasgeiger commented Nov 21, 2016

Copy link
Copy Markdown
Member Author

It was the '-SNAPSHOT' Version we used and which has been removed after the official 1.0.0 version

@michel-kraemer

michel-kraemer commented Nov 21, 2016 •
edited by koppor
Loading

Copy link
Copy Markdown
Contributor

Hey guys!

I see two problems here.

a) Version 1.0.0 is not available on Bintray. That's very strange. I only upload to Maven Central and Bintray should sync automatically. It must be a problem with Bintray actually, but if you like I can try to publish 1.0.0 to Bintray too.

b)\r is replaced by nothing and not a space. I'm sorry if this causes problems. It seems there are files out there containing only a \r without a \n? If you can confirm this in the other thread I can release a fix.

@michel-kraemer

michel-kraemer commented Nov 21, 2016

Copy link
Copy Markdown
Contributor

Regarding b): I fixed it here michel-kraemer/citeproc-java@dc800d1

If you wish I can release 1.0.2 shortly.

@koppor

koppor commented Nov 21, 2016

Copy link
Copy Markdown
Member

Thank you for your feedback. I think, an update is not necessary: See #2306

michel-kraemer added a commit to michel-kraemer/citeproc-java that referenced this pull request Nov 21, 2016
@michel-kraemer
Revert "Replace single \r by a space character"
5bfb31f 
This reverts commit dc800d1.

See
729ca2c
and JabRef/jabref#2303
Siedlerchr added a commit that referenced this pull request Nov 27, 2016
@Siedlerchr
Merge remote-tracking branch 'upstream/master' into fileDirPattern
5af579a 
* upstream/master: (36 commits)
  Rework DBLPFetcher to new structure (#2314)
  Consider dev tag in version comparison (#2312)
  Update diffutils from 1.3.0 to 2.1.1
  Replace usages of Throwable with Exception (#2310)
  Add missing srcDir statement
  improve documentation of save order limitation - see #2305
  Adapt CSL tests to CRLF and LF (#2306)
  Use SPDX license identifiers
  Add key format of #2275 as requirement to CONTRIBUTING.md
  Add fallback exception handler (#2287)
  Update citeproc dependency to 1.0.1 (#2303)
  Remove duplicate code getResolvedFieldOrAlias (#2296)
  Update testCompile dependencies (mockito-core, wiremock)
  Change execution order (#2302)
  Use https for files.jabref.org
  Use compileJava instead of getdeps to decrease build time even more
  Update install4j from 6.1.1 to 6.1.3
  Fix local metadata synchronization
  Fix NullPointerException in ConnectToSharedDatabaseDialog (#2297)
  The error message "No suitable driver found" will not appear when JabRef connects on startup. (#2295)
  ...

# Conflicts:
#	src/main/java/net/sf/jabref/logic/util/io/FileUtil.java
Siedlerchr added a commit that referenced this pull request Nov 28, 2016
@Siedlerchr
Merge branch 'master' of https://github.com/Siedlerchr/jabref into co…
12dc92d 
…ntentSelector

* 'master' of https://github.com/Siedlerchr/jabref:
  Rework DBLPFetcher to new structure (#2314)
  Consider dev tag in version comparison (#2312)
  Update diffutils from 1.3.0 to 2.1.1
  Replace usages of Throwable with Exception (#2310)
  Add missing srcDir statement
  improve documentation of save order limitation - see #2305
  Adapt CSL tests to CRLF and LF (#2306)
  Use SPDX license identifiers
  Add key format of #2275 as requirement to CONTRIBUTING.md
  Add fallback exception handler (#2287)
  Update citeproc dependency to 1.0.1 (#2303)
  Remove duplicate code getResolvedFieldOrAlias (#2296)
  Update testCompile dependencies (mockito-core, wiremock)
  Change execution order (#2302)
  Use https for files.jabref.org
  Use compileJava instead of getdeps to decrease build time even more
  Update install4j from 6.1.1 to 6.1.3
  Fix local metadata synchronization
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@matthiasgeiger @Siedlerchr @koppor @chriba @michel-kraemer