Add option

jxnet · Nov 12, 2018 · 5cc7a92 · 5cc7a92
1 parent 6d76396
commit 5cc7a92
Show file tree

Hide file tree

Showing 25 changed files with 155 additions and 324 deletions.
diff --git a/gradle/artifactInstall.gradle b/gradle/artifactInstall.gradle
@@ -29,6 +29,21 @@ allprojects {
                 }
 
             }
+
+            if (!project.name.equals("jxpacket")) {
+                pom.withXml {
+                    asNode().dependencies.dependency.findAll { xmlDep ->
+                        if (xmlDep.scope.text() == 'compile') {
+                            def xmlOptional = xmlDep.optional[0]
+                            if (!xmlOptional) {
+                                xmlOptional = xmlDep.appendNode('optional')
+                            }
+                            xmlOptional.value = 'true'
+                        }
+                    }
+                }
+            }
+
         }
     }
 

diff --git a/gradle/configure.gradle b/gradle/configure.gradle
@@ -7,7 +7,7 @@ ext {
 
 	NAME = 'Jxpacket'
 	GROUP = 'com.ardikars.jxpacket'
-	VERSION = '1.1.0.RC24'
+	VERSION = '1.1.0.RC25'
 	DESCRIPTION = 'Jxpacket is a network packet crafting library for java.'
 
 	MAVEN_LOCAL_REPOSITORY = "${System.env.HOME}/.m2/repository"

diff --git a/jxpacket-jxnet/build.gradle b/jxpacket-jxnet/build.gradle
@@ -2,8 +2,8 @@
 dependencies {
     implementation ('com.ardikars.common:common-net')
     implementation ('com.ardikars.common:common-util')
-    compileOnly ('com.ardikars.jxnet:jxnet-context')
-    compileOnly ('com.ardikars.jxnet:jxnet-core')
+    compile ('com.ardikars.jxnet:jxnet-context')
+    compile ('com.ardikars.jxnet:jxnet-core')
     implementation project(':jxpacket-common')
     implementation project(':jxpacket-core')
 }

diff --git a/jxpacket-pcap4j/build.gradle b/jxpacket-pcap4j/build.gradle
@@ -2,7 +2,7 @@
 dependencies {
     implementation ('com.ardikars.common:common-net')
     implementation ('com.ardikars.common:common-util')
-    compileOnly ("org.pcap4j:pcap4j-core:${PCAP4J_VERSION}")
+    compile "org.pcap4j:pcap4j-core:${PCAP4J_VERSION}"
     implementation project(':jxpacket-common')
     implementation project(':jxpacket-core')
 }

diff --git a/jxpacket-spring-boot-autoconfigure/build.gradle b/jxpacket-spring-boot-autoconfigure/build.gradle
@@ -2,12 +2,9 @@
 dependencies {
     implementation ("org.springframework.boot:spring-boot-configuration-processor")
     implementation ("org.springframework.boot:spring-boot-autoconfigure")
-    implementation ("org.pcap4j:pcap4j-core:${PCAP4J_VERSION}")
-    implementation ("com.ardikars.jxnet:jxnet-context")
-    implementation ("com.ardikars.jxnet:jxnet-core")
     implementation project(":jxpacket-common")
-    implementation project(":jxpacket-jxnet")
-    implementation project(":jxpacket-pcap4j")
+    compile project(":jxpacket-jxnet")
+    compile project(":jxpacket-pcap4j")
 }
 
 dependencyManagement {

diff --git a/...build/classes/java/main/com/ardikars/jxpacket/spring/boot/Pcap4jAutoConfiguration$1.class b/...build/classes/java/main/com/ardikars/jxpacket/spring/boot/Pcap4jAutoConfiguration$1.class
diff --git a/...pring/boot/JxnetAutoConfiguration$1.class → ...boot/jxnet/JxnetAutoConfiguration$1.class b/...pring/boot/JxnetAutoConfiguration$1.class → ...boot/jxnet/JxnetAutoConfiguration$1.class
diff --git a/.../spring/boot/JxnetAutoConfiguration.class → ...g/boot/jxnet/JxnetAutoConfiguration.class b/.../spring/boot/JxnetAutoConfiguration.class → ...g/boot/jxnet/JxnetAutoConfiguration.class
diff --git a/...lasses/java/main/com/ardikars/jxpacket/spring/boot/pcap4j/Pcap4jAutoConfiguration$1.class b/...lasses/java/main/com/ardikars/jxpacket/spring/boot/pcap4j/Pcap4jAutoConfiguration$1.class
diff --git a/...spring/boot/Pcap4jAutoConfiguration.class → ...boot/pcap4j/Pcap4jAutoConfiguration.class b/...spring/boot/Pcap4jAutoConfiguration.class → ...boot/pcap4j/Pcap4jAutoConfiguration.class
diff --git a/...et-spring-boot-autoconfigure/build/libs/jxpacket-spring-boot-autoconfigure-1.1.0.RC19.jar b/...et-spring-boot-autoconfigure/build/libs/jxpacket-spring-boot-autoconfigure-1.1.0.RC19.jar
diff --git a/...et-spring-boot-autoconfigure/build/libs/jxpacket-spring-boot-autoconfigure-1.1.0.RC21.jar b/...et-spring-boot-autoconfigure/build/libs/jxpacket-spring-boot-autoconfigure-1.1.0.RC21.jar
diff --git a/...et-spring-boot-autoconfigure/build/libs/jxpacket-spring-boot-autoconfigure-1.1.0.RC24.jar b/...et-spring-boot-autoconfigure/build/libs/jxpacket-spring-boot-autoconfigure-1.1.0.RC24.jar
diff --git a/jxpacket-spring-boot-autoconfigure/build/poms/pom-default.xml b/jxpacket-spring-boot-autoconfigure/build/poms/pom-default.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.ardikars.jxpacket</groupId>
+  <artifactId>jxpacket-spring-boot-autoconfigure</artifactId>
+  <version>1.1.0.RC24</version>
+  <name>jxpacket-spring-boot-autoconfigure</name>
+  <description>Jxpacket is a network packet crafting library for java.</description>
+  <url>https://github.com/jxnet/Jxpacket</url>
+  <organization>
+    <name>ardikars</name>
+    <url>http://ardikars.com</url>
+  </organization>
+  <licenses>
+    <license>
+      <name>GNU Lesser General Public License, Version 3.0</name>
+      <url>http://www.gnu.org/licenses</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <id>ardikars</id>
+      <name>Ardika Rommy Sanjaya</name>
+      <email>[email protected]</email>
+    </developer>
+  </developers>
+  <scm>
+    <connection>scm:git:https://github.com/jxnet/Jxpacket.git</connection>
+    <developerConnection>scm:git:[email protected]/jxnet/Jxpacket.git</developerConnection>
+    <url>https://github.com/jxnet/Jxpacket.git</url>
+  </scm>
+  <dependencies>
+    <dependency>
+      <groupId>com.ardikars.jxpacket</groupId>
+      <artifactId>jxpacket-jxnet</artifactId>
+      <version>1.1.0.RC24</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.ardikars.jxpacket</groupId>
+      <artifactId>jxpacket-pcap4j</artifactId>
+      <version>1.1.0.RC24</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.ardikars.common</groupId>
+      <artifactId>common-net</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.ardikars.common</groupId>
+      <artifactId>common-util</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-buffer</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-configuration-processor</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-autoconfigure</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.ardikars.jxpacket</groupId>
+      <artifactId>jxpacket-common</artifactId>
+      <version>1.1.0.RC24</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>com.ardikars.jxnet</groupId>
+        <artifactId>jxnet</artifactId>
+        <version>1.4.7.Final</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-dependencies</artifactId>
+        <version>2.0.4.RELEASE</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+      <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty-bom</artifactId>
+        <version>4.1.31.Final</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+      <dependency>
+        <groupId>com.ardikars.common</groupId>
+        <artifactId>common</artifactId>
+        <version>1.2.2.Final</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+</project>
diff --git a/jxpacket-spring-boot-autoconfigure/build/reports/checkstyle/main.html b/jxpacket-spring-boot-autoconfigure/build/reports/checkstyle/main.html
diff --git a/jxpacket-spring-boot-autoconfigure/build/reports/checkstyle/main.xml b/jxpacket-spring-boot-autoconfigure/build/reports/checkstyle/main.xml