Merge pull request #226 from hazendaz/master

Moving base to java 1.7
Waffle · Jun 15, 2015 · 560ef31 · 560ef31
2 parents ddbeb7f + a5bd130
commit 560ef31
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 28 deletions.
diff --git a/Source/JNA/pom.xml b/Source/JNA/pom.xml
@@ -102,8 +102,8 @@
  <copyright>2015</copyright>
  <jacoco.minimum.coverage>0.0</jacoco.minimum.coverage>
  <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
  <maven.compiler.testSource>1.7</maven.compiler.testSource>
  <maven.compiler.testTarget>1.7</maven.compiler.testTarget>
  <maven.min-version>3.2.3</maven.min-version>
@@ -122,8 +122,8 @@
  <mockito.version>1.10.19</mockito.version>
  <slf4j.version>1.7.12</slf4j.version>
 
- <signature.artifact>java16</signature.artifact>
- <signature.version>1.1</signature.version>
+ <signature.artifact>java17</signature.artifact>
+ <signature.version>1.0</signature.version>
  </properties>
  <dependencies>
  <dependency>
@@ -267,7 +267,7 @@
  <plugin>
  <groupId>pl.project13.maven</groupId>
  <artifactId>git-commit-id-plugin</artifactId>
- <version>2.1.13</version>
+ <version>2.1.15</version>
  </plugin>
  <plugin>
  <groupId>org.codehaus.mojo</groupId>
@@ -310,7 +310,7 @@
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-assembly-plugin</artifactId>
- <version>2.5.4</version>
+ <version>2.5.5</version>
  <configuration>
  <descriptor>${project.basedir}/src/assembly/assembly.xml</descriptor>
  </configuration>
@@ -359,7 +359,7 @@
  <plugin>
  <groupId>org.jacoco</groupId>
  <artifactId>jacoco-maven-plugin</artifactId>
- <version>0.7.4.201502262128</version>
+ <version>0.7.5.201505241946</version>
  </plugin>
  <plugin>
  <groupId>org.eluder.coveralls</groupId>
@@ -384,9 +384,9 @@
  </dependencies>
  </plugin>
  <plugin>
- <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
- <artifactId>maven-java-formatter-plugin</artifactId>
- <version>0.4</version>
+ <groupId>net.revelc.code</groupId>
+ <artifactId>formatter-maven-plugin</artifactId>
+ <version>0.5.2</version>
  </plugin>
  <plugin>
  <groupId>com.mycila</groupId>
@@ -461,12 +461,12 @@
  <dependency>
  <groupId>com.jcraft</groupId>
  <artifactId>jsch</artifactId>
- <version>0.1.52</version>
+ <version>0.1.53</version>
  </dependency>
  <dependency>
  <groupId>org.eclipse.jgit</groupId>
  <artifactId>org.eclipse.jgit</artifactId>
- <version>3.7.1.201504261725-r </version>
+ <version>4.0.0.201506090130-r</version>
  </dependency>
  <dependency>
  <groupId>org.codehaus.plexus</groupId>
@@ -502,7 +502,7 @@
  <plugin>
  <groupId>org.owasp</groupId>
  <artifactId>dependency-check-maven</artifactId>
- <version>1.2.10</version>
+ <version>1.2.11</version>
  </plugin>
  </plugins>
  </pluginManagement>
@@ -1026,9 +1026,9 @@
  </pluginExecution>
  <pluginExecution>
  <pluginExecutionFilter>
- <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
- <artifactId>maven-java-formatter-plugin</artifactId>
- <versionRange>[0.4,)</versionRange>
+ <groupId>net.revelc.code</groupId>
+ <artifactId>formatter-maven-plugin</artifactId>
+ <versionRange>[0.5.2,)</versionRange>
  <goals>
  <goal>format</goal>
  </goals>
@@ -1068,8 +1068,8 @@
  <build>
  <plugins>
  <plugin>
- <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
- <artifactId>maven-java-formatter-plugin</artifactId>
+ <groupId>net.revelc.code</groupId>
+ <artifactId>formatter-maven-plugin</artifactId>
  <configuration>
  <configFile>${src.relative.loc}/format.xml</configFile>
  </configuration>

diff --git a/Source/JNA/waffle-distro/pom.xml b/Source/JNA/waffle-distro/pom.xml
@@ -17,7 +17,7 @@
  <src.relative.loc>..</src.relative.loc>
  <git.relative.loc>../../..</git.relative.loc>
 
- <logback.version>1.1.2</logback.version>
+ <logback.version>1.1.3</logback.version>
  </properties>
  <scm>
  <connection>scm:git:ssh://git@github.com/dblock/waffle.git</connection>

diff --git a/Source/JNA/waffle-jetty/pom.xml b/Source/JNA/waffle-jetty/pom.xml
@@ -14,15 +14,12 @@
  <description>Jetty integration for WAFFLE</description>
  <url>http://dblock.github.com/waffle/</url>
  <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
-
  <src.relative.loc>..</src.relative.loc>
  <git.relative.loc>../../..</git.relative.loc>
 
- <el.version>3.0.1-b05</el.version>
+ <el.version>3.0.1-b08</el.version>
  <el-api.version>3.0.1-b04</el-api.version>
- <jetty.version>9.2.10.v20150310</jetty.version>
+ <jetty.version>9.2.11.v20150529</jetty.version>
  <jdt.version>4.4.2</jdt.version>
  <jsp.version>2.3.3-b02</jsp.version>
  <jsp-api.version>2.3.2-b01</jsp-api.version>

diff --git a/Source/JNA/waffle-spring-security4/pom.xml b/Source/JNA/waffle-spring-security4/pom.xml
@@ -14,9 +14,6 @@
  <description>Spring Security 4 integration for WAFFLE</description>
  <url>http://dblock.github.com/waffle/</url>
  <properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
-
  <src.relative.loc>..</src.relative.loc>
  <git.relative.loc>../../..</git.relative.loc>
 

diff --git a/Source/JNA/waffle-tomcat8/pom.xml b/Source/JNA/waffle-tomcat8/pom.xml
@@ -20,7 +20,7 @@
  <src.relative.loc>..</src.relative.loc>
  <git.relative.loc>../../..</git.relative.loc>
 
- <tomcat.version>8.0.22</tomcat.version>
+ <tomcat.version>8.0.23</tomcat.version>
  </properties>
  <scm>
  <connection>scm:git:ssh://git@github.com/dblock/waffle.git</connection>