Fix Jenkins

...and update non-shaded jar names.
This commit is contained in:
RednedEpic 2019-12-01 17:10:58 -06:00
parent e8f4522762
commit c76c39f3f5
6 changed files with 12 additions and 12 deletions

2
Jenkinsfile vendored
View file

@ -15,7 +15,7 @@ pipeline {
} }
post { post {
success { success {
archiveArtifacts artifacts: 'target/Geyser.jar', fingerprint: true archiveArtifacts artifacts: 'target/*.jar', fingerprint: true
} }
} }
} }

View file

@ -25,7 +25,8 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<finalName>${outputName}-Bukkit-noshade</finalName> <finalName>${outputName}-Bukkit</finalName>
<directory>../../target</directory>
<defaultGoal>clean install</defaultGoal> <defaultGoal>clean install</defaultGoal>
<resources> <resources>
<resource> <resource>
@ -37,7 +38,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
<version>3.1.0</version> <version>3.2.1</version>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <phase>package</phase>
@ -47,7 +48,6 @@
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
<finalName>${outputName}-Bukkit</finalName>
<minimizeJar>true</minimizeJar> <minimizeJar>true</minimizeJar>
</configuration> </configuration>
</plugin> </plugin>

View file

@ -25,7 +25,8 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<finalName>${outputName}-BungeeCord-noshade</finalName> <finalName>${outputName}-BungeeCord</finalName>
<directory>../../target</directory>
<defaultGoal>clean install</defaultGoal> <defaultGoal>clean install</defaultGoal>
<resources> <resources>
<resource> <resource>
@ -37,7 +38,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
<version>3.1.0</version> <version>3.2.1</version>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <phase>package</phase>
@ -47,7 +48,6 @@
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
<finalName>${outputName}-BungeeCord</finalName>
<minimizeJar>true</minimizeJar> <minimizeJar>true</minimizeJar>
</configuration> </configuration>
</plugin> </plugin>

View file

@ -19,7 +19,8 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<finalName>${outputName}-noshade</finalName> <finalName>${outputName}</finalName>
<directory>../../target</directory>
<defaultGoal>clean install</defaultGoal> <defaultGoal>clean install</defaultGoal>
<plugins> <plugins>
<plugin> <plugin>
@ -37,7 +38,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
<version>3.1.0</version> <version>3.2.1</version>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <phase>package</phase>
@ -47,7 +48,6 @@
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
<finalName>${outputName}</finalName>
<minimizeJar>true</minimizeJar> <minimizeJar>true</minimizeJar>
</configuration> </configuration>
</plugin> </plugin>

View file

@ -118,7 +118,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
<version>3.1.0</version> <version>3.2.1</version>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <phase>package</phase>

View file

@ -104,7 +104,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
<version>3.1.0</version> <version>3.2.1</version>
<configuration> <configuration>
<minimizeJar>true</minimizeJar> <minimizeJar>true</minimizeJar>
</configuration> </configuration>