Merge branch 'main' into moditect-206

moditect · Mar 20, 2024 · 7b455a5 · 7b455a5
2 parents 16a2a37 + 25ef0e4
commit 7b455a5
Show file tree

Hide file tree

Showing 61 changed files with 216 additions and 712 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -1,19 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-     Copyright 2017 - 2023 The ModiTect authors
+     SPDX-License-Identifier: Apache-2.0
 
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
+     Copyright The original authors
 
-         http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
+     Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -27,7 +19,6 @@
     </parent>
 
     <artifactId>moditect</artifactId>
-    <packaging>jar</packaging>
     <name>ModiTect</name>
     <url>https://github.com/moditect/moditect</url>
     <description>Module system tooling</description>
@@ -42,9 +33,9 @@
             <artifactId>asm</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.beust</groupId>
+            <groupId>org.jcommander</groupId>
             <artifactId>jcommander</artifactId>
-            <version>1.82</version>
+            <version>1.83</version>
         </dependency>
 
         <!-- Test -->

diff --git a/core/src/main/java/org/moditect/Moditect.java b/core/src/main/java/org/moditect/Moditect.java
@@ -1,17 +1,9 @@
 /*
- *  Copyright 2017 - 2023 The ModiTect authors
+ *  SPDX-License-Identifier: Apache-2.0
  *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ *  Copyright The original authors
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ *  Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
  */
 package org.moditect;
 

diff --git a/core/src/main/java/org/moditect/commands/AddModuleInfo.java b/core/src/main/java/org/moditect/commands/AddModuleInfo.java
@@ -1,17 +1,9 @@
 /*
- *  Copyright 2017 - 2023 The ModiTect authors
+ *  SPDX-License-Identifier: Apache-2.0
  *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ *  Copyright The original authors
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ *  Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
  */
 package org.moditect.commands;
 

diff --git a/core/src/main/java/org/moditect/commands/CreateRuntimeImage.java b/core/src/main/java/org/moditect/commands/CreateRuntimeImage.java
@@ -1,17 +1,9 @@
 /*
- *  Copyright 2017 - 2023 The ModiTect authors
+ *  SPDX-License-Identifier: Apache-2.0
  *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ *  Copyright The original authors
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ *  Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
  */
 package org.moditect.commands;
 

diff --git a/core/src/main/java/org/moditect/commands/GenerateModuleInfo.java b/core/src/main/java/org/moditect/commands/GenerateModuleInfo.java
@@ -1,17 +1,9 @@
 /*
- *  Copyright 2017 - 2023 The ModiTect authors
+ *  SPDX-License-Identifier: Apache-2.0
  *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ *  Copyright The original authors
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ *  Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
  */
 package org.moditect.commands;
 

diff --git a/core/src/main/java/org/moditect/commands/GenerateModuleList.java b/core/src/main/java/org/moditect/commands/GenerateModuleList.java
@@ -1,17 +1,9 @@
 /*
- *  Copyright 2017 - 2023 The ModiTect authors
+ *  SPDX-License-Identifier: Apache-2.0
  *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ *  Copyright The original authors
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ *  Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
  */
 package org.moditect.commands;
 

diff --git a/core/src/main/java/org/moditect/internal/analyzer/ServiceLoaderUseScanner.java b/core/src/main/java/org/moditect/internal/analyzer/ServiceLoaderUseScanner.java
@@ -1,17 +1,9 @@
 /*
- *  Copyright 2017 - 2023 The ModiTect authors
+ *  SPDX-License-Identifier: Apache-2.0
  *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ *  Copyright The original authors
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ *  Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
  */
 package org.moditect.internal.analyzer;
 

diff --git a/core/src/main/java/org/moditect/internal/command/LogWriter.java b/core/src/main/java/org/moditect/internal/command/LogWriter.java
@@ -1,17 +1,9 @@
 /*
- *  Copyright 2017 - 2023 The ModiTect authors
+ *  SPDX-License-Identifier: Apache-2.0
  *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ *  Copyright The original authors
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ *  Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
  */
 package org.moditect.internal.command;
 

