Skip to content

Commit

Permalink
Merge pull request #270 from sanger-pathogens/build-process-upgrade-m…
Browse files Browse the repository at this point in the history
…erge

Merge build 18.0.0 changes to master
  • Loading branch information
kpepper authored Jan 7, 2019
2 parents 3e43d27 + 91a091b commit 28b487d
Show file tree
Hide file tree
Showing 4,794 changed files with 359,209 additions and 509,969 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
74 changes: 46 additions & 28 deletions .classpath
Original file line number Diff line number Diff line change
@@ -1,31 +1,49 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding="ant-build|cobertura-lib|coverage-report|data|docs|evosuite-dependencies|evosuite-libs|evosuite-tests|jacoco-lib|lib|evosuite-tests/" including="uk/**" kind="src" output="eclipse-classes" path="test"/>
<classpathentry including="uk/**" kind="src" output="eclipse-classes" path="test/evosuite-tests"/>
<classpathentry excluding="main/" kind="src" path="ant-build/src"/>
<classpathentry excluding="ant-build/classes/|ant-build/src/|docs|test|test/evosuite-tests/|uk/ac/sanger/artemis/ExternalProgramUtils.java" including="org/|uk/" kind="src" path=""/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/jemAlign.jar"/>
<classpathentry kind="lib" path="lib/jakarta-regexp-1.2.jar"/>
<classpathentry kind="lib" path="lib/biojava.jar"/>
<classpathentry kind="lib" path="lib/j2ssh/j2ssh-core.jar"/>
<classpathentry kind="lib" path="lib/j2ssh/j2ssh-artemis-plugin.jar"/>
<classpathentry kind="lib" path="lib/j2ssh/commons-logging.jar"/>
<classpathentry kind="lib" path="lib/ibatis/ibatis-2.3.4.726.jar"/>
<classpathentry kind="lib" path="lib/ibatis/log4j-1.2.14.jar"/>
<classpathentry kind="lib" path="lib/postgresql-8.4-701.jdbc3.jar"/>
<classpathentry kind="lib" path="lib/batik/batik-awt-util.jar"/>
<classpathentry kind="lib" path="lib/batik/batik-codec.jar"/>
<classpathentry kind="lib" path="lib/batik/batik-dom.jar"/>
<classpathentry kind="lib" path="lib/batik/batik-ext.jar"/>
<classpathentry kind="lib" path="lib/batik/batik-svggen.jar"/>
<classpathentry kind="lib" path="lib/batik/batik-util.jar"/>
<classpathentry kind="lib" path="lib/batik/batik-xml.jar"/>
<classpathentry kind="lib" path="lib/commons-lang-2.6.jar"/>
<classpathentry kind="lib" path="test/lib/junit-4.11.jar"/>
<classpathentry kind="lib" path="/Users/kp11/workspace/applications/Artemis/eclipse-classes"/>
<classpathentry kind="lib" path="test/evosuite-lib/evosuite-1.0.5.jar"/>
<classpathentry kind="lib" path="lib/commons-net-3.6.jar"/>
<classpathentry kind="lib" path="lib/picard/picard.jar"/>
<classpathentry kind="output" path="eclipse-classes"/>
<classpathentry excluding="data/**" kind="src" output="eclipse-classes" path="test"/>
<classpathentry kind="src" output="target/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="test" value="true"/>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes>
<attribute name="test" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="src/assembly"/>
<classpathentry kind="src" path="src/site"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="module" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/evosuite">
<attributes>
<attribute name="test" value="true"/>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
12 changes: 5 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
*.class
.settings
ant-build
test/ant-build
**/.DS_Store
**/*.log
test/coverage-report
jar_build
tar_build
artemis_compiled.tar
/eclipse-classes/
/test-kjp/
/target/
dependency-reduced-pom.xml
maven.properties
.evosuite
maven-archiver
6 changes: 6 additions & 0 deletions .project
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,14 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
Loading

0 comments on commit 28b487d

Please sign in to comment.