#539 Upgrade to Java 8

Igor Polevoy · Igor Polevoy · commit 11502f720cbb · 2016-09-29T02:38:22.000-05:00
diff --git a/activejdbc-gradle-plugin/build.gradle b/activejdbc-gradle-plugin/build.gradle
@@ -3,7 +3,7 @@ version '1.4.12-SNAPSHOT'
 
 apply plugin: 'groovy'
 
-sourceCompatibility = 1.7
+sourceCompatibility = 1.8
 
 repositories {
     mavenCentral()
diff --git a/activejdbc-gradle-plugin/pom.xml b/activejdbc-gradle-plugin/pom.xml
@@ -54,7 +54,11 @@
     </profiles>
 
     <build>
+
         <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
             <!-- Runs the gradle managed build which will produce all artifacts -->
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
diff --git a/activejdbc-instrumentation/pom.xml b/activejdbc-instrumentation/pom.xml
@@ -27,6 +27,9 @@
 
     <build>
         <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
diff --git a/activejdbc/pom.xml b/activejdbc/pom.xml
@@ -174,13 +174,6 @@
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.2</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                    <meminitial>128m</meminitial>
-                    <maxmem>512m</maxmem>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -195,7 +188,7 @@
                         <configuration>
                             <rules>
                                 <requireJavaVersion>
-                                    <version>1.7</version>
+                                    <version>1.8</version>
                                 </requireJavaVersion>
                             </rules>
                         </configuration>
diff --git a/app-config/pom.xml b/app-config/pom.xml
@@ -11,6 +11,13 @@
         <version>1.4.13-SNAPSHOT</version>
     </parent>
 
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
     <profiles>
         <profile>
             <id>release</id>
diff --git a/db-migrator-integration-test/pom.xml b/db-migrator-integration-test/pom.xml
@@ -26,6 +26,9 @@
     </profiles>
     <build>
         <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
diff --git a/db-migrator-integration-test/src/test/project/test-project-environments/pom.xml b/db-migrator-integration-test/src/test/project/test-project-environments/pom.xml
@@ -15,7 +15,7 @@
             <plugin>
                 <groupId>org.javalite</groupId>
                 <artifactId>db-migrator-maven-plugin</artifactId>
-                <version>1.4.12-SNAPSHOT</version>
+                <version>1.4.13-SNAPSHOT</version>
                 <configuration>
                     <configFile>${basedir}/db.properties</configFile>
                     <environments>development, staging</environments>
diff --git a/db-migrator-integration-test/src/test/project/test-project-properties/pom.xml b/db-migrator-integration-test/src/test/project/test-project-properties/pom.xml
@@ -15,7 +15,7 @@
             <plugin>
                 <groupId>org.javalite</groupId>
                 <artifactId>db-migrator-maven-plugin</artifactId>
-                <version>1.4.12-SNAPSHOT</version>
+                <version>1.4.13-SNAPSHOT</version>
                 <configuration>
                     <environments>development</environments>
                 </configuration>
diff --git a/db-migrator-integration-test/src/test/project/test-project/pom.xml b/db-migrator-integration-test/src/test/project/test-project/pom.xml
@@ -15,7 +15,7 @@
             <plugin>
                 <groupId>org.javalite</groupId>
                 <artifactId>db-migrator-maven-plugin</artifactId>
-                <version>1.4.12-SNAPSHOT</version>
+                <version>1.4.13-SNAPSHOT</version>
                 <configuration>
                     <driver>com.mysql.jdbc.Driver</driver>
                     <url>jdbc:mysql://localhost/test_project</url>
diff --git a/db-migrator/pom.xml b/db-migrator/pom.xml
@@ -27,6 +27,9 @@
     </profiles>
     <build>
         <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
diff --git a/db-migrator/src/test/test-project/pom.xml b/db-migrator/src/test/test-project/pom.xml
@@ -15,7 +15,7 @@
             <plugin>
                 <groupId>org.javalite</groupId>
                 <artifactId>db-migrator-maven-plugin</artifactId>
-                <version>1.4.12-SNAPSHOT</version>
+                <version>1.4.13-SNAPSHOT</version>
                 <configuration>
                     <driver>com.mysql.jdbc.Driver</driver>
                     <url>jdbc:mysql://localhost/test_project</url>
diff --git a/git-info-maven-plugin/README.md b/git-info-maven-plugin/README.md
@@ -21,7 +21,7 @@ To configure this plugin, add this block to your pom:
     <plugin>
         <groupId>com.javalite</groupId>
         <artifactId>git-info-maven-plugin</artifactId>
-        <version>1.4.10-SNAPSHOT</version>
+        <version>1.4.12</version>
         <executions>
             <execution>
                 <phase>compile</phase>
diff --git a/git-info-maven-plugin/pom.xml b/git-info-maven-plugin/pom.xml
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.javalite</groupId>
             <artifactId>javalite-common</artifactId>
-            <version>1.4.13-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
         </dependencies>
 
diff --git a/javalite-common/pom.xml b/javalite-common/pom.xml
@@ -29,13 +29,6 @@
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.2</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                    <meminitial>128m</meminitial>
-                    <maxmem>512m</maxmem>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/pom.xml b/pom.xml
@@ -21,9 +21,8 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<!-- usage of @Override -->
-		<maven.compiler.source>1.7</maven.compiler.source>
-		<maven.compiler.target>1.7</maven.compiler.target>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
         <skipTests>false</skipTests>
 	</properties>
 	
@@ -57,10 +56,21 @@
     <build>
         <pluginManagement>
             <plugins>
+                <plugin>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.2</version>
+                    <configuration>
+                        <source>${maven.compiler.source}</source>
+                        <target>${maven.compiler.target}</target>
+                        <meminitial>128m</meminitial>
+                        <maxmem>512m</maxmem>
+                    </configuration>
+                </plugin>
+
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.9</version>
+                    <version>2.19.1</version>
                     <configuration>
                         <reportFormat>brief</reportFormat>
                         <trimStackTrace>true</trimStackTrace>
