Merge branch 'fix/release-setup-maven' into 'main'

Fix: Maven Release Setup See merge request !187

Merge branch 'fix/release-setup-maven' into 'main'
7b31d26f · Martin Vogel · 6ab9c621 · 872b4bf7 · 7b31d26f · 7b31d26f
Commit 7b31d26f authored 1 year ago by Martin Vogel
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -70,10 +70,6 @@ deploy:
  stage: deploy
  before_script: *gpg-setup
  script:
-    - ./mvnw $MAVEN_CLI_OPTS deploy -DskipTests -X 2>&1 | tee mvn.log
-  artifacts:
-    paths:
-      - mvn.log
-    when: always
+    - ./mvnw $MAVEN_CLI_OPTS deploy -DskipTests -P '!integration-tests' -Pgpg-sign
  needs:
    - package
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -30,13 +30,4 @@
        </dependency>
    </dependencies>

-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>
\ No newline at end of file
--- a/client/pom.xml
+++ b/client/pom.xml
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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">
    <parent>
        <artifactId>sdk-java</artifactId>
        <groupId>dev.fitko.fitconnect.sdk</groupId>
@@ -64,23 +65,17 @@
    </dependencies>

    <build>
-
        <resources>
            <resource>
                <directory>src/main/resources</directory>
                <filtering>true</filtering>
            </resource>
        </resources>
-
        <plugins>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>
            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-assembly-plugin</artifactId>

--- a/core/pom.xml
+++ b/core/pom.xml
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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">
    <parent>
        <artifactId>sdk-java</artifactId>
        <groupId>dev.fitko.fitconnect.sdk</groupId>
@@ -75,10 +76,6 @@

    <build>
        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-            </plugin>
            <plugin>
                <groupId>org.jacoco</groupId>
                <artifactId>jacoco-maven-plugin</artifactId>

--- a/pom.xml
+++ b/pom.xml
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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">
    <modelVersion>4.0.0</modelVersion>

    <groupId>dev.fitko.fitconnect.sdk</groupId>
@@ -42,8 +43,8 @@
        <connection>scm:git:https://git.fitko.de/fit-connect/sdk-java</connection>
        <developerConnection>scm:git:https://git.fitko.de/fit-connect/sdk-java</developerConnection>
        <url>https://git.fitko.de/fit-connect/sdk-java</url>
-      <tag>HEAD</tag>
-  </scm>
+        <tag>HEAD</tag>
+    </scm>


    <properties>
@@ -105,7 +106,6 @@
        <module>api</module>
        <module>core</module>
        <module>client</module>
-        <module>integration-tests</module>
    </modules>

    <dependencyManagement>
@@ -282,7 +282,6 @@
                        <argLine>${surefireArgLine}</argLine>
                    </configuration>
                </plugin>
-
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-failsafe-plugin</artifactId>
@@ -386,7 +385,9 @@
                                <goal>prepare-agent</goal>
                            </goals>
                            <configuration>
-                                <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
+                                <destFile>
+                                    ${project.build.directory}/coverage-reports/jacoco.exec
+                                </destFile>
                                <propertyName>surefireArgLine</propertyName>
                            </configuration>
                        </execution>
@@ -417,7 +418,9 @@
                                <goal>report</goal>
                            </goals>
                            <configuration>
-                                <dataFile>${project.build.directory}/coverage-reports/jacoco.exec</dataFile>
+                                <dataFile>
+                                    ${project.build.directory}/coverage-reports/jacoco.exec
+                                </dataFile>
                                <outputDirectory>${project.reporting.outputDirectory}/jacoco</outputDirectory>
                            </configuration>
                        </execution>
@@ -437,26 +440,56 @@
                        </execution>
                    </executions>
                </plugin>
-
            </plugins>
        </pluginManagement>
        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+            </plugin>
            <plugin>
                <groupId>org.sonatype.plugins</groupId>
                <artifactId>nexus-staging-maven-plugin</artifactId>
            </plugin>
        </plugins>
    </build>
-
    <distributionManagement>
        <snapshotRepository>
            <id>ossrh</id>
-            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
+            <url>
+            </url>
        </snapshotRepository>
        <repository>
            <id>ossrh</id>
-            <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+            <url>
+                https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/
+            </url>
        </repository>
    </distributionManagement>
-
-</project>
+    <profiles>
+        <profile>
+            <id>integration-tests</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>integration-tests</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>gpg-sign</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
\ No newline at end of file