diff --git a/Jenkinsfile b/Jenkinsfile index fbf60bcce7bcbe1f3802556f7e9ecdc6c7ed1882..496aa21b7d604bf0bdf823882eae375fbc6c4803 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -138,6 +138,24 @@ pipeline { } } + stage('nexus deploy'){ + when { + anyOf { + branch 'master' + branch 'release' + branch 'nexus' + } + } + steps { + script { + FAILED_STAGE = env.STAGE_NAME + } + container('maven-11') { + sh 'mvn -pl -goofy-client -DskipTests deploy' + } + } + } + stage('Openshift deploy') { when { anyOf { diff --git a/goofy-client/pom.xml b/goofy-client/pom.xml index cb70c79942f5757967df7e6170ba1381450ab8a8..a5e18603dfd60e10ec4ca488e8ef7c6fbbab474c 100644 --- a/goofy-client/pom.xml +++ b/goofy-client/pom.xml @@ -72,6 +72,14 @@ </plugins> </build> + <repositories> + <repository> + <id>ozg-nexus</id> + <name>ozg nexus</name> + <url>https://nexus.ozg-sh.de/repository/ozg-group/</url> + </repository> + </repositories> + <profiles> <profile> <activation> diff --git a/goofy-server/pom.xml b/goofy-server/pom.xml index a92d657af8673df68b85264952515f03fb7879c9..0904bf963ff60a8668217d86059a585fc7426ef6 100644 --- a/goofy-server/pom.xml +++ b/goofy-server/pom.xml @@ -204,40 +204,6 @@ </executions> </plugin> - <plugin> - <groupId>com.spotify</groupId> - <artifactId>dockerfile-maven-plugin</artifactId> - <version>1.4.13</version> - <configuration> - <username>admin</username> - <password>admin</password> - <repository>default-route-openshift-image-registry.apps.lab.okd.local/sh-kiel-dev/goofy</repository> - <tag>${git.branch}-${project.version}</tag> - <useMavenSettingsForAuth>true</useMavenSettingsForAuth> - <buildArgs> - <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE> - </buildArgs> - </configuration> - <executions> - <execution> - <id>default</id> - <phase>deploy</phase> - <goals> - <goal>build</goal> - <goal>tag</goal> - <goal>push</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - <version>1.1.1</version> - </dependency> - </dependencies> - </plugin> - <plugin> <groupId>pl.project13.maven</groupId> <artifactId>git-commit-id-plugin</artifactId> @@ -256,4 +222,55 @@ </plugin> </plugins> </build> + + <repositories> + <repository> + <id>ozg-nexus</id> + <name>ozg nexus</name> + <url>https://nexus.ozg-sh.de/repository/ozg-group/</url> + </repository> + </repositories> + + <profiles> + <profile> + <id>docker-build</id> + <build> + <plugins> + <plugin> + <groupId>com.spotify</groupId> + <artifactId>dockerfile-maven-plugin</artifactId> + <version>1.4.13</version> + <configuration> + <username>admin</username> + <password>admin</password> + <repository>default-route-openshift-image-registry.apps.lab.okd.local/sh-kiel-dev/goofy</repository> + <tag>${git.branch}-${project.version}</tag> + <useMavenSettingsForAuth>true</useMavenSettingsForAuth> + <buildArgs> + <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE> + </buildArgs> + </configuration> + <executions> + <execution> + <id>default</id> + <phase>install</phase> + <goals> + <goal>build</goal> + <goal>tag</goal> + <goal>push</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + <version>1.1.1</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> diff --git a/pom.xml b/pom.xml index 5ed3a1e9cb3ec33fd3024d5cdba11fb50b9b4815..fb7698655812d5e6f1536eba8315926ab39234c6 100644 --- a/pom.xml +++ b/pom.xml @@ -162,4 +162,16 @@ </pluginManagement> </build> + <distributionManagement> + <repository> + <id>ozg-nexus</id> + <name>ozg-releases</name> + <url>https://nexus.ozg-sh.de/repository/ozg-releases/</url> + </repository> + <snapshotRepository> + <id>ozg-nexus</id> + <name>ozg-snapshots</name> + <url>https://nexus.ozg-sh.de/repository/ozg-snapshots/</url> + </snapshotRepository> + </distributionManagement> </project> \ No newline at end of file