remove maven-release plugin, correct replacer regex, update inception year

jessebluemr · jessebluemr · commit b1d6d9e6add9 · 2024-04-02T11:47:59.000+02:00
diff --git a/build.properties b/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2021 con terra GmbH (info@conterra.de)
+# Copyright (C) 2024 con terra GmbH (info@conterra.de)
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/gulpfile.js b/gulpfile.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 con terra GmbH (info@conterra.de)
+ * Copyright (C) 2024 con terra GmbH (info@conterra.de)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/pom.xml b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (C) 2023 con terra GmbH (info@conterra.de)
+    Copyright (C) 2024 con terra GmbH (info@conterra.de)
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -149,10 +149,6 @@
                     <artifactId>build-helper-maven-plugin</artifactId>
                     <version>3.1.0</version>
                 </plugin>
-                <plugin>
-                    <artifactId>maven-release-plugin</artifactId>
-                    <version>2.5.3</version>
-                </plugin>
                 <plugin>
                     <artifactId>maven-assembly-plugin</artifactId>
                     <version>3.0.0</version>
@@ -315,7 +311,7 @@
                     <properties>
                         <owner>con terra GmbH</owner>
                         <email>info@conterra.de</email>
-                        <project.inceptionYear>2023</project.inceptionYear>
+                        <project.inceptionYear>2024</project.inceptionYear>
                     </properties>
                     <includes>
                         <include>src/main/js/**/*.js</include>
@@ -366,9 +362,8 @@
                             <replacements>
                                 <replacement>
                                     <!-- remove bundleLocations from app.json -->
-                                    <token>
-                                        \s*"bundleLocations"\s*:\s*\[\s*"localbundles"\s*,\s*"bundles"\s*\]\s*,\s*</token>
-                                    <value />
+                                    <token>\s*"bundleLocations"\s*:\s*\[\s*"localbundles"\s*,\s*"bundles"\s*\]\s*,</token>
+                                    <value></value>
                                 </replacement>
                             </replacements>
                         </configuration>
@@ -454,15 +449,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <artifactId>maven-release-plugin</artifactId>
-                <configuration>
-                    <tagNameFormat>@{project.version}</tagNameFormat>
-                    <preparationGoals>clean</preparationGoals>
-                    <releaseProfiles>compress</releaseProfiles>
-                    <autoVersionSubmodules>true</autoVersionSubmodules>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
     <scm>
@@ -669,12 +655,12 @@
                         <groupId>de.conterra.jsregistry</groupId>
                         <artifactId>ct-jsregistry-maven-plugin</artifactId>
                         <executions>
-                            <execution>
+                            <!--<execution>
                                 <id>calculate js dependencies</id>
                                 <goals>
                                     <goal>calculateDependencies</goal>
                                 </goals>
-                            </execution>
+                            </execution>-->
                             <!--
 
                                 The optimizeJS goal is usually no longer required because compression is done via terser (see
diff --git a/src/main/config/assembly.xml b/src/main/config/assembly.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (C) 2021 con terra GmbH (info@conterra.de)
+    Copyright (C) 2024 con terra GmbH (info@conterra.de)
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/src/main/js/apps/manager/app.json b/src/main/js/apps/manager/app.json
@@ -4,6 +4,10 @@
     "title": "Manager"
   },
   "load": {
+    "bundleLocations": [
+        "localbundles",
+        "bundles"
+    ],
     "allowedBundles": [
       "system",
       "splashscreen",
@@ -14,10 +18,6 @@
       "managementlayout",
       "theme-everlasting",
       "mapapps-github-manager"
-    ],
-    "bundleLocations": [
-      "localbundles",
-      "bundles"
     ]
   },
   "bundles": {
@@ -41,4 +41,4 @@
       }
     }
   }
