fix: Made the required resources generation work again.

chrisdutz · chrisdutz · commit e14b163616a7 · 2025-02-05T08:50:26.000+01:00
diff --git a/NOTICE b/NOTICE
@@ -1,5 +1,5 @@
 Apache PLC4X
-Copyright 2017-2024 The Apache Software Foundation
+Copyright 2017-2025 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/code-generation/protocol-base-mspec/src/main/appended-resources/META-INF/LICENSE b/code-generation/protocol-base-mspec/src/main/appended-resources/META-INF/LICENSE
@@ -0,0 +1,6 @@
+
+----------------------------------------------
+
+src/main/antlr4/org/apache/plc4x/plugins/codegenerator/language/mspec/expression/Expression.g4
+is licensed under the Category A: "UNLICENSE" which is available here:
+UNLICENSE file parallel to this file.
diff --git a/code-generation/protocol-base-mspec/src/main/resources/META-INF/UNLICENSE b/code-generation/protocol-base-mspec/src/main/resources/META-INF/UNLICENSE
@@ -0,0 +1,24 @@
+This is free and unencumbered software released into the public domain.
+
+Anyone is free to copy, modify, publish, use, compile, sell, or
+distribute this software, either in source code form or as a compiled
+binary, for any purpose, commercial or non-commercial, and by any
+means.
+
+In jurisdictions that recognize copyright laws, the author or authors
+of this software dedicate any and all copyright interest in the
+software to the public domain. We make this dedication for the benefit
+of the public at large and to the detriment of our heirs and
+successors. We intend this dedication to be an overt act of
+relinquishment in perpetuity of all present and future rights to this
+software under copyright law.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+For more information, please refer to <https://unlicense.org/>
diff --git a/plc4j/transports/test/src/main/appended-resources/META-INF/LICENSE b/plc4j/transports/test/src/main/appended-resources/META-INF/LICENSE
@@ -2,6 +2,6 @@
 ----------------------------------------------
 
 The Files:
-src/main/java/io/netty/channel/embedded/Plc4xEmbeddedChannel.java
-src/main/java/io/netty/channel/embedded/Plc4xEmbeddedEventLoop.java
+src/main/java/io/netty/channel/embedded/Plc4xEmbeddedChannel.java|.class
+src/main/java/io/netty/channel/embedded/Plc4xEmbeddedEventLoop.java|.class
 Are copyrighted by the The Netty Project which is distributed under the Apache 2.0 license.
diff --git a/plc4j/transports/test/src/main/appended-resources/META-INF/NOTICE b/plc4j/transports/test/src/main/appended-resources/META-INF/NOTICE
diff --git a/pom.xml b/pom.xml
@@ -873,17 +873,15 @@
         <executions>
           <execution>
             <id>process-resource-bundles</id>
-            <phase>prepare-package</phase>
+            <phase>generate-resources</phase>
             <goals>
               <goal>process</goal>
             </goals>
             <configuration>
               <resourceBundles>
                 <!-- Will generate META-INF/{DEPENDENCIES,LICENSE,NOTICE} -->
-                <resourceBundle>org.apache.apache.resources:apache-jar-resource-bundle:1.5</resourceBundle>
+                <resourceBundle>org.apache.apache.resources:apache-jar-resource-bundle:1.7</resourceBundle>
               </resourceBundles>
-              <!-- Content in this directory will be appended to generated resources -->
-              <appendedResourcesDirectory>${basedir}/src/remote-resources</appendedResourcesDirectory>
             </configuration>
           </execution>
         </executions>
