Merge branch 'feature/nexus_migration' into develop

This commit is contained in:
Sebastian Sdorra
2020-05-18 16:05:08 +02:00
5 changed files with 19 additions and 40 deletions

11
Jenkinsfile vendored
View File

@@ -2,7 +2,7 @@
// switch back to a stable tag, after pr 22 is mreged an the next version is released
// see https://github.com/cloudogu/ces-build-lib/pull/22
@Library('github.com/cloudogu/ces-build-lib@develop')
@Library('github.com/cloudogu/ces-build-lib@7a14da6')
import com.cloudogu.ces.cesbuildlib.*
node('docker') {
@@ -108,7 +108,14 @@ node('docker') {
sh "rm -rf scm-server/target/appassembler"
// deploy java artifacts
mvn.useRepositoryCredentials([id: 'maven.scm-manager.org', url: 'https://maven.scm-manager.org/nexus', credentialsId: 'maven.scm-manager.org', type: 'Nexus2'])
mvn.useDeploymentRepository([
id: 'packages.scm-manager.org',
url: 'https://packages.scm-manager.org',
credentialsId: 'maven.scm-manager.org',
snapshotRepository: '/repository/snapshots/',
releaseRepository: '/repository/releases/',
type: 'Configurable'
])
mvn.deployToNexusRepository()
// deploy frontend bits

20
pom.xml
View File

@@ -105,9 +105,9 @@
<repositories>
<repository>
<id>maven.scm-manager.org</id>
<name>scm-manager release repository</name>
<url>http://maven.scm-manager.org/nexus/content/groups/public</url>
<id>packages.scm-manager.org</id>
<name>scm-manager public repository</name>
<url>https://packages.scm-manager.org/repository/public/</url>
</repository>
</repositories>
@@ -115,9 +115,9 @@
<pluginRepositories>
<pluginRepository>
<id>maven.scm-manager.org</id>
<name>scm-manager release repository</name>
<url>http://maven.scm-manager.org/nexus/content/groups/public</url>
<id>packages.scm-manager.org</id>
<name>scm-manager public repository</name>
<url>https://packages.scm-manager.org/repository/public/</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
@@ -885,15 +885,15 @@
<distributionManagement>
<repository>
<id>maven.scm-manager.org</id>
<id>packages.scm-manager.org</id>
<name>scm-manager release repository</name>
<url>http://maven.scm-manager.org/nexus/content/repositories/releases</url>
<url>https://packages.scm-manager.org/repository/releases/</url>
</repository>
<snapshotRepository>
<id>maven.scm-manager.org</id>
<id>packages.scm-manager.org</id>
<name>scm-manager snapshot repository</name>
<url>http://maven.scm-manager.org/nexus/content/repositories/snapshots</url>
<url>https://packages.scm-manager.org/repository/snapshots/</url>
</snapshotRepository>
</distributionManagement>

View File

@@ -103,16 +103,4 @@
</plugins>
</build>
<!-- for jgit -->
<repositories>
<repository>
<id>maven.scm-manager.org</id>
<name>scm-manager release repository</name>
<url>http://maven.scm-manager.org/nexus/content/groups/public</url>
</repository>
</repositories>
</project>

View File

@@ -85,14 +85,4 @@
</plugins>
</build>
<repositories>
<repository>
<id>maven.scm-manager.org</id>
<name>scm-manager release repository</name>
<url>http://maven.scm-manager.org/nexus/content/groups/public</url>
</repository>
</repositories>
</project>

View File

@@ -98,12 +98,6 @@
<url>https://maven.tmatesoft.com/content/repositories/releases</url>
</repository>
<repository>
<id>maven.scm-manager.org</id>
<name>scm-manager release repository</name>
<url>http://maven.scm-manager.org/nexus/content/groups/public</url>
</repository>
</repositories>
</project>