-}
+}
diff --git a/src/main/js/bundles/mapapps-github-manager/BundleDetailsController.js b/src/main/js/bundles/mapapps-github-manager/BundleDetailsController.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 con terra GmbH (info@conterra.de)
+ * Copyright (C) 2024 con terra GmbH (info@conterra.de)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/js/bundles/mapapps-github-manager/BundleStore.js b/src/main/js/bundles/mapapps-github-manager/BundleStore.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 con terra GmbH (info@conterra.de)
+ * Copyright (C) 2024 con terra GmbH (info@conterra.de)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/js/bundles/mapapps-github-manager/BundleTopWidget.vue b/src/main/js/bundles/mapapps-github-manager/BundleTopWidget.vue
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (C) 2021 con terra GmbH (info@conterra.de)
+    Copyright (C) 2024 con terra GmbH (info@conterra.de)
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/src/main/js/bundles/mapapps-github-manager/BundleWidget.js b/src/main/js/bundles/mapapps-github-manager/BundleWidget.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 con terra GmbH (info@conterra.de)
+ * Copyright (C) 2024 con terra GmbH (info@conterra.de)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/js/bundles/mapapps-github-manager/BundleWidgetFactory.js b/src/main/js/bundles/mapapps-github-manager/BundleWidgetFactory.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 con terra GmbH (info@conterra.de)
+ * Copyright (C) 2024 con terra GmbH (info@conterra.de)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/js/bundles/mapapps-github-manager/FilterHandler.js b/src/main/js/bundles/mapapps-github-manager/FilterHandler.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 con terra GmbH (info@conterra.de)
+ * Copyright (C) 2024 con terra GmbH (info@conterra.de)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/js/bundles/mapapps-github-manager/build.config.js b/src/main/js/bundles/mapapps-github-manager/build.config.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 con terra GmbH (info@conterra.de)
+ * Copyright (C) 2024 con terra GmbH (info@conterra.de)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/js/bundles/mapapps-github-manager/css/styles.css b/src/main/js/bundles/mapapps-github-manager/css/styles.css
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2021 con terra GmbH (info@conterra.de)
+ * Copyright (C) 2024 con terra GmbH (info@conterra.de)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/js/bundles/mapapps-github-manager/module.js b/src/main/js/bundles/mapapps-github-manager/module.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 con terra GmbH (info@conterra.de)
+ * Copyright (C) 2024 con terra GmbH (info@conterra.de)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/js/bundles/mapapps-github-manager/nls/bundle.js b/src/main/js/bundles/mapapps-github-manager/nls/bundle.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 con terra GmbH (info@conterra.de)
+ * Copyright (C) 2024 con terra GmbH (info@conterra.de)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/js/bundles/mapapps-github-manager/nls/de/bundle.js b/src/main/js/bundles/mapapps-github-manager/nls/de/bundle.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 con terra GmbH (info@conterra.de)
+ * Copyright (C) 2024 con terra GmbH (info@conterra.de)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/js/bundles/mapapps-github-manager/tests/all.js b/src/main/js/bundles/mapapps-github-manager/tests/all.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 con terra GmbH (info@conterra.de)
+ * Copyright (C) 2024 con terra GmbH (info@conterra.de)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2021 con terra GmbH (info@conterra.de)
+# Copyright (C) 2024 con terra GmbH (info@conterra.de)
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/src/test/webapp/index.html b/src/test/webapp/index.html
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (C) 2021 con terra GmbH (info@conterra.de)
+    Copyright (C) 2024 con terra GmbH (info@conterra.de)
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/src/test/webapp/init.css b/src/test/webapp/init.css
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2021 con terra GmbH (info@conterra.de)
+ * Copyright (C) 2024 con terra GmbH (info@conterra.de)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/webapp/js/tests/init-packs.js b/src/test/webapp/js/tests/init-packs.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 con terra GmbH (info@conterra.de)
+ * Copyright (C) 2024 con terra GmbH (info@conterra.de)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/webapp/js/tests/runTests.html b/src/test/webapp/js/tests/runTests.html
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (C) 2021 con terra GmbH (info@conterra.de)
+    Copyright (C) 2024 con terra GmbH (info@conterra.de)
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/src/test/webapp/js/tests/test-init.js b/src/test/webapp/js/tests/test-init.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 con terra GmbH (info@conterra.de)
+ * Copyright (C) 2024 con terra GmbH (info@conterra.de)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/webapp/login.css b/src/test/webapp/login.css
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2021 con terra GmbH (info@conterra.de)
+ * Copyright (C) 2024 con terra GmbH (info@conterra.de)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#`
`2`		`-# Copyright (C) 2021 con terra GmbH (info@conterra.de)`
	`2`	`+# Copyright (C) 2024 con terra GmbH (info@conterra.de)`
`3`	`3`	`#`
`4`	`4`	`# Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`# you may not use this file except in compliance with the License.`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (C) 2021 con terra GmbH (info@conterra.de)`
	`2`	`+ * Copyright (C) 2024 con terra GmbH (info@conterra.de)`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`