diff --git a/core/src/main/java/org/moditect/internal/command/ProcessExecutor.java b/core/src/main/java/org/moditect/internal/command/ProcessExecutor.java
@@ -1,17 +1,9 @@
 /*
- *  Copyright 2017 - 2023 The ModiTect authors
+ *  SPDX-License-Identifier: Apache-2.0
  *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ *  Copyright The original authors
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ *  Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
  */
 package org.moditect.internal.command;
 

diff --git a/core/src/main/java/org/moditect/internal/compiler/ModuleInfoCompiler.java b/core/src/main/java/org/moditect/internal/compiler/ModuleInfoCompiler.java
@@ -1,17 +1,9 @@
 /*
- *  Copyright 2017 - 2023 The ModiTect authors
+ *  SPDX-License-Identifier: Apache-2.0
  *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ *  Copyright The original authors
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ *  Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
  */
 package org.moditect.internal.compiler;
 

diff --git a/core/src/main/java/org/moditect/internal/parser/JavaVersionHelper.java b/core/src/main/java/org/moditect/internal/parser/JavaVersionHelper.java
@@ -1,17 +1,9 @@
 /*
- *  Copyright 2017 - 2023 The ModiTect authors
+ *  SPDX-License-Identifier: Apache-2.0
  *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ *  Copyright The original authors
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ *  Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
  */
 package org.moditect.internal.parser;
 

diff --git a/core/src/main/java/org/moditect/internal/parser/JdepsExtraArgsExtractor.java b/core/src/main/java/org/moditect/internal/parser/JdepsExtraArgsExtractor.java
@@ -1,17 +1,9 @@
 /*
- *  Copyright 2017 - 2023 The ModiTect authors
+ *  SPDX-License-Identifier: Apache-2.0
  *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ *  Copyright The original authors
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ *  Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
  */
 package org.moditect.internal.parser;
 

diff --git a/core/src/main/java/org/moditect/model/DependencePattern.java b/core/src/main/java/org/moditect/model/DependencePattern.java
@@ -1,17 +1,9 @@
 /*
- *  Copyright 2017 - 2023 The ModiTect authors
+ *  SPDX-License-Identifier: Apache-2.0
  *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ *  Copyright The original authors
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ *  Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
  */
 package org.moditect.model;
 

diff --git a/core/src/main/java/org/moditect/model/DependencyDescriptor.java b/core/src/main/java/org/moditect/model/DependencyDescriptor.java
@@ -1,17 +1,9 @@
 /*
- *  Copyright 2017 - 2023 The ModiTect authors
+ *  SPDX-License-Identifier: Apache-2.0
  *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ *  Copyright The original authors
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ *  Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
  */
 package org.moditect.model;
 

diff --git a/core/src/main/java/org/moditect/model/GeneratedModuleInfo.java b/core/src/main/java/org/moditect/model/GeneratedModuleInfo.java
@@ -1,17 +1,9 @@
 /*
- *  Copyright 2017 - 2023 The ModiTect authors
+ *  SPDX-License-Identifier: Apache-2.0
  *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ *  Copyright The original authors
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ *  Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
  */
 package org.moditect.model;
 

diff --git a/core/src/main/java/org/moditect/model/JarInclusionPolicy.java b/core/src/main/java/org/moditect/model/JarInclusionPolicy.java
@@ -1,17 +1,9 @@
 /*
- *  Copyright 2017 - 2023 The ModiTect authors
+ *  SPDX-License-Identifier: Apache-2.0
  *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ *  Copyright The original authors
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ *  Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
  */
 package org.moditect.model;
 

diff --git a/core/src/main/java/org/moditect/model/PackageNamePattern.java b/core/src/main/java/org/moditect/model/PackageNamePattern.java
@@ -1,17 +1,9 @@
 /*
- *  Copyright 2017 - 2023 The ModiTect authors
+ *  SPDX-License-Identifier: Apache-2.0
  *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ *  Copyright The original authors
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ *  Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
  */
 package org.moditect.model;
 

diff --git a/core/src/main/java/org/moditect/model/Version.java b/core/src/main/java/org/moditect/model/Version.java
@@ -1,17 +1,9 @@
 /*
- *  Copyright 2017 - 2023 The ModiTect authors
+ *  SPDX-License-Identifier: Apache-2.0
  *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
+ *  Copyright The original authors
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ *  Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
  */
 package org.moditect.model;