Merge branch 'master' of https://repo1.mydevil.net/git/priv/ranides/assira

# Conflicts:
#	pom.xml

.gitignore

@@ -2,22 +2,12 @@
 /assira.asm/target/
 /assira.rules/target/
 /assira.rules.test/target/
-/assira/nbproject/
 /assira.junit/target/
-/assira.junit/nbproject/
 /assira.drafts/target/
-/assira/pom.xml.versionsBackup
 /assira.test/target/
-/assira.drafts/nbproject/
 /assira.benchmark/target/
-/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.drafts/pom.xml.versionsBackup
-/assira.rules.test/pom.xml.versionsBackup
-/assira.benchmark/pom.xml.versionsBackup
+/assira.all/target/
+pom.xml.versionsBackup
+nbproject
 /.idea
 *.iml

assira.all/dependency-reduced-pom.xml

@@ -0,0 +1,34 @@
+<?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/maven-v4_0_0.xsd">
+  <parent>
+    <artifactId>assira.project</artifactId>
+    <groupId>net.ranides</groupId>
+    <version>2.1.0</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>assira.all</artifactId>
+  <name>assira.all</name>
+  <version>2.1.0</version>
+  <build>
+    <plugins>
+      <plugin>
+        <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>
+</project>
+

assira.all/pom.xml

@@ -0,0 +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>
+    <parent>
+        <groupId>net.ranides</groupId>
+        <artifactId>assira.project</artifactId>
+        <version>2.1.0</version>
+    </parent>
+    <artifactId>assira.all</artifactId>
+    <version>2.1.0</version>
+    <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>${project.groupId}</groupId>
+            <artifactId>assira</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+    <name>assira.all</name>
+</project>

assira.asm/dependency-reduced-pom.xml

@@ -0,0 +1,63 @@
+<?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/maven-v4_0_0.xsd">
+  <parent>
+    <artifactId>assira.project</artifactId>
+    <groupId>net.ranides</groupId>
+    <version>2.1.0</version>
+    <relativePath>..</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>net.ranides</groupId>
+  <artifactId>assira.asm</artifactId>
+  <version>5.0.4</version>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>1.4</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <shadedArtifactAttached>false</shadedArtifactAttached>
+              <createDependencyReducedPom>true</createDependencyReducedPom>
+              <minimizeJar>false</minimizeJar>
+              <createSourcesJar>true</createSourcesJar>
+              <artifactSet>
+                <includes>
+                  <include>org.ow2.asm:*</include>
+                </includes>
+              </artifactSet>
+              <filters>
+                <filter>
+                  <artifact>org.ow2.asm:*</artifact>
+                  <excludes>
+                    <exclude>META-INF/**</exclude>
+                  </excludes>
+                </filter>
+              </filters>
+              <relocations>
+                <relocation>
+                  <pattern>org.objectweb.asm</pattern>
+                  <shadedPattern>net.ranides.asm</shadedPattern>
+                </relocation>
+              </relocations>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib</artifactId>
+      <version>3.2.4</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>
+

pom.xml

@@ -35,6 +35,7 @@
         <module>assira.drafts</module>
         <module>assira.benchmark</module>
         <module>assira</module>
+        <module>assira.all</module>
     </modules>
     
     <distributionManagement>