Changeset 36293 in osm
- Timestamp:
- 2024-07-16T18:56:38+02:00 (6 weeks ago)
- Location:
- applications/viewer/jmapviewer
- Files:
-
- 3 added
- 2 deleted
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/viewer/jmapviewer
-
Property ReleaseVersion
changed from
2.19
to2.20
-
Property ReleaseVersion
changed from
-
applications/viewer/jmapviewer/build.xml
r36225 r36293 3 3 xmlns:jacoco="antlib:org.jacoco.ant" 4 4 xmlns:if="ant:if" 5 xmlns: ivy="antlib:org.apache.ivy.ant"5 xmlns:mvn="antlib:org.apache.maven.resolver.ant" 6 6 > 7 7 8 8 <property name="java.lang.version" value="8" /> 9 9 <dirname property="base.dir" file="${ant.file.jmapviewer}"/> 10 <property name="maven.artifact.resolver.version" value="1.5.1"/> 11 <property name="maven.artifact.resolver.parent.dir" value="${user.home}/.m2/repository/org/apache/maven/resolver/maven-resolver-ant-tasks/${maven.artifact.resolver.version}/"/> 10 12 <property name="jacoco.includes" value="org.openstreetmap.gui.jmapviewer.*" /> 11 13 <property name="jacoco.inclbootstrapclasses" value="false" /> … … 73 75 </target> 74 76 75 <target name="checkdepsupdate" depends="resolve">76 <ivy:checkdepsupdate/>77 </target>78 79 77 <target name="svn_info" description="Get SVN info for use in JAR/ZIP filenames."> 80 78 <!-- Get the svn ReleaseVersion property --> … … 168 166 </target> 169 167 170 <target name="resolve" description="Resolve Ivy dependencies"> 171 <ivy:resolve/> 172 <ivy:cachepath pathid="checkstyle.classpath" conf="checkstyle"/> 173 <ivy:cachepath pathid="testlib.classpath" conf="test"/> 174 <ivy:cachepath pathid="jacoco.classpath" conf="jacocoant"/> 175 <ivy:cachepath pathid="spotbugs.classpath" conf="spotbugs"/> 168 <target name="download-artifact-resolver"> 169 <mkdir dir="${maven.artifact.resolver.parent.dir}"/> 170 <get src="https://repo1.maven.org/maven2/org/apache/maven/resolver/maven-resolver-ant-tasks/${maven.artifact.resolver.version}/maven-resolver-ant-tasks-${maven.artifact.resolver.version}-uber.jar" 171 dest="${maven.artifact.resolver.parent.dir}/maven-resolver-ant-tasks-${maven.artifact.resolver.version}-uber.jar" 172 usetimestamp="true" /> 173 </target> 174 <target name="init-maven" depends="download-artifact-resolver"> 175 <path id="maven.lib.path"> 176 <fileset dir="${maven.artifact.resolver.parent.dir}" includes="maven-resolver-ant-tasks-${maven.artifact.resolver.version}-uber.jar"/> 177 </path> 178 <taskdef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml" classpathref="maven.lib.path"/> 179 </target> 180 <target name="resolve" depends="init-maven" description="Resolve Maven dependencies"> 181 <mvn:pom file="pom.xml"/> 182 <!-- This stanza is necessary since the maven resolver doesn't read repo settings from the pom.xml file --> 183 <!-- resolver.repositories makes it global --> 184 <mvn:remoterepos id="resolver.repositories"> 185 <mvn:remoterepo id="JOSM-central" url="https://josm.openstreetmap.de/nexus/content/repositories/central/" /> 186 </mvn:remoterepos> 187 <mvn:resolve> 188 <mvn:path refid="testlib.classpath" classpath="test"/> 189 </mvn:resolve> 190 <mvn:resolve> 191 <mvn:dependencies> 192 <mvn:dependency groupId="org.jacoco" artifactId="org.jacoco.ant" version="${pom.properties.version.maven.jacoco}" classifier="nodeps" type="jar" scope="test"/> 193 </mvn:dependencies> 194 <mvn:path refid="jacoco.classpath" classpath="test"/> 195 </mvn:resolve> 196 <mvn:resolve> 197 <mvn:dependencies> 198 <mvn:dependency groupId="com.puppycrawl.tools" artifactId="checkstyle" version="${pom.properties.version.maven.checkstyle}" scope="compile"/> 199 </mvn:dependencies> 200 <mvn:path refid="checkstyle.classpath" classpath="compile"/> 201 </mvn:resolve> 202 <mvn:resolve> 203 <mvn:dependencies> 204 <mvn:dependency groupId="com.github.spotbugs" artifactId="spotbugs" version="${pom.properties.version.maven.spotbugs}" scope="compile"/> 205 <mvn:dependency groupId="com.github.spotbugs" artifactId="spotbugs-ant" version="${pom.properties.version.maven.spotbugs}" scope="compile"/> 206 </mvn:dependencies> 207 <mvn:path refid="spotbugs.classpath" classpath="compile"/> 208 </mvn:resolve> 176 209 </target> 177 210 -
applications/viewer/jmapviewer/pom.xml
r36223 r36293 6 6 <groupId>org.openstreetmap.jmapviewer</groupId> 7 7 <artifactId>jmapviewer</artifactId> 8 <version>2. 19-SNAPSHOT</version>8 <version>2.20</version> 9 9 10 10 <name>JMapViewer</name> … … 13 13 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> 14 14 <maven.compiler.release>8</maven.compiler.release> 15 <version.maven.spotbugs>4.8.1.0</version.maven.spotbugs> 16 <version.maven.jacoco>0.8.11</version.maven.jacoco> 15 <version.maven.spotbugs>4.8.6</version.maven.spotbugs> 16 <version.maven.jacoco>0.8.12</version.maven.jacoco> 17 <version.maven.checkstyle>9.3</version.maven.checkstyle> 17 18 <sonar.host.url>https://josm.openstreetmap.de/sonar</sonar.host.url> 18 19 <sonar.projectKey>jmapviewer</sonar.projectKey> … … 79 80 </distributionManagement> 80 81 82 <repositories> 83 <repository> 84 <id>JOSM-central</id> 85 <url>https://josm.openstreetmap.de/nexus/content/repositories/central/</url> 86 </repository> 87 </repositories> 88 <pluginRepositories> 89 <pluginRepository> 90 <id>JOSM-central</id> 91 <url>https://josm.openstreetmap.de/nexus/content/repositories/central/</url> 92 </pluginRepository> 93 </pluginRepositories> 94 81 95 <dependencyManagement> 82 96 <dependencies> … … 95 109 <groupId>com.github.spotbugs</groupId> 96 110 <artifactId>spotbugs-annotations</artifactId> 97 <version> 4.8.3</version>111 <version>${version.maven.spotbugs}</version> 98 112 <scope>test</scope> 99 113 </dependency> … … 143 157 <groupId>org.apache.maven.plugins</groupId> 144 158 <artifactId>maven-jar-plugin</artifactId> 145 <version>3. 3.0</version>159 <version>3.4.2</version> 146 160 <configuration> 147 161 <outputDirectory>releases/${project.version}</outputDirectory> … … 151 165 <groupId>org.apache.maven.plugins</groupId> 152 166 <artifactId>maven-source-plugin</artifactId> 153 <version>3.3. 0</version>167 <version>3.3.1</version> 154 168 <configuration> 155 169 <outputDirectory>releases/${project.version}</outputDirectory> … … 168 182 <groupId>org.apache.maven.plugins</groupId> 169 183 <artifactId>maven-compiler-plugin</artifactId> 170 <version>3.1 1.0</version>184 <version>3.13.0</version> 171 185 <executions> 172 186 <execution> … … 213 227 <groupId>com.github.spotbugs</groupId> 214 228 <artifactId>spotbugs-maven-plugin</artifactId> 215 <version> ${version.maven.spotbugs}</version>229 <version>4.8.6.2</version> 216 230 <configuration> 217 231 <xmlOutput>true</xmlOutput> … … 234 248 <groupId>org.apache.maven.plugins</groupId> 235 249 <artifactId>maven-checkstyle-plugin</artifactId> 236 <version>3. 3.1</version>250 <version>3.4.0</version> 237 251 <configuration> 238 252 <configLocation>${project.basedir}/tools/checkstyle/jmapviewer_checks.xml</configLocation> … … 242 256 <excludes>module-info.java</excludes> 243 257 </configuration> 258 <dependencies> 259 <dependency> 260 <groupId>com.puppycrawl.tools</groupId> 261 <artifactId>checkstyle</artifactId> 262 <version>${version.maven.checkstyle}</version> 263 </dependency> 264 </dependencies> 244 265 <executions> 245 266 <execution> … … 252 273 </executions> 253 274 </plugin> 275 <plugin> 276 <groupId>org.apache.maven.plugins</groupId> 277 <artifactId>maven-enforcer-plugin</artifactId> 278 <version>3.5.0</version> 279 <executions> 280 <execution> 281 <id>enforce-maven</id> 282 <goals> 283 <goal>enforce</goal> 284 </goals> 285 <configuration> 286 <rules> 287 <requireMavenVersion> 288 <version>3.6.3</version> 289 </requireMavenVersion> 290 </rules> 291 </configuration> 292 </execution> 293 </executions> 294 </plugin> 254 295 </plugins> 255 296 </build> … … 260 301 <groupId>org.apache.maven.plugins</groupId> 261 302 <artifactId>maven-surefire-report-plugin</artifactId> 262 <version>3. 2.3</version>303 <version>3.3.1</version> 263 304 </plugin> 264 305 <plugin>
Note:
See TracChangeset
for help on using the changeset viewer.