Merge pull request #47 from svenruppert/release/05.00.00-RPM

Release/05.00.00-RPM
svenruppert · Dec 18, 2023 · 8c21bde · 8c21bde
2 parents 6a5526b + 8dd350a
commit 8c21bde
Show file tree

Hide file tree

Showing 6 changed files with 86 additions and 52 deletions.
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@
 
 ## Version's
 ### 05.00.00-SRU - BREAKING CHANGE
-With version 5.x I will switch teh namespace from org.rapidpm to com.svenruppert
+With version 5.x I will switch the namespace from org.rapidpm to com.svenruppert
 This has to do with organisational requirements on my side.
 I will move this repo to the Github organisation **svenruppert**.
 The license will be still the same. The change on your side, 

diff --git a/_tools/docker/develop/Dockerfile b/_tools/docker/develop/Dockerfile
@@ -1,3 +1,19 @@
+#
+# Copyright © 2013 Sven Ruppert (sven.ruppert@gmail.com)
+#
+# 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
+#
+#     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.
+#
+
 FROM debian:bookworm-slim
 
 LABEL maintainer="Sven Ruppert sven.ruppert@gmail.com" description="zulu-dev-fx:21.0.1-zulu"

diff --git a/_tools/docker/develop/buid.sh b/_tools/docker/develop/buid.sh
@@ -1,4 +1,20 @@
 #!/bin/bash
+#
+# Copyright © 2013 Sven Ruppert (sven.ruppert@gmail.com)
+#
+# 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
+#
+#     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.
+#
+
     echo start building the images
     podman build -t svenruppert/zulu-dev .
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -18,7 +18,7 @@ version: '3.5'
 
 services:
   deploy:
-    image: svenruppert/deploy:1.8.0-222
+    image: svenruppert/deploy:21.0.1-zulu
     container_name: deploy-rpm-dependencies
     hostname: deploy-rpm-dependencies
     volumes:
@@ -29,5 +29,4 @@ services:
     command: 'mvn license:format clean deploy
                     -P_release_prepare
                     -P_release_sign-artifacts
-                    -Pvaadin-install-nodejs
                     -Dmaven.test.skip=true'
diff --git a/pom.xml b/pom.xml
@@ -26,7 +26,7 @@
     <artifactId>dependencies</artifactId>
     <packaging>pom</packaging>
 
-    <version>05.00.00-SRU</version>
+    <version>05.00.00-RPM</version>
 
     <inceptionYear>2013</inceptionYear>
     <organization>
@@ -72,8 +72,10 @@
     </licenses>
 
     <properties>
-        <deploy-repo-url>https://repo.maven.apache.org/maven2/</deploy-repo-url>
-        <deploy-repo-snapshots-url>https://repo.maven.apache.org/maven2/</deploy-repo-snapshots-url>
+<!--        <deploy-repo-url>https://repo.maven.apache.org/maven2/</deploy-repo-url>-->
+        <deploy-repo-url>https://maven.pkg.github.com/svenruppert/dependencies/</deploy-repo-url>
+<!--        <deploy-repo-snapshots-url>https://repo.maven.apache.org/maven2/</deploy-repo-snapshots-url>-->
+        <deploy-repo-snapshots-url>https://maven.pkg.github.com/svenruppert/dependencies/</deploy-repo-snapshots-url>
 
         <activateJavaOnly>false</activateJavaOnly>
 
@@ -1088,7 +1090,7 @@
             <plugin>
                 <groupId>de.sormuras.junit</groupId>
                 <artifactId>junit-platform-maven-plugin</artifactId>
-                <version>1.0.0-M5</version>
+                <version>1.1.7</version>
                 <extensions>true</extensions> <!-- Necessary to execute it in 'test' phase. -->
                 <configuration>
                     <timeout>${junit-platform-maven-plugin.timeout}</timeout>
@@ -1266,7 +1268,7 @@
                                 <!--                <additionalOption>-html5</additionalOption>-->
                                 <!--                <javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>-->
                             </additionalOptions>
-                            <destDir>target/doc/apidoc/</destDir>
+<!--                            <destDir>target/doc/apidoc/</destDir>-->
                         </configuration>
                     </plugin>
                     <plugin>

diff --git a/version-number-rules.xml b/version-number-rules.xml
@@ -16,48 +16,49 @@
 
 -->
 <ruleset comparisonMethod="maven"
