Merge branch 'dev' into vertical-stargates
	
		
			
	
		
	
	
		
	
		
			Some checks failed
		
		
	
	
		
			
				
	
				EpicKnarvik97/Stargate/pipeline/head There was a failure building this commit
				
			
		
		
	
	
				
					
				
			
		
			Some checks failed
		
		
	
	EpicKnarvik97/Stargate/pipeline/head There was a failure building this commit
				
			# Conflicts: # Jenkinsfile
This commit is contained in:
		
							
								
								
									
										8
									
								
								Jenkinsfile
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										8
									
								
								Jenkinsfile
									
									
									
									
										vendored
									
									
								
							@@ -16,10 +16,16 @@ pipeline {
 | 
			
		||||
                sh 'mvn test'
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
        stage('Verify') {
 | 
			
		||||
            steps {
 | 
			
		||||
                echo 'Verifying...'
 | 
			
		||||
                sh 'mvn verify -Dmaven.test.skip=true'
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
        stage('Deploy') {
 | 
			
		||||
             steps {
 | 
			
		||||
                echo 'Deploying...'
 | 
			
		||||
                sh 'mvn verify -Dmaven.test.skip=true & mvn deploy'
 | 
			
		||||
                sh 'mvn deploy -Dmaven.install.skip=true -Dmaven.test.skip=true'
 | 
			
		||||
                archiveArtifacts artifacts: '**/target/*.jar', fingerprint: true
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										12
									
								
								pom.xml
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								pom.xml
									
									
									
									
									
								
							@@ -20,7 +20,7 @@
 | 
			
		||||
 | 
			
		||||
    <repositories>
 | 
			
		||||
        <repository>
 | 
			
		||||
            <id>gitea</id>
 | 
			
		||||
            <id>knarcraft-repo</id>
 | 
			
		||||
            <url>https://git.knarcraft.net/api/packages/EpicKnarvik97/maven</url>
 | 
			
		||||
        </repository>
 | 
			
		||||
        <repository>
 | 
			
		||||
@@ -40,6 +40,16 @@
 | 
			
		||||
            <url>https://repo.papermc.io/repository/maven-public/</url>
 | 
			
		||||
        </repository>
 | 
			
		||||
    </repositories>
 | 
			
		||||
    <distributionManagement>
 | 
			
		||||
        <repository>
 | 
			
		||||
            <id>knarcraft-repo</id>
 | 
			
		||||
            <url>https://git.knarcraft.net/api/packages/EpicKnarvik97/maven</url>
 | 
			
		||||
        </repository>
 | 
			
		||||
        <snapshotRepository>
 | 
			
		||||
            <id>knarcraft-repo</id>
 | 
			
		||||
            <url>https://git.knarcraft.net/api/packages/EpicKnarvik97/maven</url>
 | 
			
		||||
        </snapshotRepository>
 | 
			
		||||
    </distributionManagement>
 | 
			
		||||
 | 
			
		||||
    <dependencies>
 | 
			
		||||
        <dependency>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user