| 1 |
|
|---|
| 2 | C:\josm\plugins\pbf>svn diff
|
|---|
| 3 | Index: ivy.xml
|
|---|
| 4 | ===================================================================
|
|---|
| 5 | --- ivy.xml (revision 35609)
|
|---|
| 6 | +++ ivy.xml (working copy)
|
|---|
| 7 | @@ -1,6 +1,7 @@
|
|---|
| 8 | <ivy-module version="2.0">
|
|---|
| 9 | <info organisation="org.openstreetmap.josm.plugins" module="pbf"/>
|
|---|
| 10 | <dependencies>
|
|---|
| 11 | - <dependency conf="default->default" org="org.openstreetmap.pbf" name="osmpbf" rev="1.4.0"/>
|
|---|
| 12 | - </dependencies>
|
|---|
| 13 | + <dependency conf="default->default" org="com.google.protobuf" name="protobuf-javalite" rev="3.13.0"/>
|
|---|
| 14 | + <dependency conf="default->default" org="org.openstreetmap.pbf" name="osmpbf" rev="1.5.0-SNAPSHOT"/>
|
|---|
| 15 | + </dependencies>
|
|---|
| 16 | </ivy-module>
|
|---|
| 17 | Index: ivy_settings.xml
|
|---|
| 18 | ===================================================================
|
|---|
| 19 | --- ivy_settings.xml (revision 35609)
|
|---|
| 20 | +++ ivy_settings.xml (working copy)
|
|---|
| 21 | @@ -1,7 +1,15 @@
|
|---|
| 22 | -<?xml version="1.0" encoding="utf-8"?>
|
|---|
| 23 | -<ivysettings>
|
|---|
| 24 | - <settings defaultResolver="josm-nexus"/>
|
|---|
| 25 | - <resolvers>
|
|---|
| 26 | - <ibiblio name="josm-nexus" m2compatible="true" root="https://josm.openstreetmap.de/nexus/content/repositories/public/" />
|
|---|
| 27 | - </resolvers>
|
|---|
| 28 | -</ivysettings>
|
|---|
| 29 | +<?xml version="1.0" encoding="utf-8"?>
|
|---|
| 30 | +<ivysettings>
|
|---|
| 31 | + <settings defaultResolver="chain-resolver"/>
|
|---|
| 32 | + <resolvers>
|
|---|
| 33 | + <chain name="chain-resolver">
|
|---|
| 34 | + <filesystem name="osmpbf-snapshot">
|
|---|
| 35 | + <ivy
|
|---|
| 36 | + pattern= "f:\dwnload\temp\[artifact]-[revision].[ext]" />
|
|---|
| 37 | + <artifact
|
|---|
| 38 | + pattern= "f:\dwnload\temp\[artifact]-[revision].[ext]" />
|
|---|
| 39 | + </filesystem>
|
|---|
| 40 | + <ibiblio name="josm-nexus" m2compatible="true" root="https://josm.openstreetmap.de/nexus/content/repositories/public/" />
|
|---|
| 41 | + </chain>
|
|---|
| 42 | + </resolvers>
|
|---|
| 43 | +</ivysettings>
|
|---|
| 44 |
|
|---|
| 45 | C:\josm\plugins\pbf>ant clean test
|
|---|
| 46 | Buildfile: C:\josm\plugins\pbf\build.xml
|
|---|
| 47 |
|
|---|
| 48 | clean:
|
|---|
| 49 | [delete] Deleting directory C:\josm\plugins\pbf\build
|
|---|
| 50 |
|
|---|
| 51 | init:
|
|---|
| 52 | [mkdir] Created dir: C:\josm\plugins\pbf\build
|
|---|
| 53 |
|
|---|
| 54 | clean_ivy:
|
|---|
| 55 |
|
|---|
| 56 | download-ivy:
|
|---|
| 57 | [get] Getting: https://josm.openstreetmap.de/nexus/content/repositories/public/org/apache/ivy/ivy/2.5.0/ivy-2.5.0.jar
|
|---|
| 58 | [get] To: C:\Users\Gerd\.ant\lib\ivy.jar
|
|---|
| 59 | [get] Not modified - so not downloaded
|
|---|
| 60 |
|
|---|
| 61 | init-ivy:
|
|---|
| 62 |
|
|---|
| 63 | fetch_dependencies:
|
|---|
| 64 | [echo] fetching dependencies with ivy
|
|---|
| 65 | [ivy:resolve] :: Apache Ivy 2.5.0 - 20191020104435 :: https://ant.apache.org/ivy/ ::
|
|---|
| 66 | [ivy:resolve] :: loading settings :: file = C:\josm\plugins\pbf\ivy_settings.xml
|
|---|
| 67 | [ivy:resolve] :: resolving dependencies :: org.openstreetmap.josm.plugins#pbf;working@Gerd-PC
|
|---|
| 68 | [ivy:resolve] confs: [default]
|
|---|
| 69 | [ivy:resolve] found com.google.protobuf#protobuf-javalite;3.13.0 in josm-nexus
|
|---|
| 70 | [ivy:resolve] found org.openstreetmap.pbf#osmpbf;1.5.0-SNAPSHOT in osmpbf-snapshot
|
|---|
| 71 | [ivy:resolve] :: resolution report :: resolve 81ms :: artifacts dl 7ms
|
|---|
| 72 | ---------------------------------------------------------------------
|
|---|
| 73 | | | modules || artifacts |
|
|---|
| 74 | | conf | number| search|dwnlded|evicted|| number|dwnlded|
|
|---|
| 75 | ---------------------------------------------------------------------
|
|---|
| 76 | | default | 2 | 0 | 0 | 0 || 2 | 0 |
|
|---|
| 77 | ---------------------------------------------------------------------
|
|---|
| 78 | [ivy:retrieve] :: retrieving :: org.openstreetmap.josm.plugins#pbf
|
|---|
| 79 | [ivy:retrieve] confs: [default]
|
|---|
| 80 | [ivy:retrieve] 2 artifacts copied, 0 already retrieved (814kB/8ms)
|
|---|
| 81 |
|
|---|
| 82 | pre-compile:
|
|---|
| 83 |
|
|---|
| 84 | resolve-tools:
|
|---|
| 85 | [ivy:resolve] :: resolving dependencies :: org.openstreetmap#josm;working@Gerd-PC
|
|---|
| 86 | [ivy:resolve] confs: [javacc, checkstyle, proguard, pmd, spotbugs, errorprone, errorprone_javac]
|
|---|
| 87 | [ivy:resolve] found net.java.dev.javacc#javacc;7.0.9 in chain-resolver
|
|---|
| 88 | [ivy:resolve] found junit#junit;3.8.1 in chain-resolver
|
|---|
| 89 | [ivy:resolve] found com.puppycrawl.tools#checkstyle;8.31 in chain-resolver
|
|---|
| 90 | [ivy:resolve] found info.picocli#picocli;4.2.0 in chain-resolver
|
|---|
| 91 | [ivy:resolve] found antlr#antlr;2.7.7 in chain-resolver
|
|---|
| 92 | [ivy:resolve] found org.antlr#antlr4-runtime;4.8-1 in chain-resolver
|
|---|
| 93 | [ivy:resolve] found commons-beanutils#commons-beanutils;1.9.4 in chain-resolver
|
|---|
| 94 | [ivy:resolve] found commons-logging#commons-logging;1.2 in chain-resolver
|
|---|
| 95 | [ivy:resolve] found commons-collections#commons-collections;3.2.2 in chain-resolver
|
|---|
| 96 | [ivy:resolve] found com.google.guava#guava;28.2-jre in chain-resolver
|
|---|
| 97 | [ivy:resolve] found com.google.guava#failureaccess;1.0.1 in chain-resolver
|
|---|
| 98 | [ivy:resolve] found com.google.guava#listenablefuture;9999.0-empty-to-avoid-conflict-with-guava in chain-resolver
|
|---|
| 99 | [ivy:resolve] found com.google.code.findbugs#jsr305;3.0.2 in chain-resolver
|
|---|
| 100 | [ivy:resolve] found org.checkerframework#checker-qual;2.10.0 in chain-resolver
|
|---|
| 101 | [ivy:resolve] found com.google.errorprone#error_prone_annotations;2.3.4 in chain-resolver
|
|---|
| 102 | [ivy:resolve] found com.google.j2objc#j2objc-annotations;1.3 in chain-resolver
|
|---|
| 103 | [ivy:resolve] found net.sf.saxon#Saxon-HE;9.9.1-7 in chain-resolver
|
|---|
| 104 | [ivy:resolve] found net.sf.proguard#proguard-anttask;6.2.2 in chain-resolver
|
|---|
| 105 | [ivy:resolve] found net.sf.proguard#proguard-base;6.2.2 in chain-resolver
|
|---|
| 106 | [ivy:resolve] found net.sourceforge.pmd#pmd-core;6.20.0 in chain-resolver
|
|---|
| 107 | [ivy:resolve] found org.antlr#antlr4-runtime;4.7 in chain-resolver
|
|---|
| 108 | [ivy:resolve] found com.beust#jcommander;1.72 in chain-resolver
|
|---|
| 109 | [ivy:resolve] found commons-io#commons-io;2.6 in chain-resolver
|
|---|
| 110 | [ivy:resolve] found net.java.dev.javacc#javacc;5.0 in chain-resolver
|
|---|
| 111 | [ivy:resolve] found net.sourceforge.saxon#saxon;9.1.0.8 in chain-resolver
|
|---|
| 112 | [ivy:resolve] found org.apache.commons#commons-lang3;3.8.1 in chain-resolver
|
|---|
| 113 | [ivy:resolve] found org.ow2.asm#asm;7.1 in chain-resolver
|
|---|
| 114 | [ivy:resolve] found com.google.code.gson#gson;2.8.5 in chain-resolver
|
|---|
| 115 | [ivy:resolve] found net.sourceforge.pmd#pmd-java;6.20.0 in chain-resolver
|
|---|
| 116 | [ivy:resolve] found com.github.spotbugs#spotbugs;4.0.1 in chain-resolver
|
|---|
| 117 | [ivy:resolve] found org.ow2.asm#asm;7.3.1 in chain-resolver
|
|---|
| 118 | [ivy:resolve] found org.ow2.asm#asm-analysis;7.3.1 in chain-resolver
|
|---|
| 119 | [ivy:resolve] found org.ow2.asm#asm-tree;7.3.1 in chain-resolver
|
|---|
| 120 | [ivy:resolve] found org.ow2.asm#asm-commons;7.3.1 in chain-resolver
|
|---|
| 121 | [ivy:resolve] found org.ow2.asm#asm-util;7.3.1 in chain-resolver
|
|---|
| 122 | [ivy:resolve] found org.apache.bcel#bcel;6.4.1 in chain-resolver
|
|---|
| 123 | [ivy:resolve] found net.jcip#jcip-annotations;1.0 in chain-resolver
|
|---|
| 124 | [ivy:resolve] found org.dom4j#dom4j;2.1.1 in chain-resolver
|
|---|
| 125 | [ivy:resolve] found commons-lang#commons-lang;2.6 in chain-resolver
|
|---|
| 126 | [ivy:resolve] found org.slf4j#slf4j-api;1.8.0-beta4 in chain-resolver
|
|---|
| 127 | [ivy:resolve] found com.github.spotbugs#spotbugs-annotations;4.0.1 in chain-resolver
|
|---|
| 128 | [ivy:resolve] found jaxen#jaxen;1.1.6 in chain-resolver
|
|---|
| 129 | [ivy:resolve] found net.sf.saxon#Saxon-HE;9.9.1-2 in chain-resolver
|
|---|
| 130 | [ivy:resolve] found com.ibm.icu#icu4j;63.1 in chain-resolver
|
|---|
| 131 | [ivy:resolve] found com.github.spotbugs#spotbugs-ant;4.0.1 in chain-resolver
|
|---|
| 132 | [ivy:resolve] found com.google.errorprone#error_prone_core;2.4.0 in chain-resolver
|
|---|
| 133 | [ivy:resolve] found com.google.errorprone#error_prone_annotation;2.4.0 in chain-resolver
|
|---|
| 134 | [ivy:resolve] found com.google.guava#guava;27.0.1-jre in chain-resolver
|
|---|
| 135 | [ivy:resolve] found org.checkerframework#checker-qual;2.5.2 in chain-resolver
|
|---|
| 136 | [ivy:resolve] found com.google.j2objc#j2objc-annotations;1.1 in chain-resolver
|
|---|
| 137 | [ivy:resolve] found org.codehaus.mojo#animal-sniffer-annotations;1.17 in chain-resolver
|
|---|
| 138 | [ivy:resolve] found com.google.errorprone#error_prone_type_annotations;2.4.0 in chain-resolver
|
|---|
| 139 | [ivy:resolve] found com.google.errorprone#error_prone_check_api;2.4.0 in chain-resolver
|
|---|
| 140 | [ivy:resolve] found com.google.code.findbugs#jsr305;3.0.0 in chain-resolver
|
|---|
| 141 | [ivy:resolve] found org.checkerframework#dataflow-shaded;3.1.2 in chain-resolver
|
|---|
| 142 | [ivy:resolve] found com.google.errorprone#javac;9+181-r4173-1 in chain-resolver
|
|---|
| 143 | [ivy:resolve] found com.googlecode.java-diff-utils#diffutils;1.3.0 in chain-resolver
|
|---|
| 144 | [ivy:resolve] found com.google.auto.value#auto-value-annotations;1.7 in chain-resolver
|
|---|
| 145 | [ivy:resolve] found com.google.errorprone#error_prone_annotations;2.4.0 in chain-resolver
|
|---|
| 146 | [ivy:resolve] found com.github.kevinstern#software-and-algorithms;1.0 in chain-resolver
|
|---|
| 147 | [ivy:resolve] found com.github.ben-manes.caffeine#caffeine;2.8.0 in chain-resolver
|
|---|
| 148 | [ivy:resolve] found org.pcollections#pcollections;2.1.2 in chain-resolver
|
|---|
| 149 | [ivy:resolve] found com.google.auto#auto-common;0.10 in chain-resolver
|
|---|
| 150 | [ivy:resolve] found com.google.code.findbugs#jFormatString;3.0.0 in chain-resolver
|
|---|
| 151 | [ivy:resolve] found com.google.protobuf#protobuf-java;3.4.0 in chain-resolver
|
|---|
| 152 | [ivy:resolve] found com.google.auto.service#auto-service-annotations;1.0-rc6 in chain-resolver
|
|---|
| 153 | [ivy:resolve] found org.threeten#threeten-extra;1.5.0 in chain-resolver
|
|---|
| 154 | [ivy:resolve] :: resolution report :: resolve 1113ms :: artifacts dl 104ms
|
|---|
| 155 | [ivy:resolve] :: evicted modules:
|
|---|
| 156 | [ivy:resolve] com.google.code.findbugs#jsr305;3.0.2 by [com.google.code.findbugs#jsr305;3.0.0] in [errorprone]
|
|---|
| 157 | [ivy:resolve] org.checkerframework#checker-qual;2.5.2 by [org.checkerframework#checker-qual;2.10.0] in [errorprone]
|
|---|
| 158 | [ivy:resolve] com.google.errorprone#error_prone_annotations;2.2.0 by [com.google.errorprone#error_prone_annotations;2.4.0] in [errorprone]
|
|---|
| 159 | [ivy:resolve] com.google.errorprone#error_prone_annotations;2.3.3 by [com.google.errorprone#error_prone_annotations;2.4.0] in [errorprone]
|
|---|
| 160 | [ivy:resolve] com.google.guava#guava;23.5-jre by [com.google.guava#guava;27.0.1-jre] in [errorprone]
|
|---|
| 161 | ---------------------------------------------------------------------
|
|---|
| 162 | | | modules || artifacts |
|
|---|
| 163 | | conf | number| search|dwnlded|evicted|| number|dwnlded|
|
|---|
| 164 | ---------------------------------------------------------------------
|
|---|
| 165 | | javacc | 2 | 0 | 0 | 0 || 2 | 0 |
|
|---|
| 166 | | checkstyle | 15 | 0 | 0 | 0 || 15 | 0 |
|
|---|
| 167 | | proguard | 2 | 0 | 0 | 0 || 2 | 0 |
|
|---|
| 168 | | pmd | 10 | 0 | 0 | 0 || 11 | 0 |
|
|---|
| 169 | | spotbugs | 17 | 0 | 0 | 0 || 17 | 0 |
|
|---|
| 170 | | errorprone | 29 | 0 | 0 | 5 || 24 | 0 |
|
|---|
| 171 | | errorprone_javac | 1 | 0 | 0 | 0 || 1 | 0 |
|
|---|
| 172 | ---------------------------------------------------------------------
|
|---|
| 173 |
|
|---|
| 174 | compile:
|
|---|
| 175 | [echo] compiling sources for C:\josm\dist\pbf.jar ...
|
|---|
| 176 | [javac] Compiling 8 source files to C:\josm\plugins\pbf\build
|
|---|
| 177 | [javac] C:\josm\plugins\pbf\src\org\openstreetmap\josm\plugins\pbf\io\PbfReader.java:77: error: [ProtoFieldNullComparison] Protobuf fields cannot be null.
|
|---|
| 178 | [javac] if (bbox != null) {
|
|---|
| 179 | [javac] ^
|
|---|
| 180 | [javac] (see https://errorprone.info/bugpattern/ProtoFieldNullComparison)
|
|---|
| 181 | [javac] Did you mean 'if (header.hasBbox()) {'?
|
|---|
| 182 | [javac] 1 error
|
|---|
| 183 |
|
|---|
| 184 | BUILD FAILED
|
|---|
| 185 | C:\josm\plugins\build-common.xml:116: Compile failed; see the compiler error output for details.
|
|---|
| 186 |
|
|---|
| 187 | Total time: 5 seconds
|
|---|
| 188 |
|
|---|
| 189 | C:\josm\plugins\pbf>
|
|---|
