dependency management

.gitignore

@@ -10,4 +10,9 @@
 /assira.test/target/
 /assira.drafts/nbproject/
 /assira.benchmark/target/
-/assira.benchmark/nbproject/
+/assira.benchmark/nbproject/
+/assira.common/pom.xml.versionsBackup
+/assira.asm/pom.xml.versionsBackup
+/assira.junit/pom.xml.versionsBackup
+/assira.rules/pom.xml.versionsBackup
+/assira.test/pom.xml.versionsBackup

assira.asm/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>net.ranides</groupId>
         <artifactId>assira.common</artifactId>
-        <version>2.0.1</version>
+        <version>2.1.0</version>
         <relativePath>../assira.common</relativePath>
     </parent>
     <groupId>net.ranides</groupId>

assira.benchmark/pom.xml

@@ -4,13 +4,12 @@
     <parent>
 		<groupId>net.ranides</groupId>
 		<artifactId>assira.common</artifactId>
-		<version>2.0.1</version>
+		<version>2.1.0</version>
         <relativePath>../assira.common</relativePath>
 	</parent>
     <name>assira.benchmark</name>
     <groupId>net.ranides</groupId>
     <artifactId>assira.benchmark</artifactId>
-    <version>2.0.1</version>
     <packaging>jar</packaging>
     
     <properties>

assira.common/pom.xml

@@ -4,7 +4,7 @@
     
     <groupId>net.ranides</groupId>
     <artifactId>assira.common</artifactId>
-    <version>2.0.1</version>
+    <version>2.1.0</version>
     <packaging>pom</packaging>
     
     <url>http://ranides.net/projects/assira</url>
@@ -32,7 +32,10 @@
         <module>../assira.asm</module>
         <module>../assira.junit</module>
         <module>../assira.rules</module>
+        <module>../assira.rules.test</module>
         <module>../assira.test</module>
+        <module>../assira.drafts</module>
+        <module>../assira.benchmark</module>
         <module>../assira</module>
     </modules>
     
@@ -184,7 +187,7 @@
             <dependency>
                 <groupId>net.ranides</groupId>
                 <artifactId>assira</artifactId>
-                <version>2.0.1</version>
+                <version>2.1.0</version>
             </dependency>
             <dependency>
                 <groupId>net.ranides</groupId>
@@ -194,7 +197,7 @@
             <dependency>
                 <groupId>net.ranides</groupId>
                 <artifactId>assira.junit</artifactId>
-                <version>2.0.1</version>
+                <version>2.1.0</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
@@ -235,6 +238,11 @@
                 <artifactId>jackson-datatype-json-org</artifactId>
                 <version>2.0.0</version>
             </dependency>
+            <dependency>
+                <groupId>se.fishtank</groupId>
+                <artifactId>css-selectors</artifactId>
+                <version>2.0</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     

assira.drafts/pom.xml

@@ -4,12 +4,11 @@
     <parent>
         <groupId>net.ranides</groupId>
         <artifactId>assira.common</artifactId>
-        <version>2.0.1</version>
+        <version>2.1.0</version>
         <relativePath>../assira.common</relativePath>
     </parent>
     <groupId>net.ranides</groupId>
     <artifactId>assira.drafts</artifactId>
-    <version>1.0</version>
     <packaging>jar</packaging>
     
     <properties>
@@ -33,5 +32,9 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>net.ranides</groupId>
+            <artifactId>assira.asm</artifactId>
+        </dependency>
     </dependencies>
 </project>

assira.junit/pom.xml

@@ -4,14 +4,13 @@
     <parent>
         <groupId>net.ranides</groupId>
         <artifactId>assira.common</artifactId>
-        <version>2.0.1</version>
+        <version>2.1.0</version>
         <relativePath>../assira.common</relativePath>
     </parent>
     
     <name>assira.junit</name>
     <groupId>net.ranides</groupId>
     <artifactId>assira.junit</artifactId>
-    <version>2.0.1</version>
     <packaging>jar</packaging>
 
     <dependencies>

assira.rules.test/pom.xml

@@ -4,13 +4,12 @@
     <parent>
         <groupId>net.ranides</groupId>
         <artifactId>assira.common</artifactId>
-        <version>2.0.1</version>
+        <version>2.1.0</version>
         <relativePath>../assira.common</relativePath>
     </parent>
     
     <groupId>net.ranides</groupId>
     <artifactId>assira.rules.test</artifactId>
-    <version>2.2.0</version>
     <packaging>jar</packaging>
 
     <build>

