Skip to content

Commit

Permalink
fix build .
Browse files Browse the repository at this point in the history
  • Loading branch information
@yu199195
yu199195 committed Nov 12, 2020
1 parent 634be0e commit 53f3423
Show file tree
Hide file tree
Showing 4 changed files with 100 additions and 91 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ hs_err_pid*
logPath_IS_UNDEFINED
*.gz
disconf
dist
logs

# idea ignore
.idea
Expand Down
146 changes: 98 additions & 48 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,6 @@
<role>author</role>
</roles>
</developer>

<developer>
<id>jiangxiaofeng</id>
<name>jiangxiaofeng(Nicholas)</name>
<organization>org.dromara</organization>
<roles>
<role>Developer</role>
</roles>
</developer>
</developers>

<parent>
Expand Down Expand Up @@ -101,6 +92,7 @@
<mapstruct.version>1.3.1.Final</mapstruct.version>
<prometheus-java-client.version>0.6.0</prometheus-java-client.version>
<cobertura-maven-plugin.version>2.7</cobertura-maven-plugin.version>
<dashboard.path>${project.basedir}/soul-dashboard</dashboard.path>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -324,45 +316,105 @@
</repository>
</distributionManagement>

<profiles>
<profile>
<id>soul-dashboard</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<build>
<plugins>
<!--这里是为了打包前端的、如果你本地不需要可以注释掉即可-->
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<version>1.6</version>
<configuration>
<workingDirectory>${dashboard.path}</workingDirectory>
<nodeVersion>v12.14.1</nodeVersion>
</configuration>
<executions>
<!--如果你本地已经安装nodejs环境，这步也可以注释-->
<execution>
<id>install node and npm</id>
<goals>
<goal>install-node-and-npm</goal>
</goals>
</execution>
<execution>
<id>npm install</id>
<goals>
<goal>npm</goal>
</goals>
<configuration>
<arguments>install --registry=https://registry.npmjs.org/</arguments>
</configuration>
</execution>
<execution>
<id>npm run build</id>
<goals>
<goal>npm</goal>
</goals>
<configuration>
<arguments>run build</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>release</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.3</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<executions>
<execution>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<build>
<plugins>
<!-- <plugin>-->
<!-- <groupId>org.sonatype.plugins</groupId>-->
<!-- <artifactId>nexus-staging-maven-plugin</artifactId>-->
<!-- <version>1.6.3</version>-->
<!-- <extensions>true</extensions>-->
<!-- <configuration>-->
<!-- <serverId>ossrh</serverId>-->
<!-- <nexusUrl>https://oss.sonatype.org/</nexusUrl>-->
<!-- <autoReleaseAfterClose>true</autoReleaseAfterClose>-->
<!-- </configuration>-->
<!-- </plugin>-->
<!-- <plugin>-->
<!-- <groupId>org.apache.maven.plugins</groupId>-->
<!-- <artifactId>maven-gpg-plugin</artifactId>-->
<!-- <version>1.6</version>-->
<!-- <executions>-->
<!-- <execution>-->
<!-- <phase>verify</phase>-->
<!-- <goals>-->
<!-- <goal>sign</goal>-->
<!-- </goals>-->
<!-- </execution>-->
<!-- </executions>-->
<!-- </plugin>-->
<!-- <plugin>-->
<!-- <groupId>org.apache.maven.plugins</groupId>-->
<!-- <artifactId>maven-source-plugin</artifactId>-->
<!-- <version>3.0.1</version>-->
<!-- <executions>-->
<!-- <execution>-->
<!-- <phase>package</phase>-->
<!-- <goals>-->
<!-- <goal>jar-no-fork</goal>-->
<!-- </goals>-->
<!-- </execution>-->
<!-- </executions>-->
<!-- </plugin>-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand Down Expand Up @@ -410,7 +462,6 @@
<artifactId>versions-maven-plugin</artifactId>
<version>2.5</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
Expand Down Expand Up @@ -461,5 +512,4 @@
</plugin>
</plugins>
</build>

</project>
42 changes: 0 additions & 42 deletions soul-admin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>soul-admin</artifactId>

<properties>
<dashboard.path>${project.parent.basedir}/soul-dashboard</dashboard.path>
</properties>

<dependencies>
<dependency>
<groupId>org.dromara</groupId>
Expand Down Expand Up @@ -147,44 +143,6 @@
<build>
<finalName>soul-admin</finalName>
<plugins>
<!--这里是为了打包前端的、如果你本地不需要可以注释掉即可-->
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<version>1.6</version>
<configuration>
<workingDirectory>${dashboard.path}</workingDirectory>
<nodeVersion>v12.14.1</nodeVersion>
</configuration>
<executions>
<!--如果你本地已经安装nodejs环境，这步也可以注释-->
<execution>
<id>install node and npm</id>
<goals>
<goal>install-node-and-npm</goal>
</goals>
</execution>
<execution>
<id>npm install</id>
<goals>
<goal>npm</goal>
</goals>
<configuration>
<arguments>install --registry=https://registry.npmjs.org/</arguments>
</configuration>
</execution>
<execution>
<id>npm run build</id>
<goals>
<goal>npm</goal>
</goals>
<configuration>
<arguments>run build</arguments>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
Expand Down
1 change: 0 additions & 1 deletion soul-dashboard
Submodule soul-dashboard deleted from ac823f

0 comments on commit 53f3423

Please sign in to comment.