Another Cleanup
* Sort dependencies by scope/usage
git-svn-id: https://svn.apache.org/repos/asf/velocity/tools/branches/VELTOOLS-177@1842346 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml b/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml
index 8568e12..eb157f2 100644
--- a/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml
+++ b/velocity-tools-examples/velocity-tools-examples-showcase/pom.xml
@@ -37,14 +37,19 @@
<dependencies>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-tools-view</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <scope>provided</scope>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -57,11 +62,6 @@
<version>1.7.3</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>runtime</scope>
- </dependency>
</dependencies>
<build>
diff --git a/velocity-tools-generic/pom.xml b/velocity-tools-generic/pom.xml
index a8220ef..f17aa81 100644
--- a/velocity-tools-generic/pom.xml
+++ b/velocity-tools-generic/pom.xml
@@ -57,6 +57,11 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
+ <groupId>com.googlecode.json-simple</groupId>
+ <artifactId>json-simple</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -66,11 +71,6 @@
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.googlecode.json-simple</groupId>
- <artifactId>json-simple</artifactId>
- <version>1.1.1</version>
- </dependency>
</dependencies>
<build>
@@ -78,7 +78,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.1.1</version>
<executions>
<execution>
<id>shade</id>
diff --git a/velocity-tools-view-jsp/pom.xml b/velocity-tools-view-jsp/pom.xml
index fbd9847..bd48e4b 100644
--- a/velocity-tools-view-jsp/pom.xml
+++ b/velocity-tools-view-jsp/pom.xml
@@ -36,15 +36,6 @@
<dependencies>
<dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity-engine-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity-tools-view</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
@@ -60,6 +51,15 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-engine-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-tools-view</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
diff --git a/velocity-tools-view/pom.xml b/velocity-tools-view/pom.xml
index 27c56c4..d7bd475 100644
--- a/velocity-tools-view/pom.xml
+++ b/velocity-tools-view/pom.xml
@@ -36,6 +36,11 @@
<dependencies>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-core</artifactId>
</dependency>
@@ -57,11 +62,6 @@
<artifactId>commons-digester3</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
