Skip to content

Commit

Permalink
Merge pull request #19 from Jzow/master
Browse files Browse the repository at this point in the history 
Fix Github CI and spring boot package
  • Loading branch information
@Jzow
Jzow authored Aug 31, 2023
2 parents b2f7797 + cacb4ef commit 650aec0
Show file tree
Hide file tree
Showing 9 changed files with 118 additions and 72 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/maven.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
distribution: 'temurin'
cache: maven
- name: Build with Maven
# run: mvn -B package --file pom.xml
run: mvn -B package --file pom.xml

# Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
# - name: Update dependency graph
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

Next generation intelligent ERP system

We will conduct secondary development based on [jshERP](https://github.com/jishenghua/jshERP), and this warehouse will use brand new technology, We will refer to SpringCloud technology in the future
We will refer to SpringCloud technology in the future
41 changes: 12 additions & 29 deletions api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,18 @@
<version>1.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>com.wansensoft</groupId>
<artifactId>plugins</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>com.wansensoft</groupId>
<artifactId>middleware</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>com.wansensoft</groupId>
<artifactId>service</artifactId>
Expand All @@ -44,33 +56,4 @@
</dependency>
</dependencies>

<build>
<resources>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
</resource>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<finalName>wansenerp</finalName>
<excludes>
<exclude>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>

</project>
17 changes: 15 additions & 2 deletions dao/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<artifactId>dao</artifactId>

<properties>
<maven.compiler.source>20</maven.compiler.source>
<maven.compiler.target>20</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

Expand All @@ -31,4 +31,17 @@
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<classifier>exec</classifier>
</configuration>
</plugin>

</plugins>
</build>

</project>
16 changes: 13 additions & 3 deletions domain/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<artifactId>domain</artifactId>

<properties>
<maven.compiler.source>20</maven.compiler.source>
<maven.compiler.target>20</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

Expand All @@ -24,5 +24,15 @@
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>
17 changes: 15 additions & 2 deletions plugins/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<artifactId>plugins</artifactId>

<properties>
<maven.compiler.source>20</maven.compiler.source>
<maven.compiler.target>20</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

Expand All @@ -25,4 +25,17 @@
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<classifier>exec</classifier>
</configuration>
</plugin>

</plugins>
</build>

</project>
66 changes: 34 additions & 32 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
<description>万森ERP</description>

<modules>
<module>api</module>
<module>service</module>
<module>dao</module>
<module>plugins</module>
<module>utils</module>
<module>middleware</module>
<module>domain</module>
<module>plugins</module>
<module>middleware</module>
<module>service</module>
<module>dao</module>
<module>api</module>
</modules>

<parent>
Expand Down Expand Up @@ -65,40 +65,42 @@

<build>
<finalName>WanSenERP</finalName>
<resources>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xml</include>
</includes>
</resource>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<executions>
<execution>
<id>build-info</id>
<phase>generate-sources</phase>
<goals>
<goal>build-info</goal>
</goals>
</execution>
<execution>
<id>repackage</id>
<phase>package</phase>
<goals>
<goal>repackage</goal>
</goals>
<configuration>
<mainClass>com.wansensoft.api.ErpApplication</mainClass>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.mybatis.generator</groupId>
<artifactId>mybatis-generator-maven-plugin</artifactId>
<version>1.4.0</version>
<configuration>
<configurationFile>${basedir}/src/test/resources/generatorConfig.xml</configurationFile>
<verbose>true</verbose>
<overwrite>true</overwrite>
<finalName>wansenerp</finalName>
<mainClass>com.wansensoft.api.ErpApplication</mainClass>
<excludes>
<exclude>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</exclude>
</excludes>
</configuration>
</plugin>
<!-- <plugin>-->
<!-- <groupId>org.mybatis.generator</groupId>-->
<!-- <artifactId>mybatis-generator-maven-plugin</artifactId>-->
<!-- <version>1.4.0</version>-->
<!-- <configuration>-->
<!-- <configurationFile>${basedir}/src/test/resources/generatorConfig.xml</configurationFile>-->
<!-- <verbose>true</verbose>-->
<!-- <overwrite>true</overwrite>-->
<!-- </configuration>-->
<!-- </plugin>-->
</plugins>
</build>
</project>
13 changes: 13 additions & 0 deletions service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,17 @@
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<classifier>exec</classifier>
</configuration>
</plugin>

</plugins>
</build>

</project>
16 changes: 14 additions & 2 deletions utils/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<artifactId>utils</artifactId>

<properties>
<maven.compiler.source>20</maven.compiler.source>
<maven.compiler.target>20</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

Expand Down Expand Up @@ -74,4 +74,16 @@
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<classifier>exec</classifier>
</configuration>
</plugin>
</plugins>
</build>

</project>

0 comments on commit 650aec0

Please sign in to comment.