dependency management

assira.asm/pom.xml

@@ -5,6 +5,7 @@
         <groupId>net.ranides</groupId>
         <artifactId>assira.common</artifactId>
         <version>2.0.1</version>
+        <relativePath>../assira.common</relativePath>
     </parent>
     <groupId>net.ranides</groupId>
     <artifactId>assira.asm</artifactId>

assira.benchmark/pom.xml

@@ -5,6 +5,7 @@
 		<groupId>net.ranides</groupId>
 		<artifactId>assira.common</artifactId>
 		<version>2.0.1</version>
+        <relativePath>../assira.common</relativePath>
 	</parent>
     <name>assira.benchmark</name>
     <groupId>net.ranides</groupId>
@@ -13,7 +14,6 @@
     <packaging>jar</packaging>
     
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jmh.version>1.12</jmh.version>
         <uberjar.name>benchmarks</uberjar.name>
     </properties>
@@ -134,5 +134,4 @@
             </plugins>
         </pluginManagement>
     </build>
-
 </project>

assira.common/pom.xml

@@ -17,6 +17,7 @@
         <project.argLine></project.argLine>
         <project.test.memory>512m</project.test.memory>
         <assira.junit.debug>false</assira.junit.debug>
+        <assira.rules.version>2.1.0</assira.rules.version>
         
         <org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap>none</org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap>
         <org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width>4</org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width>
@@ -27,6 +28,14 @@
         <org-netbeans-modules-editor-indent.CodeStyle.usedProfile>project</org-netbeans-modules-editor-indent.CodeStyle.usedProfile>
     </properties>
     
+    <modules>
+        <module>../assira.asm</module>
+        <module>../assira.junit</module>
+        <module>../assira.rules</module>
+        <module>../assira.test</module>
+        <module>../assira</module>
+    </modules>
+    
     <distributionManagement>
         <repository>
             <id>maven.ranides.net</id>
@@ -51,6 +60,7 @@
                 <version>1.0</version>
             </extension>
         </extensions>
+        
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -110,7 +120,7 @@
                     <dependency>
                         <groupId>net.ranides</groupId>
                         <artifactId>assira.rules</artifactId>
-                        <version>2.0.1</version>
+                        <version>${assira.rules.version}</version>
                     </dependency>
                 </dependencies>
             </plugin>
@@ -227,5 +237,5 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-
+    
 </project>

assira.drafts/pom.xml

@@ -5,6 +5,7 @@
         <groupId>net.ranides</groupId>
         <artifactId>assira.common</artifactId>
         <version>2.0.1</version>
+        <relativePath>../assira.common</relativePath>
     </parent>
     <groupId>net.ranides</groupId>
     <artifactId>assira.drafts</artifactId>
@@ -30,13 +31,6 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
-            <version>1.3</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

assira.junit/pom.xml

@@ -5,6 +5,7 @@
         <groupId>net.ranides</groupId>
         <artifactId>assira.common</artifactId>
         <version>2.0.1</version>
+        <relativePath>../assira.common</relativePath>
     </parent>
     
     <name>assira.junit</name>
@@ -13,14 +14,6 @@
     <version>2.0.1</version>
     <packaging>jar</packaging>
 
-    <repositories>
-        <repository>
-            <id>ranides.net</id>
-            <name>ranides.net</name>
-            <url>http://maven.ranides.net</url>
-        </repository>
-    </repositories>
-    
     <dependencies>
         <dependency>
             <groupId>junit</groupId>

assira.rules.test/pom.xml

@@ -5,11 +5,12 @@
         <groupId>net.ranides</groupId>
         <artifactId>assira.common</artifactId>
         <version>2.0.1</version>
+        <relativePath>../assira.common</relativePath>
     </parent>
     
     <groupId>net.ranides</groupId>
     <artifactId>assira.rules.test</artifactId>
-    <version>2.01</version>
+    <version>2.2.0</version>
     <packaging>jar</packaging>
 
     <build>
