Skip to content

Commit b2ddc46

Browse files
ago1024ago1024
committed
updates to server and common artifact generation
- only generate stubs for com.wurmonline packages - install original files to local m2 repository - deploy stubs to public repository
1 parent 824215c commit b2ddc46

File tree

1 file changed

+21
-58
lines changed

1 file changed

+21
-58
lines changed

‎modules/steam-files/pom.xml‎

Lines changed: 21 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
<groupId>org.gotti.wurmunlimited</groupId>
66
<artifactId>steam-files</artifactId>
7-
<version>0.44-SNAPSHOT</version>
7+
<version>0.46-SNAPSHOT</version>
88
<packaging>pom</packaging>
99

1010
<parent>
1111
<groupId>org.gotti.wurmunlimited</groupId>
1212
<artifactId>server-modlauncher-parent</artifactId>
13-
<version>0.44-SNAPSHOT</version>
13+
<version>0.46-SNAPSHOT</version>
1414
<relativePath>../..</relativePath>
1515
</parent>
1616

@@ -20,7 +20,7 @@
2020
<dependency>
2121
<groupId>org.gotti.stubgenerator</groupId>
2222
<artifactId>stubgenerator</artifactId>
23-
<version>1.1</version>
23+
<version>1.2</version>
2424
<scope>compile</scope>
2525
</dependency>
2626
</dependencies>
@@ -82,10 +82,10 @@
8282
<configuration>
8383
<executable>${steamcmd}</executable>
8484
<arguments>
85-
<argument>+login</argument>
86-
<argument>anonymous</argument>
8785
<argument>+force_install_dir</argument>
8886
<argument>${project.build.directory}/steam</argument>
87+
<argument>+login</argument>
88+
<argument>anonymous</argument>
8989
<argument>+app_update</argument>
9090
<argument>402370</argument>
9191
<argument>-beta</argument>
@@ -107,6 +107,8 @@
107107
<argument>${project.build.directory}/steam/common.jar</argument>
108108
<argument>--target</argument>
109109
<argument>${project.build.directory}/common-${steamapps_buildid}.jar</argument>
110+
<argument>--include</argument>
111+
<argument>com.wumonline</argument>
110112
</arguments>
111113
</configuration>
112114
</execution>
@@ -123,48 +125,11 @@
123125
<argument>${project.build.directory}/steam/server.jar</argument>
124126
<argument>--target</argument>
125127
<argument>${project.build.directory}/server-${steamapps_buildid}.jar</argument>
128+
<argument>--include</argument>
129+
<argument>com.wumonline</argument>
126130
</arguments>
127131
<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>
166132
<additionalClasspathElement>${project.build.directory}/steam/lib/SteamServerJni.jar</additionalClasspathElement>
167-
<additionalClasspathElement>${project.build.directory}/steam/lib/WurmUnlimitedCommon-1.9.2.7.jar</additionalClasspathElement>
168133
</additionalClasspathElements>
169134
</configuration>
170135
</execution>
@@ -175,6 +140,10 @@
175140
<artifactId>maven-install-plugin</artifactId>
176141
<version>2.5.2</version>
177142
<inherited>false</inherited>
143+
<configuration>
144+
<groupId>org.gotti.wurmunlimited</groupId>
145+
<version>${steamapps_buildid}</version>
146+
</configuration>
178147
<executions>
179148
<execution>
180149
<id>install-common</id>
@@ -183,11 +152,9 @@
183152
<goal>install-file</goal>
184153
</goals>
185154
<configuration>
186-
<file>${project.build.directory}/common-${steamapps_buildid}.jar</file>
187-
<groupId>org.gotti.wurmunlimited</groupId>
155+
<file>${project.build.directory}/steam/common.jar</file>
188156
<artifactId>common</artifactId>
189157
<packaging>jar</packaging>
190-
<version>${steamapps_buildid}</version>
191158
</configuration>
192159
</execution>
193160
<execution>
@@ -197,11 +164,9 @@
197164
<goal>install-file</goal>
198165
</goals>
199166
<configuration>
200-
<file>${project.build.directory}/server-${steamapps_buildid}.jar</file>
201-
<groupId>org.gotti.wurmunlimited</groupId>
167+
<file>${project.build.directory}/steam/server.jar</file>
202168
<artifactId>server</artifactId>
203169
<packaging>jar</packaging>
204-
<version>${steamapps_buildid}</version>
205170
</configuration>
206171
</execution>
207172
</executions>
@@ -235,6 +200,12 @@
235200
<plugin>
236201
<artifactId>maven-deploy-plugin</artifactId>
237202
<version>2.7</version>
203+
<configuration>
204+
<groupId>org.gotti.wurmunlimited</groupId>
205+
<version>${steamapps_buildid}</version>
206+
<repositoryId>gotti-no-ip-org-ssh-repository</repositoryId>
207+
<url>scp://gotti.no-ip.org/srv/maven/repository</url>
208+
</configuration>
238209
<executions>
239210
<execution>
240211
<id>deploy-server</id>
@@ -244,12 +215,8 @@
244215
</goals>
245216
<configuration>
246217
<file>${project.build.directory}/server-${steamapps_buildid}.jar</file>
247-
<groupId>org.gotti.wurmunlimited</groupId>
248218
<artifactId>server</artifactId>
249219
<packaging>jar</packaging>
250-
<version>${steamapps_buildid}</version>
251-
<repositoryId>gotti-no-ip-org-ssh-repository</repositoryId>
252-
<url>scp://gotti.no-ip.org/srv/maven/repository</url>
253220
</configuration>
254221
</execution>
255222
<execution>
@@ -260,12 +227,8 @@
260227
</goals>
261228
<configuration>
262229
<file>${project.build.directory}/common-${steamapps_buildid}.jar</file>
263-
<groupId>org.gotti.wurmunlimited</groupId>
264230
<artifactId>common</artifactId>
265231
<packaging>jar</packaging>
266-
<version>${steamapps_buildid}</version>
267-
<repositoryId>gotti-no-ip-org-ssh-repository</repositoryId>
268-
<url>scp://gotti.no-ip.org/srv/maven/repository</url>
269232
</configuration>
270233
</execution>
271234
</executions>

0 commit comments

Comments
 (0)