activate tests

eitco · Aug 1, 2024 · 1ad91bb · 1ad91bb
1 parent f4588a9
commit 1ad91bb
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 24 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -7,10 +7,11 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-      - uses: eitco/maven-release@0.0.1
+      - uses: eitco/maven-release@0.0.2
         with:
           gpg-private-key: ${{ secrets.ARTIFACT_SIGNING_GPG_PRIVATE_KEY }}
           gpg-key-name: ${{ secrets.ARTIFACT_SIGNING_GPG_KEY_NAME }}
           gpg-passphrase: ${{ secrets.ARTIFACT_SIGNING_GPG_PRIVATE_KEY_PASSWORD }}
           deploy-user: ${{ secrets.OSSRH_JIRA_USERNAME }}
           deploy-password: ${{ secrets.OSSRH_JIRA_PASSWORD }}
+          git-ssh-private-key: ${{ secrets.SSH_KEY_EITCO_GITHUB }}
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>de.eitco.cicd</groupId>
         <artifactId>eitco-oss-parent</artifactId>
-        <version>0.0.14</version>
+        <version>0.0.15</version>
     </parent>
 
 
@@ -66,6 +66,8 @@
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-xml</artifactId>
+            <version>2.16.1</version>
+<!--            <version>${jackson.version}</version>-->
         </dependency>
         <dependency>
             <groupId>org.apache.maven.plugins</groupId>
@@ -83,15 +85,51 @@
         <plugins>
             <plugin>
                 <artifactId>maven-release-plugin</artifactId>
+                <configuration>
+                    <goals>deploy site site:stage scm-publish:publish-scm</goals>
+                </configuration>
             </plugin>
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-invoker-plugin</artifactId>
+            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>license-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-site-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-scm-publish-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 
+    <reporting>
+        <excludeDefaults>true</excludeDefaults>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-plugin-report-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </reporting>
+
+    <distributionManagement>
+        <site>
+            <id>github</id>
+            <url>scm:git:https://github.com/eitco/eitco.github.io.git</url>
+        </site>
+    </distributionManagement>
+
+
 </project>
diff --git a/src/it/modules/pom.xml b/src/it/modules/pom.xml
@@ -52,7 +52,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>flatten-maven-plugin</artifactId>
-                <version>1.3.0</version>
+                <version>1.5.0</version>
                 <inherited>false</inherited>
                 <executions>
                     <execution>

diff --git a/src/it/modules/verify.groovy b/src/it/modules/verify.groovy
@@ -1,7 +1,4 @@
-
-File deployDirectory = new File(basedir, "target/repository/de/eitco/bom/test/cicd-bom-test-bom")
-
-assert deployDirectory.isDirectory()
+import groovy.xml.XmlSlurper
 
 File createdFile = new File(basedir, "target/bom.xml");
 

diff --git a/src/main/java/de/eitco/cicd/bom/xml/Developer.java b/src/main/java/de/eitco/cicd/bom/xml/Developer.java
@@ -88,13 +88,13 @@ public static Developer fromMaven(org.apache.maven.model.Developer developer) {
 
         Developer result = new Developer();
 
-        result.name = developer.getName();
-        result.email = developer.getEmail();
-        result.url = developer.getUrl();
-        result.organization = developer.getOrganization();
-        result.organizationUrl = developer.getOrganizationUrl();
-        result.timezone = developer.getTimezone();
-        result.id = developer.getId();
+        result.name = developer == null ? null : developer.getName();
+        result.email = developer == null ? null : developer.getEmail();
+        result.url = developer == null ? null : developer.getUrl();
+        result.organization = developer == null ? null : developer.getOrganization();
+        result.organizationUrl = developer == null ? null : developer.getOrganizationUrl();
+        result.timezone = developer == null ? null : developer.getTimezone();
+        result.id = developer == null ? null : developer.getId();
 
         return result;
     }

diff --git a/src/main/java/de/eitco/cicd/bom/xml/License.java b/src/main/java/de/eitco/cicd/bom/xml/License.java
@@ -55,10 +55,10 @@ public static License fromMaven(org.apache.maven.model.License license) {
 
         License result = new License();
 
-        result.name = license.getName();
-        result.url = license.getUrl();
-        result.distribution = license.getDistribution();
-        result.comments = license.getComments();
+        result.name = license == null ? null : license.getName();
+        result.url = license == null ? null : license.getUrl();
+        result.distribution = license == null ? null : license.getDistribution();
+        result.comments = license == null ? null : license.getComments();
 
         return result;
     }

diff --git a/src/main/java/de/eitco/cicd/bom/xml/Organization.java b/src/main/java/de/eitco/cicd/bom/xml/Organization.java
@@ -34,8 +34,8 @@ public static Organization fromMaven(org.apache.maven.model.Organization organiz
 
         Organization result = new Organization();
 
-        result.name = organization.getName();
-        result.url = organization.getUrl();
+        result.name = organization == null ? null : organization.getName();
+        result.url = organization == null ? null : organization.getUrl();
 
         return result;
     }

diff --git a/src/main/java/de/eitco/cicd/bom/xml/Scm.java b/src/main/java/de/eitco/cicd/bom/xml/Scm.java
@@ -55,10 +55,10 @@ public static Scm fromMaven(org.apache.maven.model.Scm scm) {
 
         Scm result = new Scm();
 
-        result.connection = scm.getConnection();
-        result.developerConnection = scm.getDeveloperConnection();
-        result.tag = scm.getTag();
-        result.url = scm.getUrl();
+        result.connection = scm == null ? null : scm.getConnection();
+        result.developerConnection = scm == null ? null : scm.getDeveloperConnection();
+        result.tag = scm == null ? null : scm.getTag();
+        result.url = scm == null ? null : scm.getUrl();
 
         return result;
     }