Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
23 changes: 1 addition & 22 deletions .classpath
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,9 @@
<classpathentry kind="src" path="test/performance"/>
<classpathentry kind="src" path="scripts"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="lib" path="test/lib/fest/fest-assert-1.0.jar"/>
<classpathentry kind="lib" path="test/lib/fest/fest-reflect-1.1.jar"/>
<classpathentry kind="lib" path="test/lib/fest/fest-swing-1.1.jar"/>
<classpathentry kind="lib" path="test/lib/fest/fest-util-1.0.jar"/>
<classpathentry kind="lib" path="test/lib/fest/jcip-annotations-1.0.jar"/>
<classpathentry kind="lib" path="test/lib/fest/MRJToolkitStubs-1.0.jar"/>
<classpathentry kind="lib" path="test/lib/jfcunit.jar"/>
<classpathentry exported="true" kind="lib" path="test/lib/equalsverifier-2.4.4.jar"/>
<classpathentry kind="lib" path="test/lib/reflections/reflections-0.9.10.jar"/>
<classpathentry kind="lib" path="test/lib/reflections/guava-21.0.jar"/>
<classpathentry kind="lib" path="test/lib/reflections/javassist-3.21.0-GA.jar"/>
<classpathentry kind="lib" path="test/lib/system-rules-1.16.1.jar"/>
<classpathentry kind="lib" path="test/lib/unitils-core/unitils-core-3.4.6.jar"/>
<classpathentry kind="lib" path="test/lib/commons-testing/commons-testing-2.1.0.jar"/>
<classpathentry exported="true" kind="lib" path="test/lib/wiremock-standalone-2.15.0.jar"/>
<classpathentry exported="true" kind="lib" path="test/lib/awaitility-3.1.0.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
<classpathentry kind="lib" path="test/lib/unitils-core/commons-collections-3.2.2.jar"/>
<classpathentry kind="lib" path="test/lib/unitils-core/commons-lang-2.6.jar"/>
<classpathentry kind="lib" path="test/lib/unitils-core/commons-logging-1.1.3.jar"/>
<classpathentry kind="lib" path="test/lib/unitils-core/ognl-2.6.9.jar"/>
<classpathentry kind="lib" path="test/lib/fest/debug-1.0.jar"/>
<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
<classpathentry exported="true" kind="lib" path="tools/spotbugs/spotbugs-annotations.jar"/>
<classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=JOSM&amp;ivyXmlPath=ivy.xml&amp;confs=*"/>
<classpathentry kind="output" path="bin"/>
</classpath>
1 change: 1 addition & 0 deletions .project
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,6 @@
<nature>org.sonar.ide.eclipse.core.sonarNature</nature>
<nature>sf.eclipse.javacc.javaccnature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
<nature>org.apache.ivyde.eclipse.ivynature</nature>
</natures>
</projectDescription>
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@ before_install:
- >
case "${TRAVIS_OS_NAME:-linux}" in
linux)
ant resolve
;;
osx)
ant resolve
brew update
brew install ant
;;
Expand Down
293 changes: 161 additions & 132 deletions build.xml

Large diffs are not rendered by default.

60 changes: 60 additions & 0 deletions ivy.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
<?xml version="1.0" encoding="utf-8"?>