-         xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 http://mojo.codehaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
-  <ignoreVersions>
-    <ignoreVersion type="regex">(?i).*[-_\.]CR[0-9\.]*</ignoreVersion>
-    <ignoreVersion type="regex">(?i).*[-_\.]rc[0-9\.]*</ignoreVersion>
-    <ignoreVersion type="regex">(?i).*[-_\.]beta[0-9\.-]*</ignoreVersion>
-    <ignoreVersion type="regex">(?i).*[-_\.]alpha[0-9\.-]*</ignoreVersion>
-    <ignoreVersion type="regex">(?i).*[-_\.]Alpha</ignoreVersion>
-    <ignoreVersion type="regex">(?i).*[-_\.]nightly[0-9\.]*</ignoreVersion>
-    <ignoreVersion type="regex">(?i).*[-_\.]jboss[0-9\.]*</ignoreVersion>
-    <ignoreVersion type="regex">(?i).*-atlassian-[0-9\.]*</ignoreVersion>
-    <ignoreVersion type="regex">(?i).*-jenkins-[0-9\.]*</ignoreVersion>
-    <ignoreVersion type="regex">.*[-\.]redhat-[0-9]+</ignoreVersion>
-    <ignoreVersion type="regex">\d{4,}.*</ignoreVersion>  <!-- z.B. commons-collections:commons-collections ... 3.2.1.redhat-7 -> 20040117.000000 -->
-  </ignoreVersions>
-  <rules>
-    <rule groupId="org.cache2k">
-      <ignoreVersions>
-        <ignoreVersion>1.3.1.Alpha</ignoreVersion>
-      </ignoreVersions>
-    </rule>
-    <rule groupId="org.slf4j" comparisonMethod="maven">
-      <ignoreVersions>
-        <ignoreVersion type="regex">.*-xwiki</ignoreVersion>
-        <ignoreVersion type="regex">.*-alpha*</ignoreVersion>
-      </ignoreVersions>
-    </rule>
-    <rule groupId="org.apache.maven.plugins" artifactId="maven-surefire-plugin" comparisonMethod="maven">
-      <ignoreVersions>
-        <ignoreVersion>9c6abc2</ignoreVersion>
-      </ignoreVersions>
-    </rule>
-    <rule groupId="org.codehaus.mojo" artifactId="properties-maven-plugin" comparisonMethod="maven">
-      <ignoreVersions>
-        <ignoreVersion type="regex">.*-tc</ignoreVersion>
-      </ignoreVersions>
-    </rule>
-    <rule groupId="javax.portlet" artifactId="portlet-api" comparisonMethod="maven">
-      <ignoreVersions>
-        <ignoreVersion type="regex">.*-r\d+</ignoreVersion>
-        <ignoreVersion type="regex">.*-Draft\d+</ignoreVersion>
-      </ignoreVersions>
-    </rule>
-  </rules>
+         xmlns="https://www.mojohaus.org/VERSIONS/RULE/2.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="https://www.mojohaus.org/VERSIONS/RULE/2.1.0 https://www.mojohaus.org/versions/versions-model/xsd/rule-2.1.0.xsd">
+    <ignoreVersions>
+        <ignoreVersion type="regex">(?i).*[-_\.]CR[0-9\.]*</ignoreVersion>
+        <ignoreVersion type="regex">(?i).*[-_\.]rc[0-9\.]*</ignoreVersion>
+        <ignoreVersion type="regex">(?i).*[-_\.]beta[0-9\.-]*</ignoreVersion>
+        <ignoreVersion type="regex">(?i).*[-_\.]alpha[0-9\.-]*</ignoreVersion>
+        <ignoreVersion type="regex">(?i).*[-_\.]Alpha</ignoreVersion>
+        <ignoreVersion type="regex">(?i).*[-_\.]nightly[0-9\.]*</ignoreVersion>
+        <ignoreVersion type="regex">(?i).*[-_\.]jboss[0-9\.]*</ignoreVersion>
+        <ignoreVersion type="regex">(?i).*-atlassian-[0-9\.]*</ignoreVersion>
+        <ignoreVersion type="regex">(?i).*-jenkins-[0-9\.]*</ignoreVersion>
+        <ignoreVersion type="regex">.*[-\.]redhat-[0-9]+</ignoreVersion>
+        <ignoreVersion type="regex">\d{4,}.*
+        </ignoreVersion>  <!-- z.B. commons-collections:commons-collections ... 3.2.1.redhat-7 -> 20040117.000000 -->
+    </ignoreVersions>
+    <rules>
+        <rule groupId="org.cache2k" comparisonMethod="maven">
+            <ignoreVersions>
+                <ignoreVersion>1.3.1.Alpha</ignoreVersion>
+            </ignoreVersions>
+        </rule>
+        <rule groupId="org.slf4j" comparisonMethod="maven">
+            <ignoreVersions>
+                <ignoreVersion type="regex">.*-xwiki</ignoreVersion>
+                <ignoreVersion type="regex">.*-alpha*</ignoreVersion>
+            </ignoreVersions>
+        </rule>
+        <rule groupId="org.apache.maven.plugins" artifactId="maven-surefire-plugin" comparisonMethod="maven">
+            <ignoreVersions>
+                <ignoreVersion>9c6abc2</ignoreVersion>
+            </ignoreVersions>
+        </rule>
+        <rule groupId="org.codehaus.mojo" artifactId="properties-maven-plugin" comparisonMethod="maven">
+            <ignoreVersions>
+                <ignoreVersion type="regex">.*-tc</ignoreVersion>
+            </ignoreVersions>
+        </rule>
+        <rule groupId="javax.portlet" artifactId="portlet-api" comparisonMethod="maven">
+            <ignoreVersions>
+                <ignoreVersion type="regex">.*-r\d+</ignoreVersion>
+                <ignoreVersion type="regex">.*-Draft\d+</ignoreVersion>
+            </ignoreVersions>
+        </rule>
+    </rules>
 </ruleset>