Merge branch 'develop' of github.com:opengoofy/hippo4j into update-test-sleep-time

pull/1260/head
Tung Bui 2 years ago
commit 2e93748743

2
.gitignore vendored

@ -7,7 +7,7 @@ target/
!**/dist/ !**/dist/
### Agent ### ### Agent ###
/hippo4j-agent/hippo4j-agent/ agent-dist/
**/dependency-reduced-pom.xml **/dependency-reduced-pom.xml
### STS ### ### STS ###

@ -10,4 +10,12 @@
</parent> </parent>
<artifactId>hippo4j-agents</artifactId> <artifactId>hippo4j-agents</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<properties>
<maven.deploy.skip>true</maven.deploy.skip>
</properties>
<modules>
<module>threadpool</module>
</modules>
</project> </project>

@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>cn.hippo4j</groupId> <groupId>cn.hippo4j</groupId>
<artifactId>hippo4j-agent</artifactId> <artifactId>hippo4j-threadpool-agent</artifactId>
<version>${revision}</version> <version>${revision}</version>
</parent> </parent>
@ -29,7 +29,7 @@
</dependencies> </dependencies>
<build> <build>
<finalName>hippo4j-agent</finalName> <finalName>hippo4j-threadpool-agent</finalName>
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
@ -96,7 +96,7 @@
</goals> </goals>
<configuration> <configuration>
<target> <target>
<delete dir="${project.basedir}/../hippo4j-agent" /> <delete dir="${project.basedir}/../agent-dist" />
</target> </target>
</configuration> </configuration>
</execution> </execution>
@ -108,12 +108,12 @@
</goals> </goals>
<configuration> <configuration>
<target> <target>
<mkdir dir="${project.basedir}/../hippo4j-agent" /> <mkdir dir="${project.basedir}/../agent-dist" />
<copy file="${project.build.directory}/hippo4j-agent.jar" tofile="${project.basedir}/../hippo4j-agent/hippo4j-agent.jar" overwrite="true" /> <copy file="${project.build.directory}/hippo4j-threadpool-agent.jar" tofile="${project.basedir}/../agent-dist/hippo4j-threadpool-agent.jar" overwrite="true" />
<mkdir dir="${project.basedir}/../hippo4j-agent/config" /> <mkdir dir="${project.basedir}/../agent-dist/config" />
<mkdir dir="${project.basedir}/../hippo4j-agent/logs" /> <mkdir dir="${project.basedir}/../agent-dist/logs" />
<copydir src="${project.basedir}/../config" dest="${project.basedir}/../hippo4j-agent/config" forceoverwrite="true" /> <copydir src="${project.basedir}/../config" dest="${project.basedir}/../agent-dist/config" forceoverwrite="true" />
<copydir src="${project.basedir}/../dist-material" dest="${project.basedir}/../hippo4j-agent" /> <copydir src="${project.basedir}/../dist-material" dest="${project.basedir}/../agent-dist" />
</target> </target>
</configuration> </configuration>
</execution> </execution>

@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>cn.hippo4j</groupId> <groupId>cn.hippo4j</groupId>
<artifactId>hippo4j-agent</artifactId> <artifactId>hippo4j-threadpool-agent</artifactId>
<version>${revision}</version> <version>${revision}</version>
</parent> </parent>
@ -75,7 +75,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>cn.hippo4j</groupId> <groupId>cn.hippo4j</groupId>
<artifactId>hippo4j-common</artifactId> <artifactId>hippo4j-threadpool-common</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save