<ivy-module version="2.0">
<info organisation="org.openstreetmap" module="josm"/>
<configurations>
<conf name="groovy-scripts" description="Dependencies for Groovy scripts" />
<conf name="groovy-ant-task" description="Dependencies for Groovy scripts" />
<conf name="ivy" description="Apache Ivy configration for self-update" />
<!-- configuration that should be used when specifying dependencies -->
<conf name="implementation" description="All libs JOSM uses that plugins should not use" />
<conf name="api" description="All libs that JOSM uses and are available for plugins" />
<conf name="runtimeOnly" description="The libs shipped with JOSM that we do not need during compilation" />
<conf name="provided" description="The libs we need during compilation but not on application start" />
<conf name="epsg" description="Everything epsg needs- which is currently all of JOSM." />
<!-- Meta configuration used in build scripts -->
<conf name="runtime" description="Libraries only needed at runtime" extends="implementation,api,runtimeOnly"/>
<conf name="compile" description="Libraries needed only for compilation" extends="implementation,api,provided" />
<conf name="test" description="Libraries only needed for testing" extends="compile,runtime" />
</configurations>
<dependencies>
<dependency org="org.apache.ivy" name="ivy" rev="latest.release" conf="ivy->default" />
<!-- implementation -->
<dependency org="com.drewnoakes" name="metadata-extractor" rev="2.11.0" conf="implementation->default"/>
<dependency org="org.apache.commons" name="commons-compress" rev="1.12" conf="implementation->default"/>
<!-- api -->
<dependency org="oauth.signpost" name="signpost-core" rev="1.2.1.2" conf="api->default"/>
<dependency org="org.apache.commons" name="commons-jcs-core" rev="2.2" conf="api->default"/>
<dependency org="commons-logging" name="commons-logging" rev="1.2" conf="api->default"/>
<dependency org="javax.json" name="javax.json-api" rev="1.1.2" conf="api->default"/>
<dependency org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.6" conf="api->default" />
<!-- runtime only -->
<dependency org="org.glassfish" name="javax.json" rev="1.1.2" conf="runtimeOnly->default"/>
<!-- provided -->
<dependency org="com.github.spotbugs" name="spotbugs-annotations" rev="3.1.3" conf="provided->default"/>
<!-- tests -->
<dependency org="junit" name="junit" rev="4.12" conf="test->default"/>
<dependency org="com.github.stefanbirkner" name="system-rules" rev="1.16.0" conf="test->default"/>
<dependency org="nl.jqno.equalsverifier" name="equalsverifier" rev="2.4.6" conf="test->default"/>
<dependency org="com.google.code.findbugs" name="annotations" rev="3.0.1u2" conf="test->default"/>
<dependency org="org.easytesting" name="fest-reflect" rev="1.1" conf="test->default"/>
<dependency org="org.easytesting" name="fest-util" rev="1.0" conf="test->default"/>
<dependency org="org.easytesting" name="fest-assert" rev="1.0" conf="test->default"/>
<dependency org="org.easytesting" name="fest-swing" rev="1.2" conf="test->default"/>
<dependency org="org.unitils" name="unitils-core" rev="3.4.3" conf="test->default"/>
<dependency org="com.github.tomakehurst" name="wiremock" rev="2.12.0" conf="test->default" />
<dependency org="org.reflections" name="reflections" rev="0.9.11" conf="test->default"/>
<dependency org="net.trajano.commons" name="commons-testing" rev="2.1.0" conf="test->default"/>
<dependency org="org.awaitility" name="awaitility" rev="3.0.0" conf="test->default"/>
<!--
Something strange with groovy (under Eclipse):
using groovy-ant 2.4.15 & groovy-all 2.4.15 - fails on `java.lang.NoClassDefFoundError: org/apache/commons/cli/ParseException`
using groovy-ant 2.5.0 & groovy-all 2.5.0 - fails on `unable to resolve class CliBuilder `
using groovy-ant 2.4.15 & groovy-all 2.5.0 - fails on `java.lang.NoSuchMethodError: org.codehaus.groovy.runtime.memoize.EvictableCache.getAndPut(Ljava/lang/Object;Lorg/codehaus/groovy/runtime/memoize/MemoizeCache$ValueProvider;)Ljava/lang/Object;`
using groovy-ant 2.5.0 & groovy-all 2.4.15 - works
-->
<dependency org="org.codehaus.groovy" name="groovy-ant" rev="2.5.0" conf="groovy-ant-task->default" />
<dependency org="org.codehaus.groovy" name="groovy-all" rev="2.4.15" conf="groovy-scripts->default;test->default"/>
<dependency org="commons-cli" name="commons-cli" rev="1.4" conf="groovy-scripts->default"/>
</dependencies>
</ivy-module>
12 changes: 12 additions & 0 deletions ivysettings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<ivysettings>
<settings defaultResolver="chain"/>
<resolvers>
<chain name="chain">
<ibiblio name="central-maven-nexus" m2compatible="true" root="http://central.maven.org/maven2/" />
<ibiblio name="apache-nexus" m2compatible="true" root="https://repository.apache.org/content/repositories/snapshots/" />
<ibiblio name="josm-nexus" m2compatible="true" root="https://josm.openstreetmap.de/nexus/content/groups/public/" />
<ibiblio name="boundlessgeo-nexus" m2compatible="true" root="https://repo.boundlessgeo.com/main/" /> <!-- appbundler -->
<ibiblio name="atlassian-nexus" m2compatible="true" root="https://maven.atlassian.com/3rdparty/" /> <!-- xmltask -->
</chain>
</resolvers>
</ivysettings>
64 changes: 0 additions & 64 deletions src/org/apache/commons/compress/MemoryLimitException.java

This file was deleted.

40 changes: 0 additions & 40 deletions src/org/apache/commons/compress/PasswordRequiredException.java

This file was deleted.

61 changes: 0 additions & 61 deletions src/org/apache/commons/compress/archivers/ArchiveEntry.java

This file was deleted.

52 changes: 0 additions & 52 deletions src/org/apache/commons/compress/archivers/ArchiveException.java

This file was deleted.

Loading