Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

side-by-side xml diff #22

Merged
merged 3 commits into from
Jun 2, 2014
Merged

side-by-side xml diff #22

merged 3 commits into from
Jun 2, 2014

Conversation

josteinaj
Copy link
Member

fixes #12

@josteinaj
Copy link
Member Author

@bertfrees: Both locally and on travis this build fails; could you check out this branch and mvn integration-test it locally? I'm getting "Calabash failed to execute XProc".

@bertfrees
Copy link
Member

blocked on daisy/xproc-maven-plugin/pull/8

@bertfrees
Copy link
Member

I managed to build it. Building the next branch of xproc-maven-plugin is not enough, you also need to prevent maven-invoker-plugin from downloading the old version from Sonatype. In xprocspec/src/it/it-xprocspec/pom.xml I had to add

    <pluginRepository>
      <id>local.central</id>
      <url>@localRepositoryUrl@</url>
      <releases>
        <enabled>true</enabled>
      </releases>
      <snapshots>
        <enabled>true</enabled>
      </snapshots>
    </pluginRepository>

and I had to disable sonatype-nexus-snapshots with

      <snapshots>
        <enabled>false</enabled>
      </snapshots>

Just removing the <pluginRepository> didn't do the trick.

(also some POM cleanup)
@josteinaj
Copy link
Member Author

So this will build successfully when daisy/xproc-maven-plugin#8 is merged?

@bertfrees
Copy link
Member

Yes. Well does it work for you locally? I see you committed the above mentioned change but I guess that will break Travis.

@josteinaj
Copy link
Member Author

It works locally, yes.

Should I not have committed the above mentioned change?

@bertfrees
Copy link
Member

It was kind of a hack to work around maven-invoker-plugin's funny behaviour. Once you can depend on a released version of xproc-maven-plugin I'd remove the pluginRepositories section completely.

josteinaj added a commit that referenced this pull request Jun 2, 2014
@josteinaj josteinaj merged commit f7e0a36 into master Jun 2, 2014
@josteinaj josteinaj deleted the side-by-side-xml-diff branch June 2, 2014 12:08
@josteinaj josteinaj added this to the v1.1.0 milestone Jun 20, 2014
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.

side-by-side xml diff view like in xspec
2 participants