Ranides Atterwim пре 4 година
родитељ
комит
4494a9b002

+ 6 - 0
README.md

@@ -1,5 +1,11 @@
 # assira library
 
+## local build
+```
+mvn -P common,jdk8 clean install
+mvn -P common,jdk11 clean install
+```
+
 ## deployment to maven central
 ```
 JDK 8

+ 1 - 1
assira.asm/pom.xml

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

+ 1 - 1
assira.core/pom.xml

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

+ 1 - 1
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());
+        assertTrue("Invalid number of files inside root directory", handle1.scan().size() > 23);
         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, ()->{

+ 1 - 1
assira.core11/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>assira.project</artifactId>
         <groupId>net.ranides</groupId>
-        <version>2.7.0</version>
+        <version>2.7.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>assira.core11</artifactId>

+ 1 - 1
assira.core8/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>assira.project</artifactId>
         <groupId>net.ranides</groupId>
-        <version>2.7.0</version>
+        <version>2.7.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>assira.core8</artifactId>

+ 1 - 1
assira.enterprise/pom.xml

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

+ 1 - 1
assira.jdk11/pom.xml

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

+ 1 - 1
assira.jdk8/pom.xml

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

+ 1 - 1
assira.junit/pom.xml

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

+ 1 - 1
assira.lambda/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>assira.project</artifactId>
         <groupId>net.ranides</groupId>
-        <version>2.7.0</version>
+        <version>2.7.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>assira.lambda</artifactId>

+ 1 - 1
assira.rules.test/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>net.ranides</groupId>
         <artifactId>assira.project</artifactId>
-        <version>2.7.0</version>
+        <version>2.7.2-SNAPSHOT</version>
     </parent>
     
     <artifactId>assira.rules.test</artifactId>

+ 1 - 1
assira.rules/pom.xml

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

+ 1 - 1
assira.test/pom.xml

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

+ 3 - 0
deploy-asm.bat

@@ -0,0 +1,3 @@
+@echo off
+call jdk8
+call mvn clean deploy -P asm,release

+ 4 - 4
deployme.bat

@@ -1,10 +1,10 @@
 @echo off
-jdk8
-mvn clean deploy -P asm,common,jdk8,release
+call jdk8
+call mvn clean deploy -P common,jdk8,release
 if errorlevel 1 goto fail
 
-jdk11
-mvn clean deploy -P jdk11,release
+call jdk11
+call mvn clean deploy -P jdk11,release
 if errorlevel 1 goto fail
 
 goto success

+ 10 - 17
pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>net.ranides</groupId>
     <artifactId>assira.project</artifactId>
-    <version>2.7.0</version>
+    <version>2.7.2-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>${project.groupId}:${project.artifactId}</name>
@@ -43,7 +43,6 @@
     </distributionManagement>
 
     <properties>
-        <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>
@@ -85,9 +84,6 @@
         </profile>
         <profile>
             <id>jdk8</id>
-            <activation>
-                <jdk>1.8</jdk>
-            </activation>
             <modules>
                 <module>assira.core8</module>
                 <module>assira.jdk8</module>
@@ -95,9 +91,6 @@
         </profile>
         <profile>
             <id>jdk11</id>
-            <activation>
-                <jdk>11</jdk>
-            </activation>
             <modules>
                 <module>assira.core11</module>
                 <module>assira.jdk11</module>
@@ -195,7 +188,7 @@
                     <dependency>
                         <groupId>net.ranides</groupId>
                         <artifactId>assira.rules</artifactId>
-                        <version>${assira.version}</version>
+                        <version>${project.version}</version>
                     </dependency>
                 </dependencies>
             </plugin>
@@ -225,7 +218,7 @@
                 <configuration>
                     <systemPropertyVariables>
                         <assira.junit.debug>${assira.junit.debug}</assira.junit.debug>
-                        <assira.version>${assira.version}</assira.version>
+                        <assira.version>${project.version}</assira.version>
                         <assira.junit.log>${assira.junit.log}</assira.junit.log>
                     </systemPropertyVariables>
                     <testFailureIgnore>false</testFailureIgnore>
@@ -260,17 +253,17 @@
             <dependency>
                 <groupId>net.ranides</groupId>
                 <artifactId>assira.core</artifactId>
-                <version>${assira.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>net.ranides</groupId>
                 <artifactId>assira.core8</artifactId>
-                <version>${assira.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>net.ranides</groupId>
                 <artifactId>assira.core11</artifactId>
-                <version>${assira.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>net.ranides</groupId>
@@ -280,25 +273,25 @@
             <dependency>
                 <groupId>net.ranides</groupId>
                 <artifactId>assira.jdk8</artifactId>
-                <version>${assira.version}</version>
+                <version>${project.version}</version>
                 <scope>runtime</scope>
             </dependency>
             <dependency>
                 <groupId>net.ranides</groupId>
                 <artifactId>assira.jdk11</artifactId>
-                <version>${assira.version}</version>
+                <version>${project.version}</version>
                 <scope>runtime</scope>
             </dependency>
             <dependency>
                 <groupId>net.ranides</groupId>
                 <artifactId>assira.junit</artifactId>
-                <version>${assira.version}</version>
+                <version>${project.version}</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>net.ranides</groupId>
                 <artifactId>assira.lambda</artifactId>
-                <version>${assira.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>junit</groupId>

+ 12 - 0
version-me.bat

@@ -0,0 +1,12 @@
+@echo off
+if "%1"=="" goto usage
+
+:main
+    mvn versions:set -P asm,common,jdk8,jdk11 -DnewVersion=%1
+    goto end
+
+:usage
+    echo.Please specify version
+    goto end
+
+:end