diff --git a/gradle/configure.gradle b/gradle/configure.gradle index 3c8e7ee..14f6d80 100644 --- a/gradle/configure.gradle +++ b/gradle/configure.gradle @@ -7,7 +7,7 @@ ext { NAME = 'Jxpacket' GROUP = 'com.ardikars.jxpacket' - VERSION = '1.1.0.RC16' + VERSION = '1.1.0.RC20' DESCRIPTION = 'Jxpacket is a network packet crafting library for java.' MAVEN_LOCAL_REPOSITORY = "${System.env.HOME}/.m2/repository" @@ -28,6 +28,7 @@ ext { NETTY_VERSION = '4.1.31.Final' SPRING_BOOT_VERSION = '2.0.4.RELEASE' JXNET_VERSION = '1.4.7.Final' + PCAP4J_VERSION = '1.7.3' pom_project = { diff --git a/jxpacket-jxnet/build.gradle b/jxpacket-jxnet/build.gradle index f8d21a0..7412f2f 100644 --- a/jxpacket-jxnet/build.gradle +++ b/jxpacket-jxnet/build.gradle @@ -1,15 +1,16 @@ -apply plugin: 'io.spring.dependency-management' - dependencies { - implementation ('com.ardikars.jxnet:jxnet-context') - implementation ('com.ardikars.jxnet:jxnet-core') - implementation project(':jxpacket-common') - implementation project(':jxpacket-core') + compile ('com.ardikars.common:common-net') + compile ('com.ardikars.common:common-util') + compile ('com.ardikars.jxnet:jxnet-context') + compile ('com.ardikars.jxnet:jxnet-core') + compile project(':jxpacket-common') + compile project(':jxpacket-core') } dependencyManagement { imports { mavenBom "com.ardikars.jxnet:jxnet:${JXNET_VERSION}" + mavenBom "com.ardikars.common:common:${COMMON_VERSION}" } } diff --git a/jxpacket-pcap4j/build.gradle b/jxpacket-pcap4j/build.gradle index 6a16a6a..2a670c4 100644 --- a/jxpacket-pcap4j/build.gradle +++ b/jxpacket-pcap4j/build.gradle @@ -1,6 +1,14 @@ dependencies { - compile group: 'org.pcap4j', name: 'pcap4j-core', version: '1.7.3' - implementation project(':jxpacket-common') - implementation project(':jxpacket-core') + compile ('com.ardikars.common:common-net') + compile ('com.ardikars.common:common-util') + implementation ("org.pcap4j:pcap4j-core:${PCAP4J_VERSION}") + compile project(':jxpacket-common') + compile project(':jxpacket-core') +} + +dependencyManagement { + imports { + mavenBom "com.ardikars.common:common:${COMMON_VERSION}" + } } diff --git a/jxpacket-spring-boot-autoconfigure/build.gradle b/jxpacket-spring-boot-autoconfigure/build.gradle index 5e45b44..4f73c00 100644 --- a/jxpacket-spring-boot-autoconfigure/build.gradle +++ b/jxpacket-spring-boot-autoconfigure/build.gradle @@ -2,19 +2,15 @@ dependencies { implementation ("org.springframework.boot:spring-boot-configuration-processor") implementation ("org.springframework.boot:spring-boot-autoconfigure") + implementation ("org.pcap4j:pcap4j-core:${PCAP4J_VERSION}") implementation project(":jxpacket-jxnet") implementation project(":jxpacket-pcap4j") - implementation project(":jxpacket-common") - implementation ("com.ardikars.common:common-net") - implementation ("com.ardikars.common:common-util") - implementation ("com.ardikars.jxnet:jxnet-context") - implementation ("com.ardikars.jxnet:jxnet-core") } dependencyManagement { imports { mavenBom("org.springframework.boot:spring-boot-dependencies:${SPRING_BOOT_VERSION}") - mavenBom("com.ardikars.common:common:${COMMON_VERSION}") - mavenBom("com.ardikars.jxnet:jxnet:${JXNET_VERSION}") + mavenBom "com.ardikars.jxnet:jxnet:${JXNET_VERSION}" + mavenBom "com.ardikars.common:common:${COMMON_VERSION}" } } diff --git a/jxpacket-spring-boot-autoconfigure/build/classes/java/main/com/ardikars/jxpacket/spring/boot/JxnetAutoConfiguration.class b/jxpacket-spring-boot-autoconfigure/build/classes/java/main/com/ardikars/jxpacket/spring/boot/JxnetAutoConfiguration.class index 9fc35d6..3d613bd 100644 Binary files a/jxpacket-spring-boot-autoconfigure/build/classes/java/main/com/ardikars/jxpacket/spring/boot/JxnetAutoConfiguration.class and b/jxpacket-spring-boot-autoconfigure/build/classes/java/main/com/ardikars/jxpacket/spring/boot/JxnetAutoConfiguration.class differ diff --git a/jxpacket-spring-boot-autoconfigure/build/classes/java/main/com/ardikars/jxpacket/spring/boot/Pcap4jAutoConfiguration.class b/jxpacket-spring-boot-autoconfigure/build/classes/java/main/com/ardikars/jxpacket/spring/boot/Pcap4jAutoConfiguration.class index a7f1d78..16674a6 100644 Binary files a/jxpacket-spring-boot-autoconfigure/build/classes/java/main/com/ardikars/jxpacket/spring/boot/Pcap4jAutoConfiguration.class and b/jxpacket-spring-boot-autoconfigure/build/classes/java/main/com/ardikars/jxpacket/spring/boot/Pcap4jAutoConfiguration.class differ diff --git a/jxpacket-spring-boot-autoconfigure/build/libs/jxpacket-spring-boot-autoconfigure-1.1.0.RC16.jar b/jxpacket-spring-boot-autoconfigure/build/libs/jxpacket-spring-boot-autoconfigure-1.1.0.RC16.jar deleted file mode 100644 index f8e3eb0..0000000 Binary files a/jxpacket-spring-boot-autoconfigure/build/libs/jxpacket-spring-boot-autoconfigure-1.1.0.RC16.jar and /dev/null differ diff --git a/jxpacket-spring-boot-autoconfigure/build/libs/jxpacket-spring-boot-autoconfigure-1.1.0.RC19.jar b/jxpacket-spring-boot-autoconfigure/build/libs/jxpacket-spring-boot-autoconfigure-1.1.0.RC19.jar new file mode 100644 index 0000000..adbbae7 Binary files /dev/null and b/jxpacket-spring-boot-autoconfigure/build/libs/jxpacket-spring-boot-autoconfigure-1.1.0.RC19.jar differ diff --git a/jxpacket-spring-boot-autoconfigure/build/reports/pmd/main.xml b/jxpacket-spring-boot-autoconfigure/build/reports/pmd/main.xml index 03ae0df..46f7067 100644 --- a/jxpacket-spring-boot-autoconfigure/build/reports/pmd/main.xml +++ b/jxpacket-spring-boot-autoconfigure/build/reports/pmd/main.xml @@ -2,6 +2,6 @@ + version="6.5.0" timestamp="2018-11-12T18:02:21.758"> diff --git a/jxpacket-spring-boot-autoconfigure/build/tmp/jar/MANIFEST.MF b/jxpacket-spring-boot-autoconfigure/build/tmp/jar/MANIFEST.MF index 101f7cf..1f41cbd 100644 --- a/jxpacket-spring-boot-autoconfigure/build/tmp/jar/MANIFEST.MF +++ b/jxpacket-spring-boot-autoconfigure/build/tmp/jar/MANIFEST.MF @@ -1,4 +1,4 @@ Manifest-Version: 1.0 Implementation-Title: Jxnet -Implementation-Version: 1.1.0.RC16 +Implementation-Version: 1.1.0.RC19 diff --git a/jxpacket-spring-boot-autoconfigure/src/main/java/com/ardikars/jxpacket/spring/boot/JxnetAutoConfiguration.java b/jxpacket-spring-boot-autoconfigure/src/main/java/com/ardikars/jxpacket/spring/boot/JxnetAutoConfiguration.java index 9c22595..4db52fc 100644 --- a/jxpacket-spring-boot-autoconfigure/src/main/java/com/ardikars/jxpacket/spring/boot/JxnetAutoConfiguration.java +++ b/jxpacket-spring-boot-autoconfigure/src/main/java/com/ardikars/jxpacket/spring/boot/JxnetAutoConfiguration.java @@ -61,7 +61,7 @@ * @author jxpacket 2018/11/10 * @author Langkuy */ -@Configuration +@Configuration("com.ardikars.jxpacket.JxnetAutoConfiguration") @ConditionalOnClass({Jxnet.class, Context.class, Packet.class}) @EnableConfigurationProperties(JxpacketConfigurationProperties.class) public class JxnetAutoConfiguration extends AbstractAutoConfiguration { @@ -336,7 +336,7 @@ private List findAddresses(PcapIf networkInter @Override public String prettyApplicationInformation() { return new StringBuilder() - .append("Jxnet ") + .append("Jxnet") .append(super.toString()).toString(); } diff --git a/jxpacket-spring-boot-autoconfigure/src/main/java/com/ardikars/jxpacket/spring/boot/Pcap4jAutoConfiguration.java b/jxpacket-spring-boot-autoconfigure/src/main/java/com/ardikars/jxpacket/spring/boot/Pcap4jAutoConfiguration.java index 28213ce..6b8dfdd 100644 --- a/jxpacket-spring-boot-autoconfigure/src/main/java/com/ardikars/jxpacket/spring/boot/Pcap4jAutoConfiguration.java +++ b/jxpacket-spring-boot-autoconfigure/src/main/java/com/ardikars/jxpacket/spring/boot/Pcap4jAutoConfiguration.java @@ -50,7 +50,7 @@ * @author jxpacket 2018/11/08 * @author Langkuy */ -@Configuration +@Configuration("com.ardikars.jxpacket.pcap4jAutoConfiguration") @ConditionalOnClass(Pcaps.class) @AutoConfigureOrder(Ordered.HIGHEST_PRECEDENCE) @EnableConfigurationProperties(JxpacketConfigurationProperties.class) @@ -195,7 +195,7 @@ private PcapNetworkInterface parsePcapNetworkInterface(org.pcap4j.core.PcapNetwo @Override public String prettyApplicationInformation() { return new StringBuilder() - .append("Pcap4j ") + .append("Pcap4j") .append(super.toString()).toString(); } diff --git a/jxpacket-spring-boot-starter/build.gradle b/jxpacket-spring-boot-starter/build.gradle index 7505c84..db885a6 100644 --- a/jxpacket-spring-boot-starter/build.gradle +++ b/jxpacket-spring-boot-starter/build.gradle @@ -1,6 +1,6 @@ dependencies { - compile project(":jxpacket-spring-boot-autoconfigure") + implementation project(":jxpacket-spring-boot-autoconfigure") compile project(":jxpacket-common") compile project(":jxpacket-core") compile project(":jxpacket-common")