Commits

Stephen McKamey committed 2ed54e9

updating versions; reordering dependencies to allow better overriding

Comments (0)

Files changed (2)

merge-builder/pom.xml

 
 	<groupId>org.duelengine</groupId>
 	<artifactId>merge-builder</artifactId>
-	<version>0.5.6</version>
+	<version>0.5.7</version>
 	<packaging>jar</packaging>
 
 	<name>DUEL Merge Builder</name>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
 		<css.version>0.4.1</css.version>
-		<closure.version>rr2079.1</closure.version>
-		<slf4j.version>1.6.6</slf4j.version>
-		<junit.version>4.10</junit.version>
+		<closure.version>r2180</closure.version>
+		<slf4j.version>1.7.2</slf4j.version>
+		<junit.version>4.11</junit.version>
 		<jvm.version>1.6</jvm.version>
 	</properties>
 
 	<dependencies>
 		<dependency>
-			<groupId>org.cssless</groupId>
-			<artifactId>css</artifactId>
-			<version>${css.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>com.google.javascript</groupId>
-			<artifactId>closure-compiler</artifactId>
-			<version>${closure.version}</version>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>${junit.version}</version>
+			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 		</dependency>
 
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>${junit.version}</version>
-			<scope>test</scope>
+			<groupId>com.google.javascript</groupId>
+			<artifactId>closure-compiler</artifactId>
+			<version>${closure.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.cssless</groupId>
+			<artifactId>css</artifactId>
+			<version>${css.version}</version>
 		</dependency>
 	</dependencies>
 

merge-maven-plugin/pom.xml

 
 	<groupId>org.duelengine</groupId>
 	<artifactId>merge-maven-plugin</artifactId>
-	<version>0.5.6</version>
+	<version>0.5.7</version>
 	<packaging>maven-plugin</packaging>
 
 	<name>DUEL Merge Maven Plugin</name>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-		<slf4j.version>1.6.6</slf4j.version>
+		<slf4j.version>1.7.2</slf4j.version>
 		<maven.version>3.0.4</maven.version>
-		<junit.version>4.10</junit.version>
+		<junit.version>4.11</junit.version>
 		<jvm.version>1.6</jvm.version>
 	</properties>
 
 	<dependencies>
 		<dependency>
-			<groupId>org.duelengine</groupId>
-			<artifactId>merge-builder</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>${slf4j.version}</version>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>${junit.version}</version>
+			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 		</dependency>
 
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>${junit.version}</version>
-			<scope>test</scope>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>${slf4j.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.duelengine</groupId>
+			<artifactId>merge-builder</artifactId>
+			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.