assira.rules/pom.xml

@@ -4,13 +4,12 @@
     <parent>
         <groupId>net.ranides</groupId>
         <artifactId>assira.common</artifactId>
-        <version>2.0.1</version>
+        <version>2.1.0</version>
         <relativePath>../assira.common</relativePath>
     </parent>
     
     <groupId>net.ranides</groupId>
     <artifactId>assira.rules</artifactId>
-    <version>2.1.0</version>
     <packaging>jar</packaging>
 
     <dependencies>

assira.test/pom.xml

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

assira/pom.xml

@@ -4,13 +4,12 @@
     <parent>
         <groupId>net.ranides</groupId>
         <artifactId>assira.common</artifactId>
-        <version>2.0.1</version>
+        <version>2.1.0</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>
@@ -132,7 +131,6 @@
         <dependency>
             <groupId>se.fishtank</groupId>
             <artifactId>css-selectors</artifactId>
-            <version>2.0</version>
         </dependency>
     </dependencies>
 </project>

assira/pom.xml.orig

@@ -1,152 +0,0 @@
-<?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>
-	
-	<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>
-                            <includes>
-                                <include>net/ranides/assira/annotations/Meta*</include>
-                                <include>net/ranides/assira/annotations/javac/**</include>
-                                
-                                <include>net/ranides/assira/awt/ImageLoader*</include>
-                                <include>net/ranides/assira/awt/AWTInvoker*</include>
-                                
-                                <include>net/ranides/assira/collection/arrays/NativeArrayUtils</include>
-                                <include>net/ranides/assira/collection/arrays/ArrayUtils</include>
-                                <include>net/ranides/assira/collection/iterators/ForwardIterator*</include>
-                                <include>net/ranides/assira/collection/iterators/IteratorUtils*</include>
-                                <include>net/ranides/assira/collection/iterators/IntIteratorUtils*</include>
-                                <include>net/ranides/assira/collection/lists/ListUtils</include>
-<<<<<<< HEAD
-                                <include>net/ranides/assira/collection/sets/Bitmask*</include>
-                                <include>net/ranides/assira/lexer/**</include>
-                                
-                                <include>net/ranides/assira/reflection/IAnnotations.class</include>
-                                <include>net/ranides/assira/reflection/IArgument.class</include>
-                                <include>net/ranides/assira/reflection/IArguments.class</include>
-                                <include>net/ranides/assira/reflection/IClass.class</include>
-                                <include>net/ranides/assira/reflection/IClasses.class</include>
-                                <include>net/ranides/assira/reflection/IElement.class</include>
-                                <include>net/ranides/assira/reflection/IElements.class</include>
-                                <include>net/ranides/assira/reflection/IField.class</include>
-                                <include>net/ranides/assira/reflection/IFields.class</include>
-                                <include>net/ranides/assira/reflection/IHints.class</include>
-                                <include>net/ranides/assira/reflection/IMethod.class</include>
-                                <include>net/ranides/assira/reflection/IMethods.class</include>
-                                <include>net/ranides/assira/reflection/IVariable.class</include>
-                                <include>net/ranides/assira/reflection/IVariables.class</include>
-                                
-=======
-                                <include>net/ranides/assira/collection/sets/BitMask*</include>
-                                
-                                <include>net/ranides/assira/lexer/**</include>
-                                
-                                <include>net/ranides/assira/generic/SerializationUtils*</include>
-                                <include>net/ranides/assira/generic/TypeToken*</include>
-                                <include>net/ranides/assira/generic/Wrapper*</include>
-                                
-                                <include>net/ranides/assira/io/IOStreams*</include>
-                                <include>net/ranides/assira/io/IOEvents*</include>
-                                <include>net/ranides/assira/io/StringInput</include>
-                                <include>net/ranides/assira/io/StringOutput*</include>
-                                
-                                <include>net/ranides/assira/math/LSFR*</include>
-                                <include>net/ranides/assira/math/MathUtils*</include>
-                                
-                                <include>net/ranides/assira/reflection/*</include>
->>>>>>> 9b4a21476445b1d46e695f1131b66ea0e0c244df
-                                <include>net/ranides/assira/reflection/impl/*</include>
-                                <include>net/ranides/assira/reflection/util/ReflectUtils*</include>
-                                
-                                <include>net/ranides/assira/text/StrBuffer*</include>
-                                <include>net/ranides/assira/text/StrBuffer*</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>
-	
-	<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>
-</project>