version 2.7.0

switch modules: jdk & core

assira.archetype/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>net.ranides</groupId>
         <artifactId>assira.project</artifactId>
-        <version>2.6.0</version>
+        <version>2.7.0</version>
     </parent>
 
     <groupId>net.ranides</groupId>

assira.archetype/src/main/resources/archetype-resources/pom.xml

@@ -84,12 +84,12 @@
         <dependency>
             <groupId>net.ranides</groupId>
             <artifactId>assira.core</artifactId>
-            <version>2.6.0</version>
+            <version>2.7.0</version>
         </dependency>
         <dependency>
             <groupId>net.ranides</groupId>
             <artifactId>assira.junit</artifactId>
-            <version>2.6.0</version>
+            <version>2.7.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

assira.asm/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>net.ranides</groupId>
         <artifactId>assira.project</artifactId>
-        <version>2.6.0</version>
+        <version>2.7.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <groupId>net.ranides</groupId>

assira.benchmark/pom.xml

@@ -4,7 +4,7 @@
     <parent>
 		<groupId>net.ranides</groupId>
 		<artifactId>assira.project</artifactId>
-		<version>2.6.0</version>
+		<version>2.7.0</version>
         <relativePath>../pom.xml</relativePath>
 	</parent>
     <name>assira.benchmark</name>
@@ -41,12 +41,12 @@
         </dependency>
         <dependency>
             <groupId>net.ranides</groupId>
-            <artifactId>assira.jdk8</artifactId>
+            <artifactId>assira.core8</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>net.ranides</groupId>
-            <artifactId>assira.jdk11</artifactId>
+            <artifactId>assira.core11</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>

assira.core/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>net.ranides</groupId>
         <artifactId>assira.project</artifactId>
-        <version>2.6.0</version>
+        <version>2.7.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <name>assira.core</name>

assira.core/src/test/java/net/ranides/assira/io/uri/impl/CFileHandlerTest.java

@@ -86,7 +86,7 @@ public class CFileHandlerTest {
         ));
         assertEquals("Hello world", IOStrings.read(handle6.reader()));
 
