Permalink
Browse files

- Update plugin to latest versions:

  maven-scala-plugin (2.14.3),
  maven-compiler-plugin (2.3.2),
  maven-javadoc-plugin (2.7),
  maven-surefire-plugin (2.6),
  maven-assembly-plugin (2.2),
  maven-jetty-plugin (6.1.25),
  maven-release-plugin (2.1)
  maven-archetype-plugin (2.0)

- Update library dependencies to newer versions:
  scalajpa (1.2),
  joda-time (1.6.2),
  commons-fileupload (1.2.2),
  slf4j (1.6.1),
  log4j (1.2.16),
  logback (0.9.26)

- Fix github connection URL to point to new location

- Remove Lift standalone installer

- Fix scopes for DB libraries and logging components

- Logging improvements:
  Since, newer version of slf4j (> 1.6) does not require logging backend by
  default (it's not compulsory - will fallback to NOOP instead of
  throwing error), we remove hard dependency on log4j and avoid clumsy
  configuration that was necessary for alternative logging backend.
  This also would help better integration for other external modules and addons.

- Enrich archetypes to take CLI parameter logBackend (can be used via -DlogBackend=...)

- Closes #447, #516, #644, #648, #700, #701
  • Loading branch information...
1 parent ac8371f commit fe43721de510b1b17c03092cf63114c07c13e5d9 @indrajitr indrajitr committed Oct 29, 2010
@@ -63,7 +63,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-archetype-plugin</artifactId>
- <version>2.0-alpha-5</version>
+ <version>2.0</version>
<extensions>true</extensions>
</plugin>
<plugin>
@@ -7,6 +7,9 @@
<requiredProperty key="liftVersion">
<defaultValue>${lift.version}</defaultValue>
</requiredProperty>
+ <requiredProperty key="logBackend">
+ <defaultValue>logback</defaultValue>
+ </requiredProperty>
</requiredProperties>
<fileSets>
<fileSet encoding="UTF-8" filtered="true">
@@ -60,6 +60,24 @@
<artifactId>lift-mapper_$scalaVersion</artifactId>
<version>$liftVersion</version>
</dependency>
+#if ($logBackend.equalsIgnoreCase("logback"))
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>0.9.26</version>
+ </dependency>
+#elseif ($logBackend.equalsIgnoreCase("log4j"))
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.16</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+#end
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
@@ -106,7 +124,7 @@
<plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
- <version>2.14</version>
+ <version>2.14.3</version>
<configuration>
<charset>$project_build_sourceEncoding_unevaled</charset>
<jvmArgs>
@@ -153,7 +171,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.24</version>
+ <version>6.1.25</version>
<configuration>
<contextPath>/</contextPath>
<scanIntervalSeconds>5</scanIntervalSeconds>
@@ -207,7 +225,7 @@
<plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
- <version>2.14</version>
+ <version>2.14.3</version>
<configuration>
<charset>$project_build_sourceEncoding_unevaled</charset>
<jvmArgs>
@@ -63,7 +63,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-archetype-plugin</artifactId>
- <version>2.0-alpha-5</version>
+ <version>2.0</version>
<extensions>true</extensions>
</plugin>
<plugin>
@@ -7,6 +7,9 @@
<requiredProperty key="liftVersion">
<defaultValue>${lift.version}</defaultValue>
</requiredProperty>
+ <requiredProperty key="logBackend">
+ <defaultValue>logback</defaultValue>
+ </requiredProperty>
</requiredProperties>
<fileSets>
<fileSet encoding="UTF-8" filtered="true">
@@ -60,6 +60,24 @@
<artifactId>lift-mapper_$scalaVersion</artifactId>
<version>$liftVersion</version>
</dependency>
+#if ($logBackend.equalsIgnoreCase("logback"))
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>0.9.26</version>
+ </dependency>
+#elseif ($logBackend.equalsIgnoreCase("log4j"))
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.16</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+#end
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
@@ -94,7 +112,7 @@
<plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
- <version>2.14</version>
+ <version>2.14.3</version>
<configuration>
<charset>$project_build_sourceEncoding_unevaled</charset>
<jvmArgs>
@@ -141,7 +159,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.24</version>
+ <version>6.1.25</version>
<configuration>
<contextPath>/</contextPath>
<scanIntervalSeconds>5</scanIntervalSeconds>
@@ -195,7 +213,7 @@
<plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
- <version>2.14</version>
+ <version>2.14.3</version>
<configuration>
<charset>$project_build_sourceEncoding_unevaled</charset>
<jvmArgs>
@@ -63,7 +63,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-archetype-plugin</artifactId>
- <version>2.0-alpha-5</version>
+ <version>2.0</version>
<extensions>true</extensions>
</plugin>
<plugin>
@@ -7,6 +7,9 @@
<requiredProperty key="liftVersion">
<defaultValue>${lift.version}</defaultValue>
</requiredProperty>
+ <requiredProperty key="logBackend">
+ <defaultValue>logback</defaultValue>
+ </requiredProperty>
</requiredProperties>
<fileSets>
<fileSet encoding="UTF-8" filtered="true">
@@ -62,6 +62,24 @@
<artifactId>scala-library</artifactId>
<version>$scala_version_unevaled</version>
</dependency>
+#if ($logBackend.equalsIgnoreCase("logback"))
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>0.9.26</version>
+ </dependency>
+#elseif ($logBackend.equalsIgnoreCase("log4j"))
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.16</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+#end
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-compiler</artifactId>
@@ -89,7 +107,7 @@
<plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
- <version>2.14</version>
+ <version>2.14.3</version>
<configuration>
<charset>$project_build_sourceEncoding_unevaled</charset>
<jvmArgs>
@@ -176,7 +194,7 @@
<plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
- <version>2.14</version>
+ <version>2.14.3</version>
<configuration>
<charset>$project_build_sourceEncoding_unevaled</charset>
<jvmArgs>
@@ -52,7 +52,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.24</version>
+ <version>6.1.25</version>
<configuration>
<contextPath>/</contextPath>
<scanIntervalSeconds>5</scanIntervalSeconds>
@@ -63,7 +63,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-archetype-plugin</artifactId>
- <version>2.0-alpha-5</version>
+ <version>2.0</version>
<extensions>true</extensions>
</plugin>
<plugin>
@@ -7,6 +7,9 @@
<requiredProperty key="liftVersion">
<defaultValue>${lift.version}</defaultValue>
</requiredProperty>
+ <requiredProperty key="logBackend">
+ <defaultValue>logback</defaultValue>
+ </requiredProperty>
</requiredProperties>
<fileSets>
<fileSet encoding="UTF-8" filtered="true">
@@ -61,6 +61,24 @@
<artifactId>lift-jpa_$scalaVersion</artifactId>
<version>$liftVersion</version>
</dependency>
+#if ($logBackend.equalsIgnoreCase("logback"))
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>0.9.26</version>
+ </dependency>
+#elseif ($logBackend.equalsIgnoreCase("log4j"))
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.16</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+#end
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-ejb</artifactId>
@@ -129,7 +147,7 @@
<plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
- <version>2.14</version>
+ <version>2.14.3</version>
<configuration>
<charset>$project_build_sourceEncoding_unevaled</charset>
<jvmArgs>
@@ -180,7 +198,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.24</version>
+ <version>6.1.25</version>
<configuration>
<contextPath>/</contextPath>
<scanIntervalSeconds>5</scanIntervalSeconds>
@@ -246,7 +264,7 @@
<plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
- <version>2.14</version>
+ <version>2.14.3</version>
<configuration>
<charset>$project_build_sourceEncoding_unevaled</charset>
<jvmArgs>
@@ -63,7 +63,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-archetype-plugin</artifactId>
- <version>2.0-alpha-5</version>
+ <version>2.0</version>
<extensions>true</extensions>
</plugin>
<plugin>
@@ -7,6 +7,9 @@
<requiredProperty key="liftVersion">
<defaultValue>${lift.version}</defaultValue>
</requiredProperty>
+ <requiredProperty key="logBackend">
+ <defaultValue>logback</defaultValue>
+ </requiredProperty>
</requiredProperties>
<fileSets>
<fileSet encoding="UTF-8" filtered="true">
@@ -68,6 +68,24 @@
<version>$scala_version_unevaled</version>
<scope>test</scope>
</dependency>
+#if ($logBackend.equalsIgnoreCase("logback"))
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>0.9.26</version>
+ </dependency>
+#elseif ($logBackend.equalsIgnoreCase("log4j"))
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.16</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+#end
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
@@ -89,7 +107,7 @@
<plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
- <version>2.14</version>
+ <version>2.14.3</version>
<configuration>
<charset>$project_build_sourceEncoding_unevaled</charset>
<jvmArgs>
@@ -176,7 +194,7 @@
<plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
- <version>2.14</version>
+ <version>2.14.3</version>
<configuration>
<charset>$project_build_sourceEncoding_unevaled</charset>
<jvmArgs>
@@ -52,7 +52,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.24</version>
+ <version>6.1.25</version>
<configuration>
<contextPath>/</contextPath>
<scanIntervalSeconds>5</scanIntervalSeconds>
@@ -63,7 +63,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-archetype-plugin</artifactId>
- <version>2.0-alpha-4</version>
+ <version>2.0</version>
<extensions>true</extensions>
</plugin>
<!--
@@ -7,6 +7,9 @@
<requiredProperty key="liftVersion">
<defaultValue>${lift.version}</defaultValue>
</requiredProperty>
+ <requiredProperty key="logBackend">
+ <defaultValue>logback</defaultValue>
+ </requiredProperty>
</requiredProperties>
<fileSets>
<fileSet encoding="UTF-8" filtered="true">
Oops, something went wrong.

0 comments on commit fe43721

Please sign in to comment.