@@ -27,7 +28,7 @@
                     <dependency>
                         <groupId>net.ranides</groupId>
                         <artifactId>assira.rules</artifactId>
-                        <version>2.0.1</version>
+                        <version>${assira.rules.version}</version>
                     </dependency>
                 </dependencies>
             </plugin>

assira.rules/pom.xml

@@ -5,22 +5,13 @@
         <groupId>net.ranides</groupId>
         <artifactId>assira.common</artifactId>
         <version>2.0.1</version>
+        <relativePath>../assira.common</relativePath>
     </parent>
     
     <groupId>net.ranides</groupId>
     <artifactId>assira.rules</artifactId>
-    <version>2.0.1</version>
+    <version>2.1.0</version>
     <packaging>jar</packaging>
-    
-    <url>http://ranides.net/projects/assira</url>
-
-    <repositories>
-        <repository>
-            <id>ranides.net</id>
-            <name>ranides.net</name>
-            <url>http://maven.ranides.net</url>
-        </repository>
-    </repositories>
 
     <dependencies>
         <dependency>

assira.test/pom.xml

@@ -5,10 +5,11 @@
         <groupId>net.ranides</groupId>
         <artifactId>assira.common</artifactId>
         <version>2.0.1</version>
+        <relativePath>../assira.common</relativePath>
     </parent>
 	
     <groupId>net.ranides</groupId>
     <artifactId>assira.test</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0</version>
     <packaging>jar</packaging>
 </project>

assira/pom.xml

@@ -1,31 +1,32 @@
 <?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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>net.ranides</groupId>
-		<artifactId>assira.common</artifactId>
-		<version>2.0.1</version>
-	</parent>
-	<name>assira</name>
-	<groupId>net.ranides</groupId>
-	<artifactId>assira</artifactId>
-	<version>2.0.1</version>
-	<packaging>jar</packaging>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>net.ranides</groupId>
+        <artifactId>assira.common</artifactId>
+        <version>2.0.1</version>
+        <relativePath>../assira.common</relativePath>
+    </parent>
+    <name>assira</name>
+    <groupId>net.ranides</groupId>
+    <artifactId>assira</artifactId>
+    <version>2.0.1</version>
+    <packaging>jar</packaging>
 	
-	<properties>
-		<assira.junit.debug>false</assira.junit.debug>
-	</properties>
+    <properties>
+        <assira.junit.debug>false</assira.junit.debug>
+    </properties>
 
