Skip to content

S
spring-boot
Commit 3f2bb03f authored by Phillip Webb's avatar Phillip Webb
Browse files
Options

Renamed some projects and polish POMs 

Issue: #54095231
parent 06ddd924
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 205 additions and 145 deletions
pom.xml
View file @ 3f2bb03f
......@@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot</artifactId>
<artifactId>spring-boot-parent</artifactId>
<version>0.5.0.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<prerequisites>
......@@ -18,11 +18,11 @@
<spring.security.version>3.2.0.M2</spring.security.version>
<spring.integration.version>2.2.4.RELEASE</spring.integration.version>
<spring.batch.version>2.2.0.RELEASE</spring.batch.version>
<groovy.version>2.1.6</groovy.version>
<groovy.version>2.1.6</groovy.version>
<tomcat.version>7.0.42</tomcat.version>
<jetty.version>8.1.9.v20130131</jetty.version>
<aspectj.version>1.7.3</aspectj.version>
<reactor.version>1.0.0.M1</reactor.version>
<reactor.version>1.0.0.M1</reactor.version>
</properties>
<scm>
<url>http://github.com/SpringSource/spring-boot</url>
......@@ -37,14 +37,14 @@
</developer>
</developers>
<modules>
<module>spring-boot-strap</module>
<module>spring-boot-config</module>
<module>spring-boot-ops</module>
<module>spring-boot-load</module>
<module>spring-boot-maven-plugin</module>
<module>spring-boot-ups</module>
<module>spring-boot</module>
<module>spring-boot-autoconfigure</module>
<module>spring-boot-cli</module>
<module>spring-boot-integration-tests</module>
<module>spring-boot-loader</module>
<module>spring-boot-maven-plugin</module>
<module>spring-boot-ops</module>
<module>spring-boot-ups</module>
</modules>
<build>
<pluginManagement>
......@@ -203,9 +203,9 @@
<excludes>
<exclude>**/Abstract*.java</exclude>
</excludes>
<systemPropertyVariables>
<java.security.egd>file:/dev/./urandom</java.security.egd>
</systemPropertyVariables>
<systemPropertyVariables>
<java.security.egd>file:/dev/./urandom</java.security.egd>
</systemPropertyVariables>
<argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine>
</configuration>
</plugin>
......@@ -273,8 +273,8 @@
<version>4.5</version>
</dependency>
<dependency>
<groupId>nz.net.ultraq.thymeleaf</groupId>
<artifactId>thymeleaf-layout-dialect</artifactId>
<groupId>nz.net.ultraq.thymeleaf</groupId>
<artifactId>thymeleaf-layout-dialect</artifactId>
<version>1.1.1</version>
</dependency>
<dependency>
......@@ -433,11 +433,11 @@
<artifactId>hsqldb</artifactId>
<version>2.2.9</version>
</dependency>
<dependency>
<groupId>org.projectreactor</groupId>
<artifactId>reactor-spring</artifactId>
<version>${reactor.version}</version>
</dependency>
<dependency>
<groupId>org.projectreactor</groupId>
<artifactId>reactor-spring</artifactId>
<version>${reactor.version}</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
......@@ -679,7 +679,7 @@
<profiles>
<profile>
<!-- FIXME deactivate before release -->
<id>bootstrap</id>
<id>development</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
......
spring-boot-config/pom.xml → spring-boot-autoconfigure/pom.xml
View file @ 3f2bb03f
......@@ -4,10 +4,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot</artifactId>
<artifactId>spring-boot-parent</artifactId>
<version>0.5.0.BUILD-SNAPSHOT</version>
</parent>
<artifactId>spring-boot-config</artifactId>
<artifactId>spring-boot-autoconfigure</artifactId>
<packaging>jar</packaging>
<properties>
<main.basedir>${basedir}/..</main.basedir>
......@@ -16,7 +16,7 @@
<!-- Compile -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>spring-boot-strap</artifactId>
<artifactId>spring-boot</artifactId>
<version>${project.version}</version>
</dependency>
<!-- Optional -->
......
spring-boot-cli/pom.xml
View file @ 3f2bb03f
......@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot</artifactId>
<artifactId>spring-boot-parent</artifactId>
<version>0.5.0.BUILD-SNAPSHOT</version>
</parent>
<artifactId>spring-boot-cli</artifactId>
......
spring-boot-integration-tests/pom.xml
View file @ 3f2bb03f
......@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot</artifactId>
<artifactId>spring-boot-parent</artifactId>
<version>0.5.0.BUILD-SNAPSHOT</version>
</parent>
<artifactId>spring-boot-integration-tests</artifactId>
......@@ -16,12 +16,12 @@
<!-- Ensure other reactor projects are build before running integration tests -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>spring-boot-ops</artifactId>
<artifactId>spring-boot</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>spring-boot-config</artifactId>
<artifactId>spring-boot-autoconfigure</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
......@@ -31,17 +31,17 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>spring-boot-strap</artifactId>
<artifactId>spring-boot-loader</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>spring-boot-load</artifactId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<artifactId>spring-boot-ops</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
......@@ -51,29 +51,50 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>spring-boot-up-ops</artifactId>
<artifactId>spring-boot-up-batch</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>spring-boot-up-batch</artifactId>
<artifactId>spring-boot-up-data-jpa</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>spring-boot-up-data-jpa</artifactId>
<artifactId>spring-boot-up-integration</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>spring-boot-up-integration</artifactId>
<artifactId>spring-boot-up-jetty</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>spring-boot-up-logging</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>spring-boot-up-ops</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>spring-boot-up-parent</artifactId>
<version>${project.version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>spring-boot-up-security</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>spring-boot-up-tomcat</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>spring-boot-up-web</artifactId>
......
spring-boot-load/pom.xml → spring-boot-loader/pom.xml
View file @ 3f2bb03f
......@@ -4,10 +4,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot</artifactId>
<artifactId>spring-boot-parent</artifactId>
<version>0.5.0.BUILD-SNAPSHOT</version>
</parent>
<artifactId>spring-boot-load</artifactId>
<artifactId>spring-boot-loader</artifactId>
<packaging>jar</packaging>
<properties>
<main.basedir>${basedir}/..</main.basedir>
......
spring-boot-maven-plugin/pom.xml
View file @ 3f2bb03f
This diff is collapsed.
spring-boot-maven-plugin/src/it/jar/pom.xml
View file @ 3f2bb03f
This diff is collapsed.
spring-boot-ops/pom.xml
View file @ 3f2bb03f
This diff is collapsed.
spring-boot-samples/pom.xml
View file @ 3f2bb03f
This diff is collapsed.
spring-boot-ups/pom.xml
View file @ 3f2bb03f
This diff is collapsed.
spring-boot-ups/spring-boot-up-ops/pom.xml
View file @ 3f2bb03f
This diff is collapsed.
spring-boot-ups/spring-boot-up-web/pom.xml
View file @ 3f2bb03f
This diff is collapsed.
spring-boot-ups/spring-boot-up/pom.xml
View file @ 3f2bb03f
This diff is collapsed.
spring-boot-ups/src/main/parent/pom.xml
View file @ 3f2bb03f
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment