Index: trunk/.classpath =================================================================== --- trunk/.classpath (revision 19096) +++ (revision ) @@ -1,48 +1,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: trunk/.project =================================================================== --- trunk/.project (revision 19096) +++ (revision ) @@ -1,53 +1,0 @@ - - - JOSM - - - - - - sf.eclipse.javacc.javaccbuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.ui.externaltools.ExternalToolBuilder - full,incremental, - - - LaunchConfigHandle - <project>/.externalToolBuilders/revision.launch - - - - - net.sf.eclipsecs.core.CheckstyleBuilder - - - - - org.sonarlint.eclipse.core.sonarlintBuilder - - - - - net.sourceforge.pmd.eclipse.plugin.pmdBuilder - - - - - - org.sonarlint.eclipse.core.sonarlintNature - org.eclipse.jdt.core.javanature - org.sonar.ide.eclipse.core.sonarNature - sf.eclipse.javacc.javaccnature - net.sf.eclipsecs.core.CheckstyleNature - org.apache.ivyde.eclipse.ivynature - net.sourceforge.pmd.eclipse.plugin.pmdNature - - Index: trunk/nodist/pom.xml =================================================================== --- trunk/nodist/pom.xml (revision 19097) +++ trunk/nodist/pom.xml (revision 19097) @@ -0,0 +1,344 @@ + + + 4.0.0 + org.openstreetmap.josm + josm-parent + 1.0-SNAPSHOT + pom + + US-ASCII + US-ASCII + 11 + ${java.lang.version} + true + https://josm.openstreetmap.de/sonar/ + JOSM + 1.49.a + + + .. + + ../test/pom.xml + + + + JOSM-central + https://josm.openstreetmap.de/nexus/content/repositories/central/ + + + JOSM-releases + https://josm.openstreetmap.de/nexus/content/repositories/releases/ + + + JOSM-snapshots + https://josm.openstreetmap.de/nexus/content/repositories/snapshots/ + + + JOSM-osgeo + https://josm.openstreetmap.de/nexus/content/repositories/osgeo/ + + + + + JOSM-central + https://josm.openstreetmap.de/nexus/content/repositories/central/ + + + + + + + org.codehaus.mojo + javacc-maven-plugin + 3.1.0 + + + org.apache.maven.plugins + maven-clean-plugin + 3.3.2 + + + org.codehaus.mojo + exec-maven-plugin + 3.2.0 + + + org.apache.maven.plugins + maven-resources-plugin + 3.3.1 + + + org.apache.maven.plugins + maven-pmd-plugin + 3.22.0 + + + org.apache.maven.plugins + maven-surefire-plugin + 3.2.5 + + + com.github.spotbugs + spotbugs-maven-plugin + 4.8.5.0 + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.3.1 + + + + org.apache.maven.plugins + maven-shade-plugin + 3.5.3 + + + package + + shade + + + + + *:* + + + + META-INF/versions/* + META-INF/maven/** + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.4.1 + + + false + + + + + org.sonarsource.scanner.maven + sonar-maven-plugin + 3.7.0.1746 + + + + org.codehaus.mojo + buildnumber-maven-plugin + 3.2.0 + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + 3.4.1 + + + enforce-versions + + enforce + + + + + 3.6.3 + + + 8 + + + + + + + + org.apache.maven.plugins + maven-resources-plugin + 3.3.1 + + + copy-root-resources + generate-resources + + copy-resources + + + ${project.basedir}/target/classes + + + ${project.basedir} + + GPL-v2.0.txt + GPL-v3.0.txt + LICENSE + LICENSE.md + README + README.md + + + + + + + + + + + + + org.junit + junit-bom + 5.10.2 + pom + import + + + org.openstreetmap.jmapviewer + jmapviewer + 2.19 + provided + + + jakarta.json + jakarta.json-api + 2.1.3 + provided + + + org.eclipse.parsson + parsson + 1.1.6 + provided + + + org.apache.commons + commons-jcs3-core + 3.2 + provided + + + org.apache.commons + commons-compress + 1.26.1 + provided + + + jakarta.annotation + jakarta.annotation-api + 2.1.1 + provided + + + org.tukaani + xz + 1.9 + provided + + + com.adobe.xmp + xmpcore + 6.1.11 + provided + + + com.drewnoakes + metadata-extractor + 2.19.0 + provided + + + com.formdev + svgSalamander + 1.1.4 + provided + + + ch.poole + OpeningHoursParser + 0.28.2 + provided + + + + org.webjars.npm + tag2link + 2024.2.8 + provided + + + org.jacoco + org.jacoco.ant + 0.8.12 + test + + + org.jmockit + jmockit + ${jmockit.version} + test + + + com.github.spotbugs + spotbugs-annotations + 4.8.5 + test + + + com.ginsberg + junit5-system-exit + 1.1.2 + test + + + org.wiremock + wiremock + 3.6.0 + test + + + io.github.classgraph + classgraph + 4.8.172 + test + + + net.trajano.commons + commons-testing + 2.1.0 + test + + + nl.jqno.equalsverifier + equalsverifier + 3.16.1 + test + + + org.apache.commons + commons-lang3 + 3.14.0 + test + + + org.awaitility + awaitility + 4.2.1 + test + + + + Index: trunk/pom.xml =================================================================== --- trunk/pom.xml (revision 19097) +++ trunk/pom.xml (revision 19097) @@ -0,0 +1,763 @@ + + + 4.0.0 + josm + + org.openstreetmap.josm + josm-parent + 1.0-SNAPSHOT + ./nodist/pom.xml + + + josm + https://josm.openstreetmap.de + + ${project.basedir}/src + ${project.basedir}/test + ${project.basedir}/scripts + ${project.basedir}/build + ${project.basedir}/dist + ${project.basedir}/build2 + ${tools.dir}/checkstyle + ${src.dir}/org/openstreetmap/josm/gui/mappaint/mapcss + ${dist.dir}/modules + ${tools.dir}/pmd + ${project.basedir}/build2 + ${project.basedir}/resources + ${project.basedir}/build2 + ${tools.dir}/spotbugs + ${project.basedir}/tools + ${resources.dir}/data/projection/custom-epsg + ${tools.dir} + ${dist.dir}/josm-custom.jar + ${dist.dir}/josm-custom-optimized.jar + ${dist.dir}/josm-custom-sources.jar + org.openstreetmap.josm.* + false + false + on + **/*Test.class + **/*TestIT.class + UTF-8 + + jar + 2005 + + + GPL-2.0-or-later + https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html + repo + + + + JOSM + https://josm.openstreetmap.de + + + scm:svn:https://josm.openstreetmap.de/svn/trunk + https://josm.openstreetmap.de/browser/josm/trunk + + + Trac + https://josm.openstreetmap.de + + + + josm-dev + https://lists.openstreetmap.org/pipermail/josm-dev/ + josm-dev@openstreetmap.org + + + + + + org.jmockit + jmockit + + + + javax.json + javax.json-api + 1.1.4 + compile + + + org.glassfish + javax.json + 1.1.4 + compile + + + com.google.code.findbugs + jsr305 + 3.0.2 + compile + + + + org.openstreetmap.jmapviewer + jmapviewer + compile + + + jakarta.json + jakarta.json-api + compile + + + org.eclipse.parsson + parsson + runtime + + + org.apache.commons + commons-jcs3-core + compile + + + org.apache.commons + commons-compress + compile + + + jakarta.annotation + jakarta.annotation-api + compile + + + org.tukaani + xz + compile + + + com.adobe.xmp + xmpcore + compile + + + com.drewnoakes + metadata-extractor + compile + + + com.formdev + svgSalamander + compile + + + ch.poole + OpeningHoursParser + compile + + + + org.webjars.npm + tag2link + compile + + + org.jacoco + org.jacoco.ant + + + com.github.spotbugs + spotbugs-annotations + + + com.ginsberg + junit5-system-exit + + + org.wiremock + wiremock + + + io.github.classgraph + classgraph + + + org.junit.platform + junit-platform-launcher + test + + + org.junit.platform + junit-platform-suite + test + + + org.junit.vintage + junit-vintage-engine + test + + + org.junit.jupiter + junit-jupiter-params + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.junit.jupiter + junit-jupiter-engine + test + + + org.junit.jupiter + junit-jupiter-migrationsupport + test + + + net.trajano.commons + commons-testing + + + nl.jqno.equalsverifier + equalsverifier + + + org.apache.commons + commons-lang3 + + + org.awaitility + awaitility + + + + ${src.dir} + ${test.dir}/unit + ${scripts.src.dir} + + + ${resources.dir} + + + ${project.basedir} + + CONTRIBUTION + gpl-2.0.txt + gpl-3.0.txt + LICENSE + README + REVISION + + + + + + ${test.dir}/data + + + + + + org.codehaus.mojo + javacc-maven-plugin + + + javacc + + javacc + + + false + false + ${java.lang.version} + UTF-8 + true + ${src.dir} + ${src.dir} + **/MapCSSParser.jj + **/*.java + + + + + + + org.codehaus.mojo + exec-maven-plugin + + + + update-proj-reference-files + + test + org.openstreetmap.josm.data.projection.ProjectionRefTest + + + java + + + + + update-proj-regression-files + + test + org.openstreetmap.josm.data.projection.ProjectionRegressionTest + + + java + + + + + SyncEditorLayerIndex + + java + + -Djava.awt.headless=true + -classpath + + ${scripts.src.dir}/SyncEditorLayerIndex.java + ${basedir} + + + test + + + exec + + + + + epsg-touch + + java + + -Djava.awt.headless=true + -classpath + + ${basedir}/scripts/BuildProjectionDefinitions.java + ${basedir} + + + process-classes + + exec + + + + epsg + + java + + -Djava.awt.headless=true + -classpath + + ${basedir}/scripts/BuildProjectionDefinitions.java + ${basedir} + + + generate-test-resources + + exec + + + + + + + maven-resources-plugin + + + + copy-resources-epsg-touch + process-classes + + copy-resources + + + ${project.build.outputDirectory}/data/projection + + + ${resources.dir}/data/projection/ + + custom-epsg + + + + + + + copy-resources-epsg + generate-test-resources + + copy-resources + + + ${project.build.outputDirectory}/data/projection + + + ${resources.dir}/data/projection/ + + custom-epsg + + + + + + + + + + org.apache.maven.plugins + maven-pmd-plugin + + true + ${pmd.dir}/cache + java + ${java.lang.version} + + ${pmd.dir}/josm-ruleset.xml + + + **/*.java + + + org/openstreetmap/josm/gui/mappaint/mapcss/parsergen/*.java + + true + ${project.basedir} + + + + com.github.spotbugs + spotbugs-maven-plugin + + true + spotbugs-josm.xml + max + ${spotbugs.dir}/josm-filter.xml + org.openstreetmap.josm.- + LOW + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + ${checkstyle.dir}/josm_checks.xml + true + ${project.basedir}/checkstyle-josm.xml + + module-info.java,org/openstreetmap/josm/gui/mappaint/mapcss/parsergen/*.java + + + + validate + validate + + check + + + + + + + maven-surefire-plugin + + + **/*TestIT + + 1 + + + -javaagent:"${settings.localRepository}"/org/jmockit/jmockit/${jmockit.version}/jmockit-${jmockit.version}.jar + --add-opens java.base/java.io=ALL-UNNAMED + --add-opens java.base/java.lang=ALL-UNNAMED + --add-opens java.base/java.nio=ALL-UNNAMED + --add-opens java.base/java.text=ALL-UNNAMED + --add-opens java.base/java.util=ALL-UNNAMED + --add-opens java.base/jdk.internal.loader=ALL-UNNAMED + --add-opens java.desktop/java.awt=ALL-UNNAMED + --add-opens java.prefs/java.util.prefs=ALL-UNNAMED + + + + file.encoding = UTF-8 + java.locale.providers = SPI,CLDR + junit.jupiter.extensions.autodetection.enabled = true + junit.jupiter.execution.parallel.enabled = true + + + + ${test.dir}/config/josm.home + ${test.dir}/data + ${test.headless} + Monocle + Headless + sw + + + + + default-tests + test + + test + + + + integration-tests + integration-test + + test + + + **/*TestIT + + + + functional-tests + integration-test + + test + + + ${test.dir}/functional + + + + performance-tests + integration-test + + test + + + ${test.dir}/performance + + + + + + + org.apache.maven.plugins + maven-clean-plugin + + + + ${proj-build.dir} + + + ${build.dir} + + + ${script-build.dir} + + + ${checkstyle-build.dir} + + + ${dist.dir} + + + ${mapcss.dir}/parsergen + + + ${src.dir}/org/w3/_2001/xmlschema + + Adapter1.java + + + + ${src.dir}/org/openstreetmap/josm/data/imagery/types + + + + ${resources.dir}/data/projection/ + + custom-epsg + + + + ${pmd.dir} + + cache + + + + + + + org.codehaus.mojo + buildnumber-maven-plugin + + + validate + + create + + + + + false + + + + org.apache.maven.plugins + maven-shade-plugin + + + package + + shade + + + + + + org.webjars.npm:tag2link + + META-INF/resources/webjars/tag2link/*/LICENSE + META-INF/resources/webjars/tag2link/*/README.md + META-INF/resources/webjars/tag2link/*/build.js + META-INF/resources/webjars/tag2link/*/package.json + META-INF/resources/webjars/tag2link/*/schema.json + META-INF/resources/webjars/tag2link/*/tag2link.sophox.sparql + META-INF/resources/webjars/tag2link/*/tag2link.wikidata.sparql + + + + org.openstreetmap.jmapviewer:jmapviewer + + org/openstreetmap/gui/jmapviewer/Demo* + + + + com.drewnoakes:metadata-extractor + + com/drew/imaging/FileTypeDetector* + com/drew/imaging/ImageMetadataReader* + com/drew/imaging/avi/** + com/drew/imaging/bmp/** + com/drew/imaging/eps/** + com/drew/imaging/gif/** + com/drew/imaging/heif/** + com/drew/imaging/ico/** + com/drew/imaging/mp3/** + com/drew/imaging/mp4/** + com/drew/imaging/pcx/** + com/drew/imaging/psd/** + com/drew/imaging/quicktime/** + com/drew/imaging/raf/** + com/drew/imaging/riff/** + com/drew/imaging/wav/** + com/drew/imaging/webp/** + com/drew/metadata/avi/** + com/drew/metadata/bmp/** + com/drew/metadata/eps/** + com/drew/metadata/gif/** + com/drew/metadata/heif/** + com/drew/metadata/ico/** + com/drew/metadata/mov/** + com/drew/metadata/mp3/** + com/drew/metadata/mp4/** + com/drew/metadata/pcx/** + com/drew/metadata/wav/** + com/drew/metadata/webp/** + com/drew/tools/** + + + + com.formdev:svgSalamander + + com/kitfox/svg/app/ant/** + com/kitfox/svg/app/*Dialog* + com/kitfox/svg/app/*Frame* + com/kitfox/svg/app/*Player* + com/kitfox/svg/app/*Viewer* + + + + org.apache.commons:commons-compress + + org/apache/commons/compress/PasswordRequiredException* + org/apache/commons/compress/archivers/** + org/apache/commons/compress/changes/** + org/apache/commons/compress/compressors/bzip2/BZip2Utils* + org/apache/commons/compress/compressors/brotli/** + org/apache/commons/compress/compressors/CompressorStreamFactory* + org/apache/commons/compress/compressors/CompressorStreamProvider* + org/apache/commons/compress/compressors/CompressorException* + org/apache/commons/compress/compressors/FileNameUtil* + org/apache/commons/compress/compressors/deflate/** + org/apache/commons/compress/compressors/gzip/** + org/apache/commons/compress/compressors/lz4/** + org/apache/commons/compress/compressors/lzma/** + org/apache/commons/compress/compressors/lz77support/** + org/apache/commons/compress/compressors/pack200/** + org/apache/commons/compress/compressors/snappy/** + org/apache/commons/compress/compressors/xz/XZUtils* + org/apache/commons/compress/compressors/z/** + org/apache/commons/compress/compressors/zstandard/** + org/apache/commons/compress/java/util/jar/Pack200* + org/apache/commons/compress/harmony/pack200/** + org/apache/commons/compress/harmony/unpack200/** + org/apache/commons/compress/parallel/** + org/apache/commons/compress/utils/ArchiveUtils* + + + + org.apache.commons:commons-jcs3-core + + org/apache/commons/jcs3/auxiliary/disk/jdbc/** + org/apache/commons/jcs3/auxiliary/remote/http/client/** + org/apache/commons/jcs3/auxiliary/remote/http/server/RemoteHttpCacheServlet* + org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheStartupServlet* + org/apache/commons/jcs3/log/Log4j2Factory* + org/apache/commons/jcs3/log/Log4j2LogAdapter* + org/apache/commons/jcs3/utils/servlet/** + + + + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + org.openstreetmap.josm.gui.MainApplication + true + true + + + ${buildNumber} SVN + + ${timestamp} + all-permissions + josm.openstreetmap.de + JOSM - Java OpenStreetMap Editor + java.base/sun.security.action java.desktop/com.apple.eawt java.desktop/com.sun.imageio.spi java.desktop/com.sun.imageio.plugins.jpeg javafx.graphics/com.sun.javafx.application jdk.deploy/com.sun.deploy.config + java.base/java.lang java.base/java.nio java.base/jdk.internal.loader java.base/jdk.internal.ref java.desktop/javax.imageio.spi java.desktop/javax.swing.text.html java.prefs/java.util.prefs + true + true + + + + + + + Index: trunk/scripts/BuildProjectionDefinitions.java =================================================================== --- trunk/scripts/BuildProjectionDefinitions.java (revision 19096) +++ trunk/scripts/BuildProjectionDefinitions.java (revision 19097) @@ -14,4 +14,5 @@ import java.util.Map; import java.util.TreeMap; +import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -85,4 +86,17 @@ } + static boolean touchCustomEpsg(String baseDir) throws IOException { + final Path path = Paths.get(baseDir).resolve(OUTPUT_EPSG_FILE); + if (!Files.exists(path)) { + Files.createDirectories(path.getParent()); + Files.createFile(path); + Logger.getLogger(BuildProjectionDefinitions.class.getCanonicalName()) + .info("Could not generate custom-epsg; an empty custom-epsg file was not available on the classpath. " + + "This should now be fixed, please rerun the command."); + return true; + } + return false; + } + static void initMap(String baseDir, String file, Map map) throws IOException { final Path path = Paths.get(baseDir).resolve(PROJ_DIR).resolve(file); @@ -107,4 +121,7 @@ static void buildList(String baseDir) throws IOException { + if (touchCustomEpsg(baseDir)) { + return; + } initMap(baseDir, JOSM_EPSG_FILE, epsgJosm); initMap(baseDir, PROJ4_EPSG_FILE, epsgProj4); @@ -243,5 +260,5 @@ "EPSG:103474", // lcc/GRS80 - NAD_1983_CORS96_StatePlane_Nebraska_FIPS_2600 [NAD 1983 (CORS96) SPCS Nebraska] "EPSG:103475" // lcc/GRS80 - NAD_1983_CORS96_StatePlane_Nebraska_FIPS_2600_Ft_US [NAD 1983 (CORS96) SPCS Nebraska (US Feet)] - ).contains(pd.code)) { + ).contains(pd.code)) { result = false; } Index: trunk/test/pom.xml =================================================================== --- trunk/test/pom.xml (revision 19097) +++ trunk/test/pom.xml (revision 19097) @@ -0,0 +1,113 @@ + + + 4.0.0 + josm-unittest + 1.0-SNAPSHOT + + + org.openstreetmap.josm + josm-parent + 1.0-SNAPSHOT + ../nodist/pom.xml + + + UTF-8 + + + + org.openstreetmap.josm + josm + 1.0-SNAPSHOT + provided + + + org.jmockit + jmockit + compile + + + com.github.spotbugs + spotbugs-annotations + compile + + + com.ginsberg + junit5-system-exit + compile + + + org.wiremock + wiremock + compile + + + io.github.classgraph + classgraph + compile + + + org.junit.platform + junit-platform-launcher + compile + + + org.junit.platform + junit-platform-suite + compile + + + org.junit.vintage + junit-vintage-engine + compile + + + org.junit.jupiter + junit-jupiter-params + compile + + + org.junit.jupiter + junit-jupiter-api + compile + + + org.junit.jupiter + junit-jupiter-engine + compile + + + org.junit.jupiter + junit-jupiter-migrationsupport + compile + + + net.trajano.commons + commons-testing + compile + + + nl.jqno.equalsverifier + equalsverifier + compile + + + org.apache.commons + commons-lang3 + compile + + + org.awaitility + awaitility + compile + + + + + ${project.basedir}/unit + + + ${project.basedir}/data + + + +