-	<profiles>
-		<profile>
-			<id>recent-coverage</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.jacoco</groupId>
-						<artifactId>jacoco-maven-plugin</artifactId>
-						<version>0.7.5.201505241946</version>
-						<configuration>
+    <profiles>
+        <profile>
+            <id>recent-coverage</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.jacoco</groupId>
+                        <artifactId>jacoco-maven-plugin</artifactId>
+                        <version>0.7.5.201505241946</version>
+                        <configuration>
                             <includes>
                                 <include>net/ranides/assira/annotations/Meta*</include>
                                 <include>net/ranides/assira/annotations/javac/**</include>
@@ -50,7 +51,7 @@
                                 
                                 <include>net/ranides/assira/events/EventObserver*</include>
                                 
-<!--                                <include>net/ranides/assira/io/PathUtils*</include>-->
+                                <!--                                <include>net/ranides/assira/io/PathUtils*</include>-->
                                 <include>net/ranides/assira/io/URIInput</include>
                                 <include>net/ranides/assira/io/URIOutput</include>
                                 <include>net/ranides/assira/io/URIWriter</include>
@@ -67,71 +68,59 @@
                                 <include>net/ranides/assira/xml/XMLQuery*</include>
                                 <include>net/ranides/assira/xml/XMLWriter*</include>
                             </includes>
-						</configuration>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-surefire-plugin</artifactId>
-						<configuration>
-							<excludes>
-								<exclude>**/EventLockTest.java</exclude>
-								<exclude>**/EventJoinerTest.java</exclude>
-								<exclude>**/EventDispatcherTest.java</exclude>
-								<exclude>**/EventProactorTest.java</exclude>
-								<exclude>**/EventReactorTest.java</exclude>
-								<exclude>**/LazyReferenceTest.java</exclude>
-							</excludes>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <excludes>
+                                <exclude>**/EventLockTest.java</exclude>
+                                <exclude>**/EventJoinerTest.java</exclude>
+                                <exclude>**/EventDispatcherTest.java</exclude>
+                                <exclude>**/EventProactorTest.java</exclude>
+                                <exclude>**/EventReactorTest.java</exclude>
+                                <exclude>**/LazyReferenceTest.java</exclude>
+                            </excludes>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 	
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.7.5.201505241946</version>
-				<configuration>
-					<excludes>
-						<exclude>net/ranides/assira/test/**</exclude>
-					</excludes>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.7.5.201505241946</version>
+                <configuration>
+                    <excludes>
+                        <exclude>net/ranides/assira/test/**</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
     
-	<repositories>
-		<repository>
-			<id>ranides.net</id>
-			<name>ranides.net</name>
-			<url>http://maven.ranides.net</url>
-		</repository>
-	</repositories>
-    
-	<dependencies>
-		<dependency>
-			<groupId>net.ranides</groupId>
-			<artifactId>assira.asm</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>net.ranides</groupId>
-			<artifactId>assira.junit</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.google.code.findbugs</groupId>
-			<artifactId>annotations</artifactId>
-		</dependency>
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>net.ranides</groupId>
+            <artifactId>assira.junit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>annotations</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
@@ -140,10 +129,10 @@
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-json-org</artifactId>
         </dependency>
-	 <dependency>
-	  <groupId>se.fishtank</groupId>
-	  <artifactId>css-selectors</artifactId>
-	  <version>2.0</version>
-	 </dependency>
-	</dependencies>
+        <dependency>
+            <groupId>se.fishtank</groupId>
+            <artifactId>css-selectors</artifactId>
+            <version>2.0</version>
+        </dependency>
+    </dependencies>
 </project>

assira/src/test/java/net/ranides/assira/ContractTesters.java

@@ -22,9 +22,9 @@ public final class ContractTesters {
 
     private ContractTesters() { }
     
-    public static final File JAR_TEST = new File("../assira.test/target/assira.test-2.0.0.jar");
+    public static final File JAR_TEST = new File("../assira.test/target/assira.test-2.1.0.jar");
     
-    public static final File JAR_RULES = new File("../assira.rules/target/assira.rules-2.0.1.jar");
+    public static final File JAR_RULES = new File("../assira.rules/target/assira.rules-2.1.0.jar");
     
     private static final class Li { // NOPMD - lazy init idiom
         

assira/src/test/java/net/ranides/assira/xml/impl/W3AttributesTest.java

@@ -6,7 +6,6 @@
  */
 package net.ranides.assira.xml.impl;
 
-import com.google.caliper.extern.common.base.Charsets;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.io.IOException;
 import java.util.AbstractMap;
@@ -18,6 +17,7 @@ import net.ranides.assira.collection.maps.MultiMap;
 import net.ranides.assira.xml.XMLElement;
 import net.ranides.assira.xml.XMLElements;
 import static net.ranides.assira.junit.NewAssert.*;
+import net.ranides.assira.text.Charsets;
 import net.ranides.assira.text.IOStrings;
 import net.ranides.assira.xml.XMLSelector;
 import org.junit.Test;
@@ -134,7 +134,7 @@ public class W3AttributesTest {
         assertEquivalent(Arrays.asList(), allmap.getAll(888));
         
         String out = doc.find("users").first().writer().indent(4).toString();
-        String exp = IOStrings.read(TestFiles.XML_ATTR, Charsets.UTF_8);
+        String exp = IOStrings.read(TestFiles.XML_ATTR, Charsets.UTF8);
         assertEquals(exp, out);
     }