github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity

update to junit 4.12 to get jmock working

Browse source 
Also moved junit to the test scope.
This commit is contained in:
John Lees-Miller 2015-11-24 12:05:24 +00:00
parent 6a25132f0c
commit 624c3e6af1
8 changed files with 64 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
services/git-bridge/.idea/libraries/Maven__cglib_cglib_nodep_2_1_3.xml
View file

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: cglib:cglib-nodep:2.1_3">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3-sources.jar!/" />
</SOURCES>
</library>
</component>

13
services/git-bridge/.idea/libraries/Maven__junit_junit_4_10.xml
View file

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: junit:junit:4.10">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.10/junit-4.10.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.10/junit-4.10-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.10/junit-4.10-sources.jar!/" />
</SOURCES>
</library>
</component>

13
services/git-bridge/.idea/libraries/Maven__junit_junit_4_12.xml Normal file
View file

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: junit:junit:4.12">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12-sources.jar!/" />
</SOURCES>
</library>
</component>

8
services/git-bridge/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml → services/git-bridge/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
View file

@ -1,13 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.hamcrest:hamcrest-core:1.1">
<library name="Maven: org.hamcrest:hamcrest-core:1.3">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar!/" />
</SOURCES>
</library>
</component>

13
services/git-bridge/.idea/libraries/Maven__org_jmock_jmock_legacy_2_6_0.xml
View file

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: org.jmock:jmock-legacy:2.6.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jmock/jmock-legacy/2.6.0/jmock-legacy-2.6.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/jmock/jmock-legacy/2.6.0/jmock-legacy-2.6.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jmock/jmock-legacy/2.6.0/jmock-legacy-2.6.0-sources.jar!/" />
</SOURCES>
</library>
</component>

13
services/git-bridge/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml
View file

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: org.objenesis:objenesis:1.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/1.0/objenesis-1.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/1.0/objenesis-1.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/1.0/objenesis-1.0-sources.jar!/" />
</SOURCES>
</library>
</component>

9
services/git-bridge/pom.xml
View file

@ -49,18 +49,14 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.10</version>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jmock</groupId>
<artifactId>jmock-junit4</artifactId>
<version>2.6.0</version>
</dependency>
<dependency>
<groupId>org.jmock</groupId>
<artifactId>jmock-legacy</artifactId>
<version>2.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.aggregate</groupId>
@ -106,6 +102,7 @@
<groupId>org.mock-server</groupId>
<artifactId>mockserver-netty</artifactId>
<version>3.10.1</version>
<scope>test</scope>
</dependency>
</dependencies>

91
services/git-bridge/writelatex-git-bridge.iml
View file

@ -17,15 +17,12 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.10" level="project" />
<orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
<orderEntry type="library" name="Maven: org.jmock:jmock-junit4:2.6.0" level="project" />
<orderEntry type="library" name="Maven: org.jmock:jmock:2.6.0" level="project" />
<orderEntry type="library" name="Maven: org.hamcrest:hamcrest-library:1.1" level="project" />
<orderEntry type="library" name="Maven: junit:junit-dep:4.4" level="project" />
<orderEntry type="library" name="Maven: org.jmock:jmock-legacy:2.6.0" level="project" />
<orderEntry type="library" name="Maven: org.objenesis:objenesis:1.0" level="project" />
<orderEntry type="library" name="Maven: cglib:cglib-nodep:2.1_3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.jmock:jmock-junit4:2.6.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.jmock:jmock:2.6.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit-dep:4.4" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty.aggregate:jetty-all:9.2.6.v20141205" level="project" />
<orderEntry type="library" name="Maven: javax.websocket:javax.websocket-api:1.0" level="project" />
<orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
@ -44,43 +41,43 @@
<orderEntry type="library" name="Maven: org.xerial:sqlite-jdbc:3.8.7" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-nop:1.7.9" level="project" />
<orderEntry type="library" name="Maven: joda-time:joda-time:2.7" level="project" />
<orderEntry type="library" name="Maven: org.mock-server:mockserver-netty:3.10.1" level="project" />
<orderEntry type="library" name="Maven: org.mock-server:mockserver-client-java:3.10.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" />
<orderEntry type="library" name="Maven: org.mock-server:mockserver-core:3.10.1" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec-socks:4.0.31.Final" level="project" />
<orderEntry type="library" name="Maven: com.jcraft:jzlib:1.1.3" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcmail-jdk15on:1.52" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.52" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.5.3" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.5.3" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.5.3" level="project" />
<orderEntry type="library" name="Maven: org.skyscreamer:jsonassert:1.2.3" level="project" />
<orderEntry type="library" name="Maven: org.json:json:20090211" level="project" />
<orderEntry type="library" name="Maven: com.github.fge:json-schema-validator:2.2.6" level="project" />
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.0" level="project" />
<orderEntry type="library" name="Maven: com.googlecode.libphonenumber:libphonenumber:6.2" level="project" />
<orderEntry type="library" name="Maven: com.github.fge:json-schema-core:1.2.5" level="project" />
<orderEntry type="library" name="Maven: com.github.fge:uri-template:0.9" level="project" />
<orderEntry type="library" name="Maven: com.github.fge:msg-simple:1.1" level="project" />
<orderEntry type="library" name="Maven: com.github.fge:btf:1.2" level="project" />
<orderEntry type="library" name="Maven: com.github.fge:jackson-coreutils:1.8" level="project" />
<orderEntry type="library" name="Maven: org.mozilla:rhino:1.7R4" level="project" />
<orderEntry type="library" name="Maven: javax.mail:mailapi:1.4.3" level="project" />
<orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
<orderEntry type="library" name="Maven: net.sf.jopt-simple:jopt-simple:4.6" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:1.3.2" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-buffer:4.0.31.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec:4.0.31.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-codec-http:4.0.31.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-common:4.0.31.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-handler:4.0.31.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-transport:4.0.31.Final" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.52" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:18.0" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-classic:1.1.3" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-core:1.1.3" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: janino:janino:2.5.10" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.mock-server:mockserver-logging:3.10.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.mock-server:mockserver-netty:3.10.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.mock-server:mockserver-client-java:3.10.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.mock-server:mockserver-core:3.10.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-codec-socks:4.0.31.Final" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.jcraft:jzlib:1.1.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.bouncycastle:bcmail-jdk15on:1.52" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.52" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.fasterxml.jackson.core:jackson-core:2.5.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.5.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.5.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.2.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.json:json:20090211" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.github.fge:json-schema-validator:2.2.6" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.google.code.findbugs:jsr305:3.0.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.googlecode.libphonenumber:libphonenumber:6.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.github.fge:json-schema-core:1.2.5" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.github.fge:uri-template:0.9" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.github.fge:msg-simple:1.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.github.fge:btf:1.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.github.fge:jackson-coreutils:1.8" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.mozilla:rhino:1.7R4" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: javax.mail:mailapi:1.4.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: javax.activation:activation:1.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: net.sf.jopt-simple:jopt-simple:4.6" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: commons-io:commons-io:1.3.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-buffer:4.0.31.Final" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-codec:4.0.31.Final" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-codec-http:4.0.31.Final" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-common:4.0.31.Final" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-handler:4.0.31.Final" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-transport:4.0.31.Final" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.bouncycastle:bcprov-jdk15on:1.52" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.google.guava:guava:18.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.1.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.1.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: janino:janino:2.5.10" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.mock-server:mockserver-logging:3.10.1" level="project" />
</component>
</module>