diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 6686a64..8bbd082 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.0/apache-maven-3.9.0-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar \ No newline at end of file diff --git a/cmake-common/src/main/java/com/googlecode/cmakemavenproject/OperatingSystem.java b/cmake-common/src/main/java/com/googlecode/cmakemavenproject/OperatingSystem.java index 8e0971d..9cb3013 100644 --- a/cmake-common/src/main/java/com/googlecode/cmakemavenproject/OperatingSystem.java +++ b/cmake-common/src/main/java/com/googlecode/cmakemavenproject/OperatingSystem.java @@ -84,11 +84,11 @@ public String getClassifier() } /** - * Returns the fully-qualified path of the executable. + * Returns the fully qualified path of the executable. * * @param filename the filename of a binary * @param path the {@code PATH} environment variable - * @return the fully-qualified path of the executable + * @return the fully qualified path of the executable * @throws NullPointerException if any of the arguments are null * @throws FileNotFoundException if the binary could not be found */ @@ -98,7 +98,7 @@ public Path getExecutableOnPath(String filename, String path) throws FileNotFoun throw new NullPointerException("filename may not be null"); if (path == null) throw new NullPointerException("path may not be null"); - // Per https://stackoverflow.com/a/34061154/14731 it's easier to invoke a fully-qualified path + // Per https://stackoverflow.com/a/34061154/14731 it's easier to invoke a fully qualified path // than trying to quote command-line arguments properly. // https://stackoverflow.com/a/32827512/14731 shows how this can be done. String suffix = getExecutableSuffix(); @@ -292,7 +292,11 @@ public enum Architecture /** * ARM, 64-bit. */ - ARM_64; + ARM_64, + /** + * Unsupported architecture. + */ + UNSUPPORTED; private static final Reference DETECTED = ConcurrentLazyReference.create(() -> { @@ -318,12 +322,10 @@ public enum Architecture case "arm": case "arm32": return ARM_32; - case "arm64": case "aarch64": return ARM_64; default: - throw new AssertionError("Unsupported architecture: " + osArch + "\n" + - "properties: " + System.getProperties()); + return UNSUPPORTED; } }); @@ -361,25 +363,15 @@ String getEnvironmentCanonicalName(Map environment, String name) /** * Linux. */ - LINUX - { - @Override - String getEnvironmentCanonicalName(Map environment, String name) - { - return name; - } - }, + LINUX, /** * macOS. */ - MAC - { - @Override - String getEnvironmentCanonicalName(Map environment, String name) - { - return name; - } - }; + MAC, + /** + * Unsupported operating system. + */ + UNSUPPORTED; private static final Reference DETECTED = ConcurrentLazyReference.create(() -> { @@ -390,8 +382,7 @@ String getEnvironmentCanonicalName(Map environment, String name) return LINUX; if (startsWithIgnoreCase(osName, "mac")) return MAC; - throw new AssertionError("Unsupported operating system: " + osName + "\n" + - "properties: " + System.getProperties()); + return UNSUPPORTED; }); /** @@ -420,6 +411,9 @@ private static boolean startsWithIgnoreCase(String str, String prefix) * @param name an environment variable * @return the case-sensitive form of the variable */ - abstract String getEnvironmentCanonicalName(Map environment, String name); + String getEnvironmentCanonicalName(Map environment, String name) + { + return name; + } } -} +} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 69313ab..db56951 100644 --- a/pom.xml +++ b/pom.xml @@ -35,10 +35,10 @@ UTF-8 - 3.9.0 + 3.9.5 1.8 1.8 - 3.9.0 + 3.9.5 @@ -61,12 +61,12 @@ org.apache.maven.plugin-tools maven-plugin-annotations - 3.9.0 + 3.10.1 org.apache.commons commons-compress - 1.23.0 + 1.24.0 com.github.cowwoc.pouch @@ -86,7 +86,7 @@ com.google.guava guava - 32.1.2-jre + 32.1.3-jre @@ -96,7 +96,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.3.0 + 3.4.1 org.apache.maven.plugins @@ -111,7 +111,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.5.0 + 3.6.0 org.apache.maven.plugins @@ -121,7 +121,7 @@ org.apache.maven.plugins maven-plugin-plugin - 3.9.0 + 3.10.1 org.apache.maven.plugins @@ -131,7 +131,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.6.0 + 3.6.1 org.apache.maven.plugins @@ -141,7 +141,7 @@ org.apache.maven.plugins maven-clean-plugin - 3.3.1 + 3.3.2 org.apache.maven.plugins @@ -156,7 +156,7 @@ org.apache.maven.plugins maven-site-plugin - 4.0.0-M9 + 4.0.0-M11 org.apache.maven.plugins @@ -179,7 +179,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.3.0 + 3.4.1 enforce-maven @@ -433,7 +433,7 @@ maven-javadoc-plugin - 3.5.0 + 3.6.0 org.apache.maven.plugins