Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don't worry, you can still create the pull request.
  • 9 commits
  • 6 files changed
  • 0 commit comments
  • 1 contributor
Commits on Dec 19, 2011
@hoijui hoijui [maven-release-plugin] prepare for next development iteration 48ac0df
@hoijui hoijui Maven: Upload site to github whenever it is built (for now)
site-deploy would use an other mechanism
08003ce
@hoijui hoijui include release instructions in the README [minor] 86a32fa
@hoijui hoijui fix a typo in a doc string [minor] 3d8d1ec
Commits on Dec 20, 2011
@hoijui hoijui prevent purely theoretical NullPointerException bf08aa7
@hoijui hoijui `String.equals("")` -> `String.isEmpty()` 0449164
@hoijui hoijui Maven: really include the minimal dependencies in the stand-alone sha…
…ded jar [fix]

Quite some dependencies were missing.
We now use excludes instead of includes.
With this commit, the stand-alone jar grows from ~400KB to ~5.6MB. :*(
Thus it is now about half the size of the stand-alone-full jar already.
69c20ab
@hoijui hoijui Maven: exclude dependencies sign-files from the shaded jar [fix]
You may interpret this as `unsigning` the dependencies.
This prevents a SecurityException at program start.

see related question:
http://stackoverflow.com/questions/8302022/maven-shade-jar-throw-exception
e66081e
@hoijui hoijui [maven-release-plugin] prepare release springls-0.37 b9a2a4a
View
50 README.markdown
@@ -142,6 +142,56 @@ You have to use the `--database` switch on the command-line,
because otherwise the server will run in LAN-mode, and not use the DB.
+## Release (devs only)
+
+### Prepare "target/" for the release process
+
+ mvn release:clean
+
+### Prepare the release
+* asks for the version to use
+* packages
+* signs with GPG
+* commits
+* tags
+* pushes to origin
+
+ mvn release:prepare
+
+### Perform the release (main part)
+* checks-out the release tag
+* builds
+* deploy into sonatype staging repository
+* uploads artifacts to the github download section
+
+ mvn release:perform
+
+### Release the site
+* generates the site, and pushes it to the github gh-pages branch,
+ visible under http://spring.github.com/SpringLS/
+
+ git checkout <release-tag>
+ mvn site
+ git checkout master
+
+### Promote it on Maven
+Moves it from the sonatype staging to the main sonatype repo
+
+1. using the Nexus staging plugin:
+
+ mvn nexus:staging-close
+ mvn nexus:staging-release
+
+2. ... alternatively, using the web-interface:
+ * firefox https://oss.sonatype.org
+ * login
+ * got to the "Staging Repositories" tab
+ * select "com.springrts..."
+ * "Close" it
+ * select "com.springrts..." again
+ * "Release" it
+
+
## Notes
* A Client may participate in only one battle at the same time. If he is hosting
View
49 pom.xml
@@ -15,7 +15,7 @@
<groupId>com.springrts.springls</groupId>
<artifactId>springls</artifactId>
- <version>0.36</version>
+ <version>0.37</version>
<!-- This is a requirement to be able to sync to Maven central -->
<parent>
@@ -293,13 +293,33 @@
have to be added to the classpath
when executing the server.
-->
- <includes>
- <include>org.slf4j:slf4j-api</include>
- <include>ch.qos.logback:logback-classic</include>
- <include>javax.persistence:persistence-api</include>
- <include>net.iharder:base64</include>
- </includes>
+ <excludes>
+ <exclude>commons-pool:commons-pool</exclude>
+ <exclude>commons-dbcp:commons-dbcp</exclude>
+ <exclude>javax.persistence:persistence-api</exclude>
+ <exclude>javax.transaction:jta</exclude>
+ <exclude>org.hibernate:*</exclude>
+ <exclude>org.apache.openjpa:*</exclude>
+ <exclude>mysql:*</exclude>
+ <exclude>postgresql:*</exclude>
+ </excludes>
</artifactSet>
+ <filters>
+ <filter>
+ <!--
+ Exclude files that sign a jar
+ (one or multiple of the dependencies).
+ One may not repack a signed jar without
+ this, or you will get a
+ SecurityException at program start.
+ -->
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>META-INF/*.SF</exclude>
+ <exclude>META-INF/*.RSA</exclude>
+ </excludes>
+ </filter>
+ </filters>
</configuration>
</execution>
@@ -312,6 +332,19 @@
<configuration>
<shadedArtifactAttached>true</shadedArtifactAttached>
<shadedClassifierName>stand-alone-full</shadedClassifierName>
+ <filters>
+ <filter>
+ <!--
+ Exclude files that sign a jar.
+ This prevents a SecurityException.
+ -->
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>META-INF/*.SF</exclude>
+ <exclude>META-INF/*.RSA</exclude>
+ </excludes>
+ </filter>
+ </filters>
</configuration>
</execution>
</executions>
@@ -392,7 +425,7 @@
<goals>
<goal>site</goal>
</goals>
- <phase>site-deploy</phase>
+ <phase>site</phase>
</execution>
</executions>
</plugin>
View
2  src/main/java/com/springrts/springls/Client.java
@@ -549,7 +549,7 @@ public void endFastWrite() {
String data = fastWrite.toString();
fastWrite = null;
- if (data.equals("")) {
+ if (data.isEmpty()) {
return;
}
sendLine(data);
View
2  src/main/java/com/springrts/springls/Main.java
@@ -84,7 +84,7 @@ private static Options createOptions() {
Option natPort = new Option("n", "nat-port", true,
"The (UDP) port number to host the NAT traversal techniques"
- + " help service on [1, 65535], which lets clients detect thier"
+ + " help service on [1, 65535], which lets clients detect their"
+ " source port, for example when using \"hole punching\"."
+ " The default is "
+ defaults.getInt(ServerConfiguration.NAT_PORT) + ".");
View
6 src/main/java/com/springrts/springls/accounts/AccountUtils.java
@@ -109,10 +109,14 @@ public static void createAliBaba(AccountsService actSrvc) {
public static void main(String[] args) {
String toDo = (args.length > 0 ? args[0] : "");
- if (toDo.equals("")) {
+ if (toDo.isEmpty()) {
BufferedReader console = new BufferedReader(new InputStreamReader(System.in));
try {
toDo = console.readLine();
+ if (toDo == null) {
+ // makes FindBugs happy, even though we will never get here
+ toDo = "";
+ }
} catch (IOException ex) {
System.err.println("Failed reading from the command-line");
}
View
2  src/main/java/com/springrts/springls/ip2country/UpdateIP2CountryThread.java
@@ -198,7 +198,7 @@ private static void downloadAndCombineRawSources(List<URL> sourceUrls,
String inLine;
while ((inLine = sourceRawIn.readLine()) != null) {
inLine = inLine.trim();
- if (inLine.equals("") || inLine.charAt(0) == '#') {
+ if (inLine.isEmpty() || inLine.charAt(0) == '#') {
continue;
}

No commit comments for this range

Something went wrong with that request. Please try again.