Next Development Version

This commit is contained in:
Spring Buildmaster
2018-07-10 12:29:54 +00:00
parent de83ab2d2b
commit 34b518d49f
5 changed files with 23 additions and 36 deletions

View File

@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>io.spring.initializr</groupId> <groupId>io.spring.initializr</groupId>
<artifactId>initializr</artifactId> <artifactId>initializr</artifactId>
<version>0.6.0.BUILD-SNAPSHOT</version> <version>0.7.0.BUILD-SNAPSHOT</version>
</parent> </parent>
<artifactId>initializr-actuator</artifactId> <artifactId>initializr-actuator</artifactId>
<name>Spring Initializr :: Actuator</name> <name>Spring Initializr :: Actuator</name>

View File

@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>io.spring.initializr</groupId> <groupId>io.spring.initializr</groupId>
<artifactId>initializr</artifactId> <artifactId>initializr</artifactId>
<version>0.6.0.BUILD-SNAPSHOT</version> <version>0.7.0.BUILD-SNAPSHOT</version>
</parent> </parent>
<artifactId>initializr-docs</artifactId> <artifactId>initializr-docs</artifactId>
<name>Spring Initializr :: Docs</name> <name>Spring Initializr :: Docs</name>
@@ -224,8 +223,7 @@
<include name="**/*.epub" /> <include name="**/*.epub" />
</fileset> </fileset>
</copy> </copy>
<move file="${basedir}/target/contents/reference/epub/index.epub" <move file="${basedir}/target/contents/reference/epub/index.epub" tofile="${basedir}/target/contents/reference/epub/initializr-reference.epub" />
tofile="${basedir}/target/contents/reference/epub/initializr-reference.epub" />
</postProcess> </postProcess>
</configuration> </configuration>
</execution> </execution>
@@ -266,8 +264,7 @@
</goals> </goals>
<configuration> <configuration>
<target> <target>
<zip <zip destfile="${project.build.directory}/${project.artifactId}-${project.version}.zip">
destfile="${project.build.directory}/${project.artifactId}-${project.version}.zip">
<fileset dir="${project.build.directory}/contents" /> <fileset dir="${project.build.directory}/contents" />
</zip> </zip>
</target> </target>
@@ -285,20 +282,15 @@
<taskdef resource="net/sf/antcontrib/antcontrib.properties" /> <taskdef resource="net/sf/antcontrib/antcontrib.properties" />
<taskdef name="stringutil" classname="ise.antelope.tasks.StringUtilTask" /> <taskdef name="stringutil" classname="ise.antelope.tasks.StringUtilTask" />
<var name="version-type" value="${project.version}" /> <var name="version-type" value="${project.version}" />
<propertyregex property="version-type" override="true" <propertyregex property="version-type" override="true" input="${version-type}" regexp=".*\.(.*)" replace="\1" />
input="${version-type}" regexp=".*\.(.*)" replace="\1" /> <propertyregex property="version-type" override="true" input="${version-type}" regexp="(M)\d+" replace="MILESTONE" />
<propertyregex property="version-type" override="true" <propertyregex property="version-type" override="true" input="${version-type}" regexp="(RC)\d+" replace="MILESTONE" />
input="${version-type}" regexp="(M)\d+" replace="MILESTONE" /> <propertyregex property="version-type" override="true" input="${version-type}" regexp="BUILD-(.*)" replace="SNAPSHOT" />
<propertyregex property="version-type" override="true"
input="${version-type}" regexp="(RC)\d+" replace="MILESTONE" />
<propertyregex property="version-type" override="true"
input="${version-type}" regexp="BUILD-(.*)" replace="SNAPSHOT" />
<stringutil string="${version-type}" property="initializr-repo"> <stringutil string="${version-type}" property="initializr-repo">
<lowercase /> <lowercase />
</stringutil> </stringutil>
<var name="github-tag" value="v${project.version}" /> <var name="github-tag" value="v${project.version}" />
<propertyregex property="github-tag" override="true" <propertyregex property="github-tag" override="true" input="${github-tag}" regexp=".*SNAPSHOT" replace="master" />
input="${github-tag}" regexp=".*SNAPSHOT" replace="master" />
</target> </target>
</configuration> </configuration>
</execution> </execution>

View File

@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>io.spring.initializr</groupId> <groupId>io.spring.initializr</groupId>
<artifactId>initializr</artifactId> <artifactId>initializr</artifactId>
<version>0.6.0.BUILD-SNAPSHOT</version> <version>0.7.0.BUILD-SNAPSHOT</version>
</parent> </parent>
<artifactId>initializr-generator</artifactId> <artifactId>initializr-generator</artifactId>
<name>Spring Initializr :: Generator</name> <name>Spring Initializr :: Generator</name>

View File

@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>io.spring.initializr</groupId> <groupId>io.spring.initializr</groupId>
<artifactId>initializr</artifactId> <artifactId>initializr</artifactId>
<version>0.6.0.BUILD-SNAPSHOT</version> <version>0.7.0.BUILD-SNAPSHOT</version>
</parent> </parent>
<artifactId>initializr-web</artifactId> <artifactId>initializr-web</artifactId>
<name>Spring Initializr :: Web</name> <name>Spring Initializr :: Web</name>

18
pom.xml
View File

@@ -1,11 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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> <modelVersion>4.0.0</modelVersion>
<groupId>io.spring.initializr</groupId> <groupId>io.spring.initializr</groupId>
<artifactId>initializr</artifactId> <artifactId>initializr</artifactId>
<version>0.6.0.BUILD-SNAPSHOT</version> <version>0.7.0.BUILD-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Spring Initializr</name> <name>Spring Initializr</name>
<description>A web-based quickstart generator for Spring projects</description> <description>A web-based quickstart generator for Spring projects</description>
@@ -57,28 +55,28 @@
<dependency> <dependency>
<groupId>io.spring.initializr</groupId> <groupId>io.spring.initializr</groupId>
<artifactId>initializr-actuator</artifactId> <artifactId>initializr-actuator</artifactId>
<version>0.6.0.BUILD-SNAPSHOT</version> <version>0.7.0.BUILD-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.spring.initializr</groupId> <groupId>io.spring.initializr</groupId>
<artifactId>initializr-generator</artifactId> <artifactId>initializr-generator</artifactId>
<version>0.6.0.BUILD-SNAPSHOT</version> <version>0.7.0.BUILD-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.spring.initializr</groupId> <groupId>io.spring.initializr</groupId>
<artifactId>initializr-generator</artifactId> <artifactId>initializr-generator</artifactId>
<version>0.6.0.BUILD-SNAPSHOT</version> <version>0.7.0.BUILD-SNAPSHOT</version>
<type>test-jar</type> <type>test-jar</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.spring.initializr</groupId> <groupId>io.spring.initializr</groupId>
<artifactId>initializr-web</artifactId> <artifactId>initializr-web</artifactId>
<version>0.6.0.BUILD-SNAPSHOT</version> <version>0.7.0.BUILD-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.spring.initializr</groupId> <groupId>io.spring.initializr</groupId>
<artifactId>initializr-web</artifactId> <artifactId>initializr-web</artifactId>
<version>0.6.0.BUILD-SNAPSHOT</version> <version>0.7.0.BUILD-SNAPSHOT</version>
<type>test-jar</type> <type>test-jar</type>
</dependency> </dependency>
@@ -299,7 +297,7 @@
</goals> </goals>
</pluginExecutionFilter> </pluginExecutionFilter>
<action> <action>
<ignore></ignore> <ignore />
</action> </action>
</pluginExecution> </pluginExecution>
</pluginExecutions> </pluginExecutions>