artin/API-Explorer
1
0
Fork 0
mirror of https://github.com/OpenBankProject/API-Explorer.git synced 2026-02-06 10:47:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgraded to scala 2.11, maven3 and sbt 0.13.9

Browse Source
This commit is contained in:
Petar Bozin 2016-07-15 12:01:53 +02:00
parent a971219019
commit 351cf4d8af
4 changed files with 58 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
pom.xml
View File

@ -11,10 +11,9 @@
<name>API Explorer</name>
<inceptionYear>2015</inceptionYear>
<properties>
<scala.version>2.10.5</scala.version>
<scala.baseversion>2.10</scala.baseversion>
<lift.version>2.6.2</lift.version>
<lift.baseversion>2.6</lift.baseversion>
<scala.compiler>2.11.8</scala.compiler>
<scala.version>2.11</scala.version>
<lift.version>2.6.3</lift.version>
<!-- Common plugin settings -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
@ -31,9 +30,9 @@
<url>https://oss.sonatype.org/content/groups/scala-tools/</url>
</repository>
<repository>
<id>java.net.maven2</id>
<name>java.net Maven2 Repository</name>
<url>http://download.java.net/maven/2/</url>
<id>java.net.maven3</id>
<name>java.net Maven3 Repository</name>
<url>http://download.java.net/maven/3/</url>
</repository>
<repository>
<id>scala-tools.snapshots</id>
@ -53,56 +52,61 @@
<dependencies>
<dependency>
<groupId>net.liftweb</groupId>
<artifactId>lift-mapper_${scala.baseversion}</artifactId>
<artifactId>lift-mapper_${scala.version}</artifactId>
<version>${lift.version}</version>
</dependency>
<dependency>
<groupId>net.liftmodules</groupId>
<artifactId>widgets_${lift.baseversion}_${scala.baseversion}</artifactId>
<version>1.3</version>
<artifactId>widgets_2.6_${scala.version}</artifactId>
<version>1.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.databinder</groupId>
<artifactId>dispatch-http_${scala.baseversion}</artifactId>
<artifactId>dispatch-http_${scala.version}</artifactId>
<version>0.8.10</version>
</dependency>
<dependency>
<groupId>net.databinder</groupId>
<artifactId>dispatch-oauth_${scala.baseversion}</artifactId>
<artifactId>dispatch-oauth_${scala.version}</artifactId>
<version>0.8.10</version>
</dependency>
<dependency>
<groupId>net.databinder.dispatch</groupId>
<artifactId>dispatch-lift-json_${scala.baseversion}</artifactId>
<version>0.11.0</version>
<artifactId>dispatch-lift-json_${scala.version}</artifactId>
<version>0.11.3</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>0.9.30</version>
<version>1.1.7</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.7</version>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_${scala.baseversion}</artifactId>
<version>2.3.0-SNAP2</version>
<artifactId>scalatest_${scala.version}</artifactId>
<version>2.2.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.scala-tools.testing</groupId>
<artifactId>specs_${scala.baseversion}</artifactId>
<version>1.6.9</version>
<groupId>org.scalaz.stream</groupId>
<artifactId>scalaz-stream_2.11</artifactId>
<version>0.8.3</version>
</dependency>
<dependency>
<groupId>org.specs2</groupId>
<artifactId>specs2_${scala.version}</artifactId>
<version>2.4.17</version>
<scope>test</scope>
</dependency>
<dependency>
@ -115,13 +119,13 @@
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-compiler</artifactId>
<version>${scala.version}</version>
<version>${scala.compiler}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>${scala.version}</version>
<version>${scala.compiler}</version>
</dependency>
<dependency>
<groupId>oauth.signpost</groupId>
@ -137,7 +141,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.7.2</version>
<version>${scala-version}</version>
<configuration>
<skipTests>true</skipTests>
</configuration>
@ -166,7 +170,7 @@
<!-- add src/main/java to source dirs -->
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.7</version>
<version>1.10</version>
<executions>
<execution>
<phase>generate-sources</phase>
@ -184,15 +188,15 @@
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<version>3.2.0</version>
<version>3.2.2</version>
<configuration>
<charset>${project.build.sourceEncoding}</charset>
<jvmArgs>
<jvmArg>-Xmx1024m</jvmArg>
<jvmArg>-DpackageLinkDefs=file://${project.build.directory}/packageLinkDefs.properties</jvmArg>
</jvmArgs>
<scalaCompatVersion>${scala.baseversion}</scalaCompatVersion>
<scalaVersion>${scala.version}</scalaVersion>
<scalaCompatVersion>${scala.version}</scalaCompatVersion>
<scalaVersion>${scala.compiler}</scalaVersion>
<recompileMode>incremental</recompileMode>
<useZincServer>true</useZincServer>
</configuration>
@ -228,7 +232,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.7</version>
<version>3.0.1</version>
<executions>
<execution>
<id>default-copy-resources</id>
@ -280,7 +284,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-idea-plugin</artifactId>
<version>2.2</version>
<version>2.2.1</version>
<configuration>
<downloadSources>true</downloadSources>
</configuration>
@ -288,7 +292,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
<version>2.7</version>
<version>2.10</version>
<configuration>
<downloadSources>true</downloadSources>
<additionalProjectnatures>
@ -306,7 +310,7 @@
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
<version>2.1.0</version>
<version>2.2.1</version>
<executions>
<execution>
<goals>
@ -328,7 +332,7 @@
<plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
<version>2.15.2</version>
<version>3.2.2</version>
<configuration>
<charset>${project.build.sourceEncoding}</charset>
<jvmArgs>

