Final build

funkemunky · Oct 31, 2019 · b38652f · b38652f
1 parent e9fc95f
commit b38652f
Show file tree

Hide file tree

Showing 8 changed files with 114 additions and 20 deletions.
diff --git a/AtlasParent/Atlas/buildNumber.properties b/AtlasParent/Atlas/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
-#Thu Oct 31 08:58:20 EDT 2019
-buildNumber=513
+#Thu Oct 31 12:40:00 EDT 2019
+buildNumber=517
diff --git a/AtlasParent/Atlas/dependency-reduced-pom.xml b/AtlasParent/Atlas/dependency-reduced-pom.xml
@@ -25,6 +25,11 @@
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.7.0</version>
+        <configuration>
+          <source>8</source>
+          <target>8</target>
+          <compilerArgument>-XDignore.symbol.file</compilerArgument>
+        </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-shade-plugin</artifactId>
@@ -88,7 +93,7 @@
   <repositories>
     <repository>
       <id>funkemunky-releases</id>
-      <url>http:/nexus.funkemunky.cc/content/repositories/releases/</url>
+      <url>http://nexus.funkemunky.cc/content/repositories/releases/</url>
     </repository>
   </repositories>
   <dependencies>
@@ -194,6 +199,12 @@
       <version>1.18.0</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>cc.funkemunky.utils</groupId>
+      <artifactId>java-rt</artifactId>
+      <version>8</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 </project>
 
diff --git a/AtlasParent/Atlas/pom.xml b/AtlasParent/Atlas/pom.xml
@@ -104,15 +104,15 @@
     <repositories>
         <repository>
             <id>funkemunky-releases</id>
-            <url>http:/nexus.funkemunky.cc/content/repositories/releases/</url>
+            <url>http://nexus.funkemunky.cc/content/repositories/releases/</url>
         </repository>
     </repositories>
 
     <dependencies>
         <dependency>
             <groupId>cc.funkemunky.utils</groupId>
             <artifactId>ProjectCarbon</artifactId>
-            <version>1.2.1</version>
+            <version>1.2.2</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/AtlasParent/Atlas/src/main/java/cc/funkemunky/api/Atlas.java b/AtlasParent/Atlas/src/main/java/cc/funkemunky/api/Atlas.java
@@ -113,7 +113,7 @@ public void onEnable() {
         updater = new Updater();
 
         runTasks();
-        initCarbon();
+        Carbon.init();
 
         MiscUtils.printToConsole(Color.Gray + "Starting scanner...");
 
@@ -174,17 +174,6 @@ public void onDisable() {
         MiscUtils.printToConsole(Color.Red + "Completed shutdown process.");
     }
 
-    private void initCarbon() {
-        carbon = new Carbon();
-
-        if(MongoSettings.enabled) {
-            carbon.initMongo(MongoSettings.database,
-                    MongoSettings.ip,
-                    MongoSettings.port,
-                    MongoSettings.username,
-                    MongoSettings.password);
-        }
-    }
 
     private void shutdownExecutor() {
         service.shutdown();

diff --git a/AtlasParent/Atlas/src/main/java/cc/funkemunky/api/updater/Updater.java b/AtlasParent/Atlas/src/main/java/cc/funkemunky/api/updater/Updater.java
@@ -13,7 +13,7 @@
 
 @Getter
 public class Updater {
-    private int update = -1, currentUpdate = 50;
+    private int update = -1, currentUpdate = 51;
     private String version, downloadLink;
     private File pluginLocation;
     private boolean importantUpdate = true;

diff --git a/AtlasParent/AtlasBungee/buildNumber.properties b/AtlasParent/AtlasBungee/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
-#Thu Oct 31 08:58:20 EDT 2019
-buildNumber=270
+#Thu Oct 31 12:40:00 EDT 2019
+buildNumber=275
diff --git a/AtlasParent/AtlasBungee/dependency-reduced-pom.xml b/AtlasParent/AtlasBungee/dependency-reduced-pom.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <artifactId>atlas-parent</artifactId>
+    <groupId>cc.funkemunky.utils</groupId>
+    <version>1.6.2</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>AtlasBungee</artifactId>
+  <scm>
+    <connection>scm:svn:http://127.0.0.1/dummy</connection>
+    <developerConnection>scm:svn:https://127.0.0.1/dummy</developerConnection>
+    <url>http://127.0.0.1/dummy</url>
+  </scm>
+  <build>
+    <resources>
+      <resource>
+        <filtering>true</filtering>
+        <directory>src/main/resources</directory>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.7.0</version>
+        <configuration>
+          <source>8</source>
+          <target>8</target>
+          <compilerArgument>-XDignore.symbol.file</compilerArgument>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>3.1.0</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <minimizeJar>true</minimizeJar>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>buildnumber-maven-plugin</artifactId>
+        <version>1.4</version>
+        <executions>
+          <execution>
+            <id>buildnumber</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>create</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <format>{0,number}</format>
+          <items>
+            <item>buildNumber</item>
+          </items>
+          <doCheck>false</doCheck>
+          <doUpdate>false</doUpdate>
+          <revisionOnScmFailure>unknownbuild</revisionOnScmFailure>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <repositories>
+    <repository>
+      <id>funkemunky-releases</id>
+      <url>http://funkemunky.cc:8080/nexus/content/repositories/releases/</url>
+    </repository>
+  </repositories>
+  <dependencies>
+    <dependency>
+      <groupId>org.github.bungee</groupId>
+      <artifactId>BungeeCord-1.8</artifactId>
+      <version>1.8</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.github.lombok</groupId>
+      <artifactId>lombok</artifactId>
+      <version>1.18.0</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+</project>
+
diff --git a/AtlasParent/pom.xml b/AtlasParent/pom.xml
@@ -53,6 +53,7 @@
             <groupId>cc.funkemunky.utils</groupId>
             <artifactId>java-rt</artifactId>
             <version>8</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>