Skip to content

Commit

Permalink
adjust structure
Browse files Browse the repository at this point in the history
  • Loading branch information
@landyking
landyking committed Mar 24, 2020
1 parent a7a32c2 commit 31cb5c9
Show file tree
Hide file tree
Showing 19 changed files with 57 additions and 37 deletions.
3 changes: 3 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,6 @@ buildNumber.properties
!/.mvn/wrapper/maven-wrapper.jar
*.iml
/.idea/

**/*/.idea
**/*/target
79 changes: 52 additions & 27 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,41 +7,66 @@
<groupId>com.github.landyking</groupId>
<artifactId>daydayup</artifactId>
<version>1.0-SNAPSHOT</version>
<modules>
<module>learn-activiti</module>
<module>learn-json</module>
<module>learn-jasperReports</module>
<module>learn-spring-plugin</module>
<module>learn-jeesite</module>
<module>learn-yisaitong</module>
<module>learn-metainfo</module>
<module>learn-shiro</module>
<module>learn-jna</module>
<module>learn-concurrency</module>
<module>learn-tomcat</module>
<module>learn-transaction</module>
<module>learn-script</module>
<module>learn-idGenerator</module>
<module>learn-ssm</module>
<module>learn-samba</module>
<module>learn-mavenPlugin</module>
<module>learn-bui</module>
<module>learn-mybatis3</module>
<module>learn-xml</module>
<module>learn-springel</module>
<module>learn-openapi</module>
<module>learn-apt</module>
<module>learn-apt-demo</module>
</modules>
<packaging>pom</packaging>

<properties>
<java.version>1.6</java.version>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
<build.timestamp>${maven.build.timestamp}</build.timestamp>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
<version>4.3.12.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.3.12.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.3.12.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
<version>4.3.12.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.plugin</groupId>
<artifactId>spring-plugin-core</artifactId>
<version>1.1.0.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.plugin</groupId>
<artifactId>spring-plugin-integration</artifactId>
<version>1.1.0.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.plugin</groupId>
<artifactId>spring-plugin-metadata</artifactId>
<version>1.1.0.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>3.2.8.RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>
<build>
<plugins>
<plugin>
Expand Down
5 changes: 1 addition & 4 deletions learn-spring-plugin/pom.xml → spring/learn-spring-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<artifactId>daydayup</artifactId>
<groupId>com.github.landyking</groupId>
<version>1.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -15,7 +16,6 @@
<dependency>
<groupId>org.springframework.plugin</groupId>
<artifactId>spring-plugin-core</artifactId>
<version>1.1.0.RELEASE</version>
</dependency>
<!--<dependency>
<groupId>org.springframework.plugin</groupId>
Expand All @@ -25,18 +25,15 @@
<dependency>
<groupId>org.springframework.plugin</groupId>
<artifactId>spring-plugin-metadata</artifactId>
<version>1.1.0.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>3.2.8.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
0 ...nSpringPlugin/master/MasterContainer.java → ...nSpringPlugin/master/MasterContainer.java
View file
File renamed without changes.
0 ...ng/learnSpringPlugin/master/MyPlugin.java → ...ng/learnSpringPlugin/master/MyPlugin.java
View file
File renamed without changes.
0 ...ringPlugin/pluginFirst/MyFirstPlugin.java → ...ringPlugin/pluginFirst/MyFirstPlugin.java
View file
File renamed without changes.
0 ...ring-plugin/src/main/resources/master.xml → ...ring-plugin/src/main/resources/master.xml
View file
File renamed without changes.
0 ...ring-plugin/src/main/resources/plugin.xml → ...ring-plugin/src/main/resources/plugin.xml
View file
File renamed without changes.
0 ...earnSpringPlugin/master/MyPluginTest.java → ...earnSpringPlugin/master/MyPluginTest.java
View file
File renamed without changes.
7 changes: 1 addition & 6 deletions learn-springel/pom.xml → spring/learn-springel/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,37 +6,32 @@
<artifactId>daydayup</artifactId>
<groupId>com.github.landyking</groupId>
<version>1.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>learn-springel</artifactId>

<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
<version>4.3.12.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>4.3.12.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.3.12.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
<version>4.3.12.RELEASE</version>
</dependency>
</dependencies>
</project>
0 ...pringel/src/test/java/depTest/ClassA.java → ...pringel/src/test/java/depTest/ClassA.java
View file
File renamed without changes.
0 ...pringel/src/test/java/depTest/ClassB.java → ...pringel/src/test/java/depTest/ClassB.java
View file
File renamed without changes.
0 ...ringel/src/test/java/depTest/DepTest.java → ...ringel/src/test/java/depTest/DepTest.java
View file
File renamed without changes.
0 ...a/springel/ApplicationContextFactory.java → ...a/springel/ApplicationContextFactory.java
View file
File renamed without changes.
0 ...pringel/src/test/java/springel/Date2.java → ...pringel/src/test/java/springel/Date2.java
View file
File renamed without changes.
0 ...ngel/src/test/java/springel/SpElUtil.java → ...ngel/src/test/java/springel/SpElUtil.java
View file
File renamed without changes.
0 .../src/test/java/springel/SpElUtilTest.java → .../src/test/java/springel/SpElUtilTest.java
View file
File renamed without changes.
0 ...est/java/springel/SpelTestInnerClass.java → ...est/java/springel/SpelTestInnerClass.java
View file
File renamed without changes.
0 learn-springel/src/test/resources/test1.xml → ...arn-springel/src/test/resources/test1.xml
View file
File renamed without changes.

0 comments on commit 31cb5c9

Please sign in to comment.