2
project/build.properties
View File

@ -1,2 +1,2 @@
#Project properties
sbt.version=0.11.3
sbt.version=0.13.9

22
project/build.scala
View File

@ -1,29 +1,21 @@
import sbt._
import Keys._
import com.github.siasia._
import PluginKeys._
import WebPlugin._
import WebappPlugin._
import com.earldouglas.xwp._
object LiftProjectBuild extends Build {
override lazy val settings = super.settings ++ buildSettings
lazy val buildSettings = Seq(
organization := pom.groupId,
version := pom.version
)
def yourWebSettings = webSettings ++ Seq(
// If you are use jrebel
scanDirectories in Compile := Nil
)
lazy val opanBank = Project(
pom.artifactId,
base = file("."),
settings = defaultSettings ++ yourWebSettings ++ pom.settings)
settings = defaultSettings ++ pom.settings)
.enablePlugins(JettyPlugin)
object pom {
@ -66,7 +58,7 @@ object LiftProjectBuild extends Build {
populateProps((rep \ "url").text) at populateProps((rep \ "url").text)
}
lazy val pomScalaVersion = (pom \ "properties" \ "scala.version").text
lazy val pomScalaVersion = (pom \ "properties" \ "scala.compiler").text
lazy val artifactId = (pom \ "artifactId").text
lazy val groupId = (pom \ "groupId").text
@ -85,7 +77,7 @@ object LiftProjectBuild extends Build {
name := pom.name,
resolvers ++= Seq(
"Typesafe Repo" at "http://repo.typesafe.com/typesafe/releases",
"Java.net Maven2 Repository" at "http://download.java.net/maven/2/",
"Java.net Maven3 Repository" at "http://download.java.net/maven/3/",
"Scala-Tools Dependencies Repository for Releases" at "http://scala-tools.org/repo-releases",
"Scala-Tools Dependencies Repository for Snapshots" at "http://scala-tools.org/repo-snapshots"),

20
project/plugins.sbt
View File

@ -7,14 +7,15 @@ resolvers += Classpaths.typesafeResolver
//xsbt-web-plugin
resolvers += "Web plugin repo" at "http://siasia.github.com/maven2"
addSbtPlugin("com.earldouglas" % "xsbt-web-plugin" % "2.1.0")
libraryDependencies <+= sbtVersion(v => v match {
case "0.11.0" => "com.github.siasia" %% "xsbt-web-plugin" % "0.11.0-0.2.8"
case "0.11.1" => "com.github.siasia" %% "xsbt-web-plugin" % "0.11.1-0.2.10"
case "0.11.2" => "com.github.siasia" %% "xsbt-web-plugin" % "0.11.2-0.2.11"
case "0.11.3" => "com.github.siasia" %% "xsbt-web-plugin" % "0.11.3-0.2.11.1"
})
//resolvers += "Web plugin repo" at "http://siasia.github.com/maven2"
//libraryDependencies <+= sbtVersion(v => v match {
//case "0.11.0" => "com.github.siasia" %% "xsbt-web-plugin" % "0.11.0-0.2.8"
//case "0.11.1" => "com.github.siasia" %% "xsbt-web-plugin" % "0.11.1-0.2.10"
//case "0.11.2" => "com.github.siasia" %% "xsbt-web-plugin" % "0.11.2-0.2.11"
//case "0.11.3" => "com.github.siasia" %% "xsbt-web-plugin" % "0.11.3-0.2.11.1"
//})
//sbteclipse
resolvers += {
@ -23,9 +24,10 @@ resolvers += {
Resolver.url("Typesafe Repository", typesafeRepoUrl)(pattern)
}
addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.1.0")
addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "4.0.0")
addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.8.2")
//sbt-idea
resolvers += "sbt-idea-repo" at "http://mpeltonen.github.com/maven/"
addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.0.0")
addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0")