-        assertEquals("Invalid number of files inside root directory", 23, handle1.scan().size());
+        assertEquals("Invalid number of files inside root directory", 22, handle1.scan().size());
         assertEquals(Arrays.asList("indir","text"), handle3.parent().parent().scan().map(f-> asName(f)).sort().list());
         assertEquals(Arrays.asList("info.txt"), handle2.scan().map(f-> asName(f)).sort().list());
         assertThrows(IOException.class, ()->{

assira.core11/pom.xml

@@ -1,47 +1,70 @@
 <?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>
+<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">
     <parent>
-        <groupId>net.ranides</groupId>
         <artifactId>assira.project</artifactId>
-        <version>2.6.0</version>
+        <groupId>net.ranides</groupId>
+        <version>2.7.0</version>
     </parent>
+    <modelVersion>4.0.0</modelVersion>
+
     <artifactId>assira.core11</artifactId>
-    <packaging>jar</packaging>
-    
+
+    <properties>
+        <assira.junit.debug>false</assira.junit.debug>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+    </properties>
+
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>2.4.3</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <shadedArtifactAttached>false</shadedArtifactAttached>
-                            <createDependencyReducedPom>true</createDependencyReducedPom>
-                            <minimizeJar>false</minimizeJar>
-                        </configuration>
-                    </execution>
-                </executions>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
+                    <compilerArgs>
+                        <argument>-Xlint:unchecked</argument>
+                        <argument>-Xlint:removal</argument>
+                        <argument>-parameters</argument>
+                    </compilerArgs>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>net/ranides/assira/test/**</exclude>
+                    </excludes>
+                </configuration>
             </plugin>
         </plugins>
     </build>
 
     <dependencies>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>net.ranides</groupId>
             <artifactId>assira.core</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>assira.jdk11</artifactId>
-            <version>${project.version}</version>
+            <groupId>net.ranides</groupId>
+            <artifactId>assira.junit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
         </dependency>
     </dependencies>
+
 </project>

assira.core8/pom.xml

@@ -1,47 +1,43 @@
 <?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>
+<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">
     <parent>
-        <groupId>net.ranides</groupId>
         <artifactId>assira.project</artifactId>
-        <version>2.6.0</version>
+        <groupId>net.ranides</groupId>
+        <version>2.7.0</version>
     </parent>
+    <modelVersion>4.0.0</modelVersion>
+
     <artifactId>assira.core8</artifactId>
-    <packaging>jar</packaging>
-    
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>2.4.3</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <shadedArtifactAttached>false</shadedArtifactAttached>
-                            <createDependencyReducedPom>true</createDependencyReducedPom>
-                            <minimizeJar>false</minimizeJar>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+
+    <properties>
+        <assira.junit.debug>false</assira.junit.debug>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
 
     <dependencies>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>net.ranides</groupId>
             <artifactId>assira.core</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>assira.jdk8</artifactId>
-            <version>${project.version}</version>
+            <groupId>net.ranides</groupId>
+            <artifactId>assira.junit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
         </dependency>
     </dependencies>
+
 </project>

assira.debugger/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>assira.project</artifactId>
         <groupId>net.ranides</groupId>
-        <version>2.6.0</version>
+        <version>2.7.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

assira.drafts/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>net.ranides</groupId>
         <artifactId>assira.project</artifactId>
-        <version>2.6.0</version>
+        <version>2.7.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <groupId>net.ranides</groupId>
@@ -32,7 +32,7 @@
         </dependency>
         <dependency>
             <groupId>net.ranides</groupId>
-            <artifactId>assira.jdk8</artifactId>
+            <artifactId>assira.core8</artifactId>
         </dependency>
         <dependency>
             <groupId>net.ranides</groupId>

assira.enterprise/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>net.ranides</groupId>
         <artifactId>assira.project</artifactId>
-        <version>2.6.0</version>
+        <version>2.7.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -18,12 +18,12 @@
         <dependency>
             <groupId>net.ranides</groupId>
             <artifactId>assira.core</artifactId>
-            <version>2.6.0</version>
+            <version>2.7.0</version>
         </dependency>
         <dependency>
             <groupId>net.ranides</groupId>
             <artifactId>assira.junit</artifactId>
-            <version>2.6.0</version>
+            <version>2.7.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>

assira.jdk11/pom.xml

@@ -1,70 +1,49 @@
 <?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">
+<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>
-        <artifactId>assira.project</artifactId>
         <groupId>net.ranides</groupId>
-        <version>2.6.0</version>
+        <artifactId>assira.project</artifactId>
+        <version>2.7.0</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
-
     <artifactId>assira.jdk11</artifactId>
-
-    <properties>
-        <assira.junit.debug>false</assira.junit.debug>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-    </properties>
-
+    <packaging>jar</packaging>
+    
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>${maven.compiler.source}</source>
-                    <target>${maven.compiler.target}</target>
-                    <compilerArgs>
-                        <argument>-Xlint:unchecked</argument>
-                        <argument>-Xlint:removal</argument>
-                        <argument>-parameters</argument>
-                    </compilerArgs>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>net/ranides/assira/test/**</exclude>
-                    </excludes>
-                </configuration>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>2.4.3</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <shadedArtifactAttached>false</shadedArtifactAttached>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                            <minimizeJar>false</minimizeJar>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>
 
     <dependencies>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>net.ranides</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>assira.core</artifactId>
         </dependency>
         <dependency>
-            <groupId>net.ranides</groupId>
-            <artifactId>assira.junit</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>assira.core11</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>assira.lambda</artifactId>
         </dependency>
     </dependencies>
-
 </project>

assira.jdk8/pom.xml

@@ -1,43 +1,47 @@
 <?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">
+<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>
-        <artifactId>assira.project</artifactId>
         <groupId>net.ranides</groupId>
-        <version>2.6.0</version>
+        <artifactId>assira.project</artifactId>
+        <version>2.7.0</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
-
     <artifactId>assira.jdk8</artifactId>
-
-    <properties>
-        <assira.junit.debug>false</assira.junit.debug>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-    </properties>
+    <packaging>jar</packaging>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>2.4.3</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <shadedArtifactAttached>false</shadedArtifactAttached>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                            <minimizeJar>false</minimizeJar>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 
     <dependencies>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>net.ranides</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>assira.core</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>net.ranides</groupId>
-            <artifactId>assira.junit</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>assira.core8</artifactId>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
-
 </project>

assira.junit/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>net.ranides</groupId>
         <artifactId>assira.project</artifactId>
-        <version>2.6.0</version>
+        <version>2.7.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     

assira.lambda/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>assira.project</artifactId>
         <groupId>net.ranides</groupId>
-        <version>2.6.0</version>
+        <version>2.7.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -59,7 +59,7 @@
         </dependency>
         <dependency>
             <groupId>net.ranides</groupId>
-            <artifactId>assira.jdk11</artifactId>
+            <artifactId>assira.core11</artifactId>
         </dependency>
         <dependency>
             <groupId>net.ranides</groupId>

assira.rules.test/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>net.ranides</groupId>
         <artifactId>assira.project</artifactId>
-        <version>2.6.0</version>
+        <version>2.7.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     

assira.rules/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>net.ranides</groupId>
         <artifactId>assira.project</artifactId>
-        <version>2.6.0</version>
+        <version>2.7.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     

assira.test/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
         <groupId>net.ranides</groupId>
         <artifactId>assira.project</artifactId>
-        <version>2.6.0</version>
+        <version>2.7.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 	

pom.xml

@@ -4,13 +4,13 @@
 
     <groupId>net.ranides</groupId>
     <artifactId>assira.project</artifactId>
-    <version>2.6.0</version>
+    <version>2.7.0</version>
     <packaging>pom</packaging>
 
     <url>http://ranides.net/projects/assira</url>
 
     <properties>
-        <assira.version>2.6.0</assira.version>
+        <assira.version>2.7.0</assira.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
@@ -52,8 +52,8 @@
             </activation>
             <modules>
                 <module>assira.drafts</module>
-                <module>assira.jdk8</module>
                 <module>assira.core8</module>
+                <module>assira.jdk8</module>
             </modules>
         </profile>
         <profile>
@@ -62,8 +62,8 @@
                 <jdk>11</jdk>
             </activation>
             <modules>
-                <module>assira.jdk11</module>
                 <module>assira.core11</module>
+                <module>assira.jdk11</module>
                 <module>assira.lambda</module>
                 <module>assira.debugger</module>
             </modules>
@@ -221,6 +221,16 @@
                 <artifactId>assira.core</artifactId>
                 <version>${assira.version}</version>
             </dependency>
+            <dependency>
+                <groupId>net.ranides</groupId>
+                <artifactId>assira.core8</artifactId>
+                <version>${assira.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>net.ranides</groupId>
+                <artifactId>assira.core11</artifactId>
+                <version>${assira.version}</version>
+            </dependency>
             <dependency>
                 <groupId>net.ranides</groupId>
                 <artifactId>assira.asm</artifactId>
@@ -244,6 +254,11 @@
                 <version>${assira.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>net.ranides</groupId>
+                <artifactId>assira.lambda</artifactId>
+                <version>${assira.version}</version>
+            </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>