Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Updates for #1385: Lift-2.5 jpa archetypes poms

  • Loading branch information...
commit 54e5451e580f8856147bd09ee0e2b7ff13939780 1 parent 13470db
@ldeck authored
Showing with 63 additions and 138 deletions.
  1. +1 −1  lift-archetype-jpa-basic/pom.xml
  2. +12 −12 lift-archetype-jpa-basic/src/main/resources/archetype-resources/pom.xml
  3. +0 −7 lift-archetype-jpa-basic/src/main/resources/archetype-resources/project/build.properties
  4. +0 −21 lift-archetype-jpa-basic/src/main/resources/archetype-resources/project/build/LiftProject.scala
  5. +7 −7 lift-archetype-jpa-basic/src/main/resources/archetype-resources/web/pom.xml
  6. +1 −1  lift-archetype-jpa-blank-single/pom.xml
  7. +1 −0  lift-archetype-jpa-blank-single/src/it/sample/invoker.properties
  8. +20 −20 lift-archetype-jpa-blank-single/src/main/resources/archetype-resources/pom.xml
  9. +0 −7 lift-archetype-jpa-blank-single/src/main/resources/archetype-resources/project/build.properties
  10. +0 −13 lift-archetype-jpa-blank-single/src/main/resources/archetype-resources/project/build/LiftProject.scala
  11. +1 −1  lift-archetype-jpa-blank/pom.xml
  12. +13 −13 lift-archetype-jpa-blank/src/main/resources/archetype-resources/pom.xml
  13. +0 −7 lift-archetype-jpa-blank/src/main/resources/archetype-resources/project/build.properties
  14. +0 −21 lift-archetype-jpa-blank/src/main/resources/archetype-resources/project/build/LiftProject.scala
  15. +7 −7 lift-archetype-jpa-blank/src/main/resources/archetype-resources/web/pom.xml
View
2  lift-archetype-jpa-basic/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>net.liftweb</groupId>
<artifactId>archetypes_2.9.1</artifactId>
- <version>2.4-SNAPSHOT</version>
+ <version>2.5-SNAPSHOT</version>
</parent>
<artifactId>lift-archetype-jpa-basic_2.9.1</artifactId>
<packaging>maven-archetype</packaging>
View
24 lift-archetype-jpa-basic/src/main/resources/archetype-resources/pom.xml
@@ -24,9 +24,9 @@
<maven.scaladoc.vscaladocVersion>1.2-m1</maven.scaladoc.vscaladocVersion>
<vscaladoc.links.liftweb.pathsufix>scaladocs/</vscaladoc.links.liftweb.pathsufix>
#if ($liftVersion.endsWith("SNAPSHOT"))
- <vscaladoc.links.liftweb.baseurl>http://scala-tools.org/mvnsites-snapshots/liftweb</vscaladoc.links.liftweb.baseurl>
+ <vscaladoc.links.liftweb.baseurl>https://oss.sonatype.org/content/repositories/snapshots/liftweb</vscaladoc.links.liftweb.baseurl>
#else
- <vscaladoc.links.liftweb.baseurl>http://scala-tools.org/mvnsites/liftweb</vscaladoc.links.liftweb.baseurl>
+ <vscaladoc.links.liftweb.baseurl>https://oss.sonatype.org/content/groups/scala-tools/liftweb</vscaladoc.links.liftweb.baseurl>
#end
</properties>
@@ -35,7 +35,7 @@
<repository>
<id>scala-tools.releases</id>
<name>Scala-Tools Dependencies Repository for Releases</name>
- <url>http://scala-tools.org/repo-releases</url>
+ <url>https://oss.sonatype.org/content/groups/scala-tools</url>
</repository>
<repository>
<id>java.net.maven2</id>
@@ -46,7 +46,7 @@
<repository>
<id>scala-tools.snapshots</id>
<name>Scala-Tools Dependencies Repository for Snapshots</name>
- <url>http://scala-tools.org/repo-snapshots</url>
+ <url>https://oss.sonatype.org/content/repositories/snapshots</url>
<snapshots/>
</repository>
#end
@@ -56,7 +56,7 @@
<pluginRepository>
<id>scala-tools.releases</id>
<name>Scala-Tools Plugins Repository for Releases</name>
- <url>http://scala-tools.org/repo-releases</url>
+ <url>https://oss.sonatype.org/content/groups/scala-tools</url>
</pluginRepository>
</pluginRepositories>
@@ -70,24 +70,24 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.6.1</version>
+ <version>1.7.2</version>
</dependency>
#if ($logBackend.equalsIgnoreCase("logback"))
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>0.9.26</version>
+ <version>1.0.6</version>
</dependency>
#elseif ($logBackend.equalsIgnoreCase("log4j"))
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.16</version>
+ <version>1.2.17</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.6.1</version>
+ <version>1.7.2</version>
</dependency>
#end
<dependency>
@@ -105,7 +105,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.7</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -141,7 +141,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
<executions>
<execution>
<id>default-copy-resources</id>
@@ -182,7 +182,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
- <version>2.7</version>
+ <version>2.9</version>
<configuration>
<downloadSources>true</downloadSources>
<additionalProjectnatures>
View
7 lift-archetype-jpa-basic/src/main/resources/archetype-resources/project/build.properties
@@ -1,7 +0,0 @@
-project.organization=$groupId
-project.name=$artifactId
-project.version=$version
-sbt.version=0.7.4
-def.scala.version=2.7.7
-build.scala.versions=$scalaVersion
-project.initialize=false
View
21 lift-archetype-jpa-basic/src/main/resources/archetype-resources/project/build/LiftProject.scala
@@ -1,21 +0,0 @@
-import sbt._
-
-class LiftProject(info: ProjectInfo) extends ParentProject(info) {
-
- lazy val spa = project("spa", "spa", new SpaProject(_))
- lazy val web = project("web", "web", new WebProject(_))
-
- class SpaProject(info: ProjectInfo) extends DefaultProject(info) with BasicProjectSettings
- class WebProject(info: ProjectInfo) extends DefaultWebProject(info) with BasicProjectSettings
-
-}
-
-trait BasicProjectSettings extends BasicDependencyProject {
- // Add Maven Local repository for SBT to search for (disable if this doesn't suit you)
- val mavenLocal = "Local Maven Repository" at "file://"+Path.userHome+"/.m2/repository"
-
-#if ($liftVersion.endsWith("SNAPSHOT"))
- // Add snapshot repo, since Lift SNAPSHOT in use
- val snapshots = ScalaToolsSnapshots
-#end
-}
View
14 lift-archetype-jpa-basic/src/main/resources/archetype-resources/web/pom.xml
@@ -40,9 +40,9 @@
</dependency>
<!-- for LiftConsole -->
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>6.1.25</version>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ <version>8.1.8.v20121106</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -50,14 +50,14 @@
<build>
<plugins>
<plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.25</version>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>9.0.0.M4</version>
<configuration>
<contextPath>/</contextPath>
<scanIntervalSeconds>5</scanIntervalSeconds>
<connectors>
- <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+ <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
<port>9090</port>
<maxIdleTime>60000</maxIdleTime>
</connector>
View
2  lift-archetype-jpa-blank-single/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>net.liftweb</groupId>
<artifactId>archetypes_2.9.1</artifactId>
- <version>2.4-SNAPSHOT</version>
+ <version>2.5-SNAPSHOT</version>
</parent>
<artifactId>lift-archetype-jpa-blank-single_2.9.1</artifactId>
<packaging>maven-archetype</packaging>
View
1  lift-archetype-jpa-blank-single/src/it/sample/invoker.properties
@@ -5,3 +5,4 @@ invoker.goals.1 = archetype:generate
invoker.project.2 = sample-project
invoker.goals.2 = clean verify
+invoker.mavenOpts.2 = -Xmx1024m
View
40 lift-archetype-jpa-blank-single/src/main/resources/archetype-resources/pom.xml
@@ -1,6 +1,6 @@
<?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"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
#set($scala_version_unevaled = '\${scala.version}')
@@ -24,9 +24,9 @@
<maven.scaladoc.vscaladocVersion>1.2-m1</maven.scaladoc.vscaladocVersion>
<vscaladoc.links.liftweb.pathsufix>scaladocs/</vscaladoc.links.liftweb.pathsufix>
#if ($liftVersion.endsWith("SNAPSHOT"))
- <vscaladoc.links.liftweb.baseurl>http://scala-tools.org/mvnsites-snapshots/liftweb</vscaladoc.links.liftweb.baseurl>
+ <vscaladoc.links.liftweb.baseurl>https://oss.sonatype.org/content/repositories/snapshots/liftweb</vscaladoc.links.liftweb.baseurl>
#else
- <vscaladoc.links.liftweb.baseurl>http://scala-tools.org/mvnsites/liftweb</vscaladoc.links.liftweb.baseurl>
+ <vscaladoc.links.liftweb.baseurl>https://oss.sonatype.org/content/groups/scala-tools/liftweb</vscaladoc.links.liftweb.baseurl>
#end
</properties>
@@ -35,7 +35,7 @@
<repository>
<id>scala-tools.releases</id>
<name>Scala-Tools Dependencies Repository for Releases</name>
- <url>http://scala-tools.org/repo-releases</url>
+ <url>https://oss.sonatype.org/content/groups/scala-tools</url>
</repository>
<repository>
<id>java.net.maven2</id>
@@ -46,7 +46,7 @@
<repository>
<id>scala-tools.snapshots</id>
<name>Scala-Tools Dependencies Repository for Snapshots</name>
- <url>http://scala-tools.org/repo-snapshots</url>
+ <url>https://oss.sonatype.org/content/repositories/snapshots</url>
<snapshots/>
</repository>
#end
@@ -56,7 +56,7 @@
<pluginRepository>
<id>scala-tools.releases</id>
<name>Scala-Tools Plugins Repository for Releases</name>
- <url>http://scala-tools.org/repo-releases</url>
+ <url>https://oss.sonatype.org/content/groups/scala-tools</url>
</pluginRepository>
</pluginRepositories>
@@ -69,24 +69,24 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.6.1</version>
+ <version>1.7.2</version>
</dependency>
#if ($logBackend.equalsIgnoreCase("logback"))
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>0.9.26</version>
+ <version>1.0.6</version>
</dependency>
#elseif ($logBackend.equalsIgnoreCase("log4j"))
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.16</version>
+ <version>1.2.17</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.6.1</version>
+ <version>1.7.2</version>
</dependency>
#end
<dependency>
@@ -125,9 +125,9 @@
</dependency>
<!-- for LiftConsole -->
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>6.1.25</version>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ <version>8.1.8.v20121106</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -139,7 +139,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.7</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -175,7 +175,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
<executions>
<execution>
<id>default-copy-resources</id>
@@ -200,14 +200,14 @@
</executions>
</plugin>
<plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.25</version>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>9.0.0.M4</version>
<configuration>
<contextPath>/</contextPath>
<scanIntervalSeconds>5</scanIntervalSeconds>
<connectors>
- <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+ <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
<port>9090</port>
<maxIdleTime>60000</maxIdleTime>
</connector>
@@ -246,7 +246,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
- <version>2.7</version>
+ <version>2.9</version>
<configuration>
<downloadSources>true</downloadSources>
<additionalProjectnatures>
View
7 lift-archetype-jpa-blank-single/src/main/resources/archetype-resources/project/build.properties
@@ -1,7 +0,0 @@
-project.organization=$groupId
-project.name=$artifactId
-project.version=$version
-sbt.version=0.7.4
-def.scala.version=2.7.7
-build.scala.versions=$scalaVersion
-project.initialize=false
View
13 lift-archetype-jpa-blank-single/src/main/resources/archetype-resources/project/build/LiftProject.scala
@@ -1,13 +0,0 @@
-import sbt._
-
-class LiftProject(info: ProjectInfo) extends DefaultWebProject(info) {
-
- // Add Maven Local repository for SBT to search for (disable if this doesn't suit you)
- val mavenLocal = "Local Maven Repository" at "file://"+Path.userHome+"/.m2/repository"
-
-#if ($liftVersion.endsWith("SNAPSHOT"))
- // Add snapshot repo, since Lift SNAPSHOT in use
- val snapshots = ScalaToolsSnapshots
-#end
-
-}
View
2  lift-archetype-jpa-blank/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>net.liftweb</groupId>
<artifactId>archetypes_2.9.1</artifactId>
- <version>2.4-SNAPSHOT</version>
+ <version>2.5-SNAPSHOT</version>
</parent>
<artifactId>lift-archetype-jpa-blank_2.9.1</artifactId>
<packaging>maven-archetype</packaging>
View
26 lift-archetype-jpa-blank/src/main/resources/archetype-resources/pom.xml
@@ -1,6 +1,6 @@
<?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"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
#set($scala_version_unevaled = '\${scala.version}')
@@ -24,9 +24,9 @@
<maven.scaladoc.vscaladocVersion>1.2-m1</maven.scaladoc.vscaladocVersion>
<vscaladoc.links.liftweb.pathsufix>scaladocs/</vscaladoc.links.liftweb.pathsufix>
#if ($liftVersion.endsWith("SNAPSHOT"))
- <vscaladoc.links.liftweb.baseurl>http://scala-tools.org/mvnsites-snapshots/liftweb</vscaladoc.links.liftweb.baseurl>
+ <vscaladoc.links.liftweb.baseurl>https://oss.sonatype.org/content/repositories/snapshots/liftweb</vscaladoc.links.liftweb.baseurl>
#else
- <vscaladoc.links.liftweb.baseurl>http://scala-tools.org/mvnsites/liftweb</vscaladoc.links.liftweb.baseurl>
+ <vscaladoc.links.liftweb.baseurl>https://oss.sonatype.org/content/groups/scala-tools/liftweb</vscaladoc.links.liftweb.baseurl>
#end
</properties>
@@ -35,7 +35,7 @@
<repository>
<id>scala-tools.releases</id>
<name>Scala-Tools Dependencies Repository for Releases</name>
- <url>http://scala-tools.org/repo-releases</url>
+ <url>https://oss.sonatype.org/content/groups/scala-tools</url>
</repository>
<repository>
<id>java.net.maven2</id>
@@ -46,7 +46,7 @@
<repository>
<id>scala-tools.snapshots</id>
<name>Scala-Tools Dependencies Repository for Snapshots</name>
- <url>http://scala-tools.org/repo-snapshots</url>
+ <url>https://oss.sonatype.org/content/repositories/snapshots</url>
<snapshots/>
</repository>
#end
@@ -56,7 +56,7 @@
<pluginRepository>
<id>scala-tools.releases</id>
<name>Scala-Tools Plugins Repository for Releases</name>
- <url>http://scala-tools.org/repo-releases</url>
+ <url>https://oss.sonatype.org/content/groups/scala-tools</url>
</pluginRepository>
</pluginRepositories>
@@ -76,24 +76,24 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.6.1</version>
+ <version>1.7.2</version>
</dependency>
#if ($logBackend.equalsIgnoreCase("logback"))
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>0.9.26</version>
+ <version>1.0.6</version>
</dependency>
#elseif ($logBackend.equalsIgnoreCase("log4j"))
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.16</version>
+ <version>1.2.17</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.6.1</version>
+ <version>1.7.2</version>
</dependency>
#end
<dependency>
@@ -105,7 +105,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.7</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -141,7 +141,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
<executions>
<execution>
<id>default-copy-resources</id>
@@ -182,7 +182,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
- <version>2.7</version>
+ <version>2.9</version>
<configuration>
<downloadSources>true</downloadSources>
<additionalProjectnatures>
View
7 lift-archetype-jpa-blank/src/main/resources/archetype-resources/project/build.properties
@@ -1,7 +0,0 @@
-project.organization=$groupId
-project.name=$artifactId
-project.version=$version
-sbt.version=0.7.4
-def.scala.version=2.7.7
-build.scala.versions=$scalaVersion
-project.initialize=false
View
21 lift-archetype-jpa-blank/src/main/resources/archetype-resources/project/build/LiftProject.scala
@@ -1,21 +0,0 @@
-import sbt._
-
-class LiftProject(info: ProjectInfo) extends ParentProject(info) {
-
- lazy val spa = project("spa", "spa", new SpaProject(_))
- lazy val web = project("web", "web", new WebProject(_))
-
- class SpaProject(info: ProjectInfo) extends DefaultProject(info) with BasicProjectSettings
- class WebProject(info: ProjectInfo) extends DefaultWebProject(info) with BasicProjectSettings
-
-}
-
-trait BasicProjectSettings extends BasicDependencyProject {
- // Add Maven Local repository for SBT to search for (disable if this doesn't suit you)
- val mavenLocal = "Local Maven Repository" at "file://"+Path.userHome+"/.m2/repository"
-
-#if ($liftVersion.endsWith("SNAPSHOT"))
- // Add snapshot repo, since Lift SNAPSHOT in use
- val snapshots = ScalaToolsSnapshots
-#end
-}
View
14 lift-archetype-jpa-blank/src/main/resources/archetype-resources/web/pom.xml
@@ -40,9 +40,9 @@
</dependency>
<!-- for LiftConsole -->
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>6.1.25</version>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ <version>8.1.8.v20121106</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -50,14 +50,14 @@
<build>
<plugins>
<plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.25</version>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>9.0.0.M4</version>
<configuration>
<contextPath>/</contextPath>
<scanIntervalSeconds>5</scanIntervalSeconds>
<connectors>
- <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+ <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
<port>9090</port>
<maxIdleTime>60000</maxIdleTime>
</connector>
Please sign in to comment.
Something went wrong with that request. Please try again.