Merge commit 'b32d6d87e6af1610a7086c26e278e575f5fbc145'

Thanks @Shalar
md-5 · Feb 3, 2012 · 497056e · 497056e
2 parents d3b0959 + b32d6d8
commit 497056e
Show file tree

Hide file tree

Showing 22 changed files with 348 additions and 726 deletions.
diff --git a/AutoGroup-1.0.zip b/AutoGroup-1.0.zip
diff --git a/AutoGroup-1.1.1.zip b/AutoGroup-1.1.1.zip
diff --git a/AutoGroup-1.1.zip b/AutoGroup-1.1.zip
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.md_5.autogroup</groupId>
     <artifactId>AutoGroup</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.2.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>AutoGroup</name>
@@ -19,8 +19,41 @@
         <dependency>
             <groupId>org.bukkit</groupId>
             <artifactId>bukkit</artifactId>
-            <version>1.0.1-R2-SNAPSHOT</version>
+            <version>1.1-R4-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+        	<groupId>joda-time</groupId>
+        	<artifactId>joda-time</artifactId>
+        	<version>2.1.alpha</version>
         </dependency>
     </dependencies>
-
+  	<build>
+  	    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>1.5</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <artifactSet>
+                <excludes>
+                  <exclude>classworlds:classworlds</exclude>
+                  <exclude>junit:junit</exclude>
+                  <exclude>jmock:*</exclude>
+                  <exclude>*:xml-apis</exclude>
+                  <exclude>org.apache.maven:lib:tests</exclude>
+                  <exclude>org.bukkit</exclude>
+                </excludes>
+              </artifactSet>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+	</build>
 </project>
diff --git a/release/AutoGroup-1.2.0.jar b/release/AutoGroup-1.2.0.jar
diff --git a/release/AutoGroup-1.2.1.jar b/release/AutoGroup-1.2.1.jar
diff --git a/release/AutoGroup-1.2.2.jar b/release/AutoGroup-1.2.2.jar
diff --git a/release/donate-dummy.php b/release/donate-dummy.php
diff --git a/release/donate-sandbox.php b/release/donate-sandbox.php