Skip to content

Commit 0e8b8ab

Browse files
ago1024ago1024
committed
Merge branch 'develop' of github.com:ago1024/WurmServerModLauncher into develop
2 parents 7e37c8f + 8970db9 commit 0e8b8ab

File tree

3 files changed

+90
-7
lines changed

3 files changed

+90
-7
lines changed

‎modules/modlauncher/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<dependency>
3838
<groupId>junit</groupId>
3939
<artifactId>junit</artifactId>
40-
<version>4.12</version>
40+
<version>4.13.1</version>
4141
<scope>test</scope>
4242
</dependency>
4343
<dependency>

‎modules/mods/scriptrunner/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<dependency>
1818
<groupId>junit</groupId>
1919
<artifactId>junit</artifactId>
20-
<version>4.12</version>
20+
<version>4.13.1</version>
2121
<scope>test</scope>
2222
</dependency>
2323
</dependencies>

‎modules/steam-files/pom.xml‎

Lines changed: 88 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,15 @@
1616

1717
<name>server steam files helper</name>
1818

19+
<dependencies>
20+
<dependency>
21+
<groupId>org.gotti.stubgenerator</groupId>
22+
<artifactId>stubgenerator</artifactId>
23+
<version>1.1</version>
24+
<scope>compile</scope>
25+
</dependency>
26+
</dependencies>
27+
1928
<build>
2029
<plugins>
2130
<plugin>
@@ -61,7 +70,7 @@
6170
<plugin>
6271
<groupId>org.codehaus.mojo</groupId>
6372
<artifactId>exec-maven-plugin</artifactId>
64-
<version>1.4.0</version>
73+
<version>1.6.0</version>
6574
<inherited>false</inherited>
6675
<executions>
6776
<execution>
@@ -85,6 +94,80 @@
8594
</arguments>
8695
</configuration>
8796
</execution>
97+
<execution>
98+
<id>generate-common-stub</id>
99+
<phase>process-resources</phase>
100+
<goals>
101+
<goal>java</goal>
102+
</goals>
103+
<configuration>
104+
<mainClass>org.gotti.stubgenerator.JarConverter</mainClass>
105+
<arguments>
106+
<argument>--source</argument>
107+
<argument>${project.build.directory}/steam/common.jar</argument>
108+
<argument>--target</argument>
109+
<argument>${project.build.directory}/common-${steamapps_buildid}.jar</argument>
110+
</arguments>
111+
</configuration>
112+
</execution>
113+
<execution>
114+
<id>generate-server-stub</id>
115+
<phase>process-resources</phase>
116+
<goals>
117+
<goal>java</goal>
118+
</goals>
119+
<configuration>
120+
<mainClass>org.gotti.stubgenerator.JarConverter</mainClass>
121+
<arguments>
122+
<argument>--source</argument>
123+
<argument>${project.build.directory}/steam/server.jar</argument>
124+
<argument>--target</argument>
125+
<argument>${project.build.directory}/server-${steamapps_buildid}.jar</argument>
126+
</arguments>
127+
<additionalClasspathElements>
128+
<additionalClasspathElement>${project.build.directory}/steam/lib/activation-1.1.1.jar</additionalClasspathElement>
129+
<additionalClasspathElement>${project.build.directory}/steam/lib/annotations-2.0.1.jar</additionalClasspathElement>
130+
<additionalClasspathElement>${project.build.directory}/steam/lib/annotations-16.0.2.jar</additionalClasspathElement>
131+
<additionalClasspathElement>${project.build.directory}/steam/lib/byte-buddy-1.5.5.jar</additionalClasspathElement>
132+
<additionalClasspathElement>${project.build.directory}/steam/lib/byte-buddy-agent-1.5.5.jar</additionalClasspathElement>
133+
<additionalClasspathElement>${project.build.directory}/steam/lib/cling-core-2.1.1.jar</additionalClasspathElement>
134+
<additionalClasspathElement>${project.build.directory}/steam/lib/cling-support-2.1.1.jar</additionalClasspathElement>
135+
<additionalClasspathElement>${project.build.directory}/steam/lib/commons-codec-1.6.jar</additionalClasspathElement>
136+
<additionalClasspathElement>${project.build.directory}/steam/lib/commons-logging-1.1.3.jar</additionalClasspathElement>
137+
<additionalClasspathElement>${project.build.directory}/steam/lib/controlsfx-8.40.14.jar</additionalClasspathElement>
138+
<additionalClasspathElement>${project.build.directory}/steam/lib/flyway-core-4.0.3.jar</additionalClasspathElement>
139+
<additionalClasspathElement>${project.build.directory}/steam/lib/guava-18.0.jar</additionalClasspathElement>
140+
<additionalClasspathElement>${project.build.directory}/steam/lib/hamcrest-core-1.3.jar</additionalClasspathElement>
141+
<additionalClasspathElement>${project.build.directory}/steam/lib/httpclient-4.2.6.jar</additionalClasspathElement>
142+
<additionalClasspathElement>${project.build.directory}/steam/lib/httpcore-4.2.4.jar</additionalClasspathElement>
143+
<additionalClasspathElement>${project.build.directory}/steam/lib/javassist-3.23.1.jar</additionalClasspathElement>
144+
<additionalClasspathElement>${project.build.directory}/steam/lib/javax.servlet-api-3.0.1.jar</additionalClasspathElement>
145+
<additionalClasspathElement>${project.build.directory}/steam/lib/jaxb-api-2.1.jar</additionalClasspathElement>
146+
<additionalClasspathElement>${project.build.directory}/steam/lib/jaxb-impl-2.1.6.jar</additionalClasspathElement>
147+
<additionalClasspathElement>${project.build.directory}/steam/lib/jaxb-xjc-2.1.6.jar</additionalClasspathElement>
148+
<additionalClasspathElement>${project.build.directory}/steam/lib/jimfs-1.1.jar</additionalClasspathElement>
149+
<additionalClasspathElement>${project.build.directory}/steam/lib/jnlp-api-8.0.jar</additionalClasspathElement>
150+
<additionalClasspathElement>${project.build.directory}/steam/lib/jsr305-3.0.1.jar</additionalClasspathElement>
151+
<additionalClasspathElement>${project.build.directory}/steam/lib/jtwitter-2.8.5.jar</additionalClasspathElement>
152+
<additionalClasspathElement>${project.build.directory}/steam/lib/junit-4.11.jar</additionalClasspathElement>
153+
<additionalClasspathElement>${project.build.directory}/steam/lib/mail-1.4.7.jar</additionalClasspathElement>
154+
<additionalClasspathElement>${project.build.directory}/steam/lib/mockito-core-2.3.11.jar</additionalClasspathElement>
155+
<additionalClasspathElement>${project.build.directory}/steam/lib/mysql-connector-java-5.1.10.jar</additionalClasspathElement>
156+
<additionalClasspathElement>${project.build.directory}/steam/lib/nethelper-1.1.1.jar</additionalClasspathElement>
157+
<additionalClasspathElement>${project.build.directory}/steam/lib/objenesis-2.4.jar</additionalClasspathElement>
158+
<additionalClasspathElement>${project.build.directory}/steam/lib/seamless-http-1.1.1.jar</additionalClasspathElement>
159+
<additionalClasspathElement>${project.build.directory}/steam/lib/seamless-swing-1.1.1.jar</additionalClasspathElement>
160+
<additionalClasspathElement>${project.build.directory}/steam/lib/seamless-util-1.1.1.jar</additionalClasspathElement>
161+
<additionalClasspathElement>${project.build.directory}/steam/lib/seamless-xml-1.1.1.jar</additionalClasspathElement>
162+
<additionalClasspathElement>${project.build.directory}/steam/lib/ServerLauncher-0.43.jar</additionalClasspathElement>
163+
<additionalClasspathElement>${project.build.directory}/steam/lib/signpost-core-1.2.1.2.jar</additionalClasspathElement>
164+
<additionalClasspathElement>${project.build.directory}/steam/lib/sqlite-jdbc-3.8.11.2.jar</additionalClasspathElement>
165+
<additionalClasspathElement>${project.build.directory}/steam/lib/stax-api-1.0-2.jar</additionalClasspathElement>
166+
<additionalClasspathElement>${project.build.directory}/steam/lib/SteamServerJni.jar</additionalClasspathElement>
167+
<additionalClasspathElement>${project.build.directory}/steam/lib/WurmUnlimitedCommon-1.9.2.7.jar</additionalClasspathElement>
168+
</additionalClasspathElements>
169+
</configuration>
170+
</execution>
88171
</executions>
89172
</plugin>
90173
<plugin>
@@ -100,7 +183,7 @@
100183
<goal>install-file</goal>
101184
</goals>
102185
<configuration>
103-
<file>${project.build.directory}/steam/common.jar</file>
186+
<file>${project.build.directory}/common-${steamapps_buildid}.jar</file>
104187
<groupId>org.gotti.wurmunlimited</groupId>
105188
<artifactId>common</artifactId>
106189
<packaging>jar</packaging>
@@ -114,7 +197,7 @@
114197
<goal>install-file</goal>
115198
</goals>
116199
<configuration>
117-
<file>${project.build.directory}/steam/server.jar</file>
200+
<file>${project.build.directory}/server-${steamapps_buildid}.jar</file>
118201
<groupId>org.gotti.wurmunlimited</groupId>
119202
<artifactId>server</artifactId>
120203
<packaging>jar</packaging>
@@ -160,7 +243,7 @@
160243
<goal>deploy-file</goal>
161244
</goals>
162245
<configuration>
163-
<file>${project.build.directory}/steam/server.jar</file>
246+
<file>${project.build.directory}/server-${steamapps_buildid}.jar</file>
164247
<groupId>org.gotti.wurmunlimited</groupId>
165248
<artifactId>server</artifactId>
166249
<packaging>jar</packaging>
@@ -176,7 +259,7 @@
176259
<goal>deploy-file</goal>
177260
</goals>
178261
<configuration>
179-
<file>${project.build.directory}/steam/common.jar</file>
262+
<file>${project.build.directory}/common-${steamapps_buildid}.jar</file>
180263
<groupId>org.gotti.wurmunlimited</groupId>
181264
<artifactId>common</artifactId>
182265
<packaging>jar</packaging>

0 commit comments

Comments
 (0)