Fix dis for new repo format + add basic verification of artifacts
This commit is contained in:
dsyer
1
dist/dist.txt
vendored
Normal file
1
dist/dist.txt
vendored
Normal file
@@ -0,0 +1 @@
|
||||
This file triggers a Maven profile.
|
||||
180
dist/pom.xml
vendored
180
dist/pom.xml
vendored
@@ -1,26 +1,58 @@
|
||||
<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/maven-v4_0_0.xsd">
|
||||
<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/maven-v4_0_0.xsd">
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.springframework.batch</groupId>
|
||||
<artifactId>org.springframework.batch.dist</artifactId>
|
||||
<version>2.0.0.CI-SNAPSHOT</version>
|
||||
<name>Distribution</name>
|
||||
<packaging>pom</packaging>
|
||||
<packaging>pom</packaging>
|
||||
<description>
|
||||
<!-- Use CDATA to keep it on a single line in the manifest -->
|
||||
<![CDATA[Spring Batch Distribution - used to create a .zip package for distribution of the main sub modules.]]>
|
||||
</description>
|
||||
<parent>
|
||||
<groupId>org.springframework.batch</groupId>
|
||||
<artifactId>org.springframework.batch.batch</artifactId>
|
||||
<version>2.0.0.CI-SNAPSHOT</version>
|
||||
<relativePath>..</relativePath>
|
||||
</parent>
|
||||
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>default</id>
|
||||
<activation>
|
||||
<activeByDefault>true</activeByDefault>
|
||||
</activation>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-antrun-plugin</artifactId>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>verify</id>
|
||||
<activation>
|
||||
<activeByDefault>false</activeByDefault>
|
||||
</activation>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-antrun-plugin</artifactId>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-invoker-plugin</artifactId>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
</profiles>
|
||||
|
||||
<modules>
|
||||
<module>../spring-batch-infrastructure</module>
|
||||
<module>../spring-batch-core</module>
|
||||
<module>../spring-batch-test</module>
|
||||
<module>../spring-batch-samples</module>
|
||||
<module>../archetypes</module>
|
||||
</modules>
|
||||
|
||||
<build>
|
||||
@@ -31,7 +63,121 @@
|
||||
<version>1.2</version>
|
||||
</extension>
|
||||
</extensions>
|
||||
<pluginManagement>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-antrun-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>extract</id>
|
||||
<phase>verify</phase>
|
||||
<goals>
|
||||
<goal>run</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<tasks>
|
||||
<unzip dest="target/it/with-dep">
|
||||
<fileset dir="target">
|
||||
<include name="*with-dep*.zip" />
|
||||
</fileset>
|
||||
<regexpmapper from="^[^/]*/(.*)$$" to="\1"
|
||||
handledirsep="true" />
|
||||
</unzip>
|
||||
<unzip dest="target/it/no-dep">
|
||||
<fileset dir="target">
|
||||
<include name="*no-dep*.zip" />
|
||||
</fileset>
|
||||
<regexpmapper from="^[^/]*/(.*)$$" to="\1"
|
||||
handledirsep="true" />
|
||||
</unzip>
|
||||
<fail message="Spring Batch jar files are missing.">
|
||||
<condition>
|
||||
<not>
|
||||
<resourcecount count="9">
|
||||
<fileset id="fs" dir="target/it/with-dep/dist" includes="*.jar" />
|
||||
</resourcecount>
|
||||
</not>
|
||||
</condition>
|
||||
</fail>
|
||||
<fail message="Dependency jar files are missing.">
|
||||
<condition>
|
||||
<not>
|
||||
<resourcecount count="1">
|
||||
<fileset id="fs" dir="target/it/with-dep/sources/lib" includes="org.springframework.beans-*.jar" />
|
||||
</resourcecount>
|
||||
</not>
|
||||
</condition>
|
||||
</fail>
|
||||
<fail message="Test dependency jar files are missing.">
|
||||
<condition>
|
||||
<not>
|
||||
<resourcecount count="1">
|
||||
<fileset id="fs" dir="target/it/with-dep/sources/lib" includes="com.springsource.org.junit-*.jar" />
|
||||
</resourcecount>
|
||||
</not>
|
||||
</condition>
|
||||
</fail>
|
||||
</tasks>
|
||||
</configuration>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>copy-parent-pom</id>
|
||||
<phase>generate-sources</phase>
|
||||
<configuration>
|
||||
<tasks>
|
||||
<copy file="../pom.xml" todir="target" />
|
||||
</tasks>
|
||||
</configuration>
|
||||
<goals>
|
||||
<goal>run</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.apache.ant</groupId>
|
||||
<artifactId>ant-apache-regexp</artifactId>
|
||||
<version>1.7.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.ant</groupId>
|
||||
<artifactId>ant</artifactId>
|
||||
<version>1.7.0</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-invoker-plugin</artifactId>
|
||||
<configuration>
|
||||
<projectsDirectory>target/it/no-dep</projectsDirectory>
|
||||
<localRepositoryPath>target/local-repo</localRepositoryPath>
|
||||
<debug>true</debug>
|
||||
<settingsFile>${basedir}/src/it/settings.xml</settingsFile>
|
||||
<goals>
|
||||
<goal>test</goal>
|
||||
</goals>
|
||||
<pomIncludes>
|
||||
<pomInclude>samples/*/pom.xml</pomInclude>
|
||||
</pomIncludes>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>integration-test</id>
|
||||
<phase>verify</phase>
|
||||
<goals>
|
||||
<goal>run</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</pluginManagement>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-assembly-plugin</artifactId>
|
||||
<executions>
|
||||
@@ -51,24 +197,6 @@
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-antrun-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>copy-parent-pom</id>
|
||||
<phase>generate-sources</phase>
|
||||
<configuration>
|
||||
<tasks>
|
||||
<copy file="../pom.xml" todir="target"/>
|
||||
</tasks>
|
||||
</configuration>
|
||||
<goals>
|
||||
<goal>run</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
|
||||
14
dist/src/assembly/no-dependencies.xml
vendored
14
dist/src/assembly/no-dependencies.xml
vendored
@@ -11,10 +11,13 @@
|
||||
<moduleSet>
|
||||
<includes>
|
||||
<include>
|
||||
org.springframework.batch:spring-batch-core
|
||||
org.springframework.batch:org.springframework.batch.test
|
||||
</include>
|
||||
<include>
|
||||
org.springframework.batch:spring-batch-infrastructure
|
||||
org.springframework.batch:org.springframework.batch.core
|
||||
</include>
|
||||
<include>
|
||||
org.springframework.batch:org.springframework.batch.infrastructure
|
||||
</include>
|
||||
</includes>
|
||||
<sources>
|
||||
@@ -33,12 +36,15 @@
|
||||
<moduleSet>
|
||||
<includes>
|
||||
<include>
|
||||
org.springframework.batch:spring-batch-samples
|
||||
org.springframework.batch:org.springframework.batch.samples
|
||||
</include>
|
||||
<include>
|
||||
org.springframework.batch:org.springframework.batch.archetype.simple.cli
|
||||
</include>
|
||||
</includes>
|
||||
<sources>
|
||||
<outputDirectoryMapping>
|
||||
samples/spring-batch-samples
|
||||
samples/${module.artifactId}
|
||||
</outputDirectoryMapping>
|
||||
<fileSets>
|
||||
<fileSet>
|
||||
|
||||
74
dist/src/assembly/with-dependencies.xml
vendored
74
dist/src/assembly/with-dependencies.xml
vendored
@@ -11,10 +11,13 @@
|
||||
<moduleSet>
|
||||
<includes>
|
||||
<include>
|
||||
org.springframework.batch:spring-batch-core
|
||||
org.springframework.batch:org.springframework.batch.test
|
||||
</include>
|
||||
<include>
|
||||
org.springframework.batch:spring-batch-infrastructure
|
||||
org.springframework.batch:org.springframework.batch.core
|
||||
</include>
|
||||
<include>
|
||||
org.springframework.batch:org.springframework.batch.infrastructure
|
||||
</include>
|
||||
</includes>
|
||||
<sources>
|
||||
@@ -33,7 +36,10 @@
|
||||
<moduleSet>
|
||||
<includes>
|
||||
<include>
|
||||
org.springframework.batch:spring-batch-samples
|
||||
org.springframework.batch:org.springframework.batch.samples
|
||||
</include>
|
||||
<include>
|
||||
org.springframework.batch:org.springframework.batch.archetype.simple.cli
|
||||
</include>
|
||||
</includes>
|
||||
<sources>
|
||||
@@ -53,10 +59,13 @@
|
||||
<moduleSet>
|
||||
<includes>
|
||||
<include>
|
||||
org.springframework.batch:spring-batch-core
|
||||
org.springframework.batch:org.springframework.batch.test
|
||||
</include>
|
||||
<include>
|
||||
org.springframework.batch:spring-batch-infrastructure
|
||||
org.springframework.batch:org.springframework.batch.core
|
||||
</include>
|
||||
<include>
|
||||
org.springframework.batch:org.springframework.batch.infrastructure
|
||||
</include>
|
||||
</includes>
|
||||
<sources>
|
||||
@@ -76,10 +85,13 @@
|
||||
<moduleSet>
|
||||
<includes>
|
||||
<include>
|
||||
org.springframework.batch:spring-batch-core
|
||||
org.springframework.batch:org.springframework.batch.test
|
||||
</include>
|
||||
<include>
|
||||
org.springframework.batch:spring-batch-infrastructure
|
||||
org.springframework.batch:org.springframework.batch.core
|
||||
</include>
|
||||
<include>
|
||||
org.springframework.batch:org.springframework.batch.infrastructure
|
||||
</include>
|
||||
</includes>
|
||||
<binaries>
|
||||
@@ -89,24 +101,27 @@
|
||||
<dependencySets>
|
||||
<dependencySet>
|
||||
<outputFileNameMapping>
|
||||
lib/${module.groupId}/${module.version}/${module.artifactId}-${module.version}.${module.extension}
|
||||
lib/${module.artifactId}-${module.version}.${module.extension}
|
||||
</outputFileNameMapping>
|
||||
<scope>runtime</scope>
|
||||
<excludes>
|
||||
<exclude>
|
||||
org.springframework.batch:spring-batch
|
||||
org.springframework.batch:org.springframework.batch
|
||||
</exclude>
|
||||
<exclude>
|
||||
org.springframework.batch:spring-batch-core
|
||||
org.springframework.batch:org.springframework.batch.test
|
||||
</exclude>
|
||||
<exclude>
|
||||
org.springframework.batch:spring-batch-infrastructure
|
||||
org.springframework.batch:org.springframework.batch.core
|
||||
</exclude>
|
||||
<exclude>
|
||||
org.springframework.batch:org.springframework.batch.infrastructure
|
||||
</exclude>
|
||||
</excludes>
|
||||
</dependencySet>
|
||||
<dependencySet>
|
||||
<outputFileNameMapping>
|
||||
lib/${module.groupId}/${module.version}/${module.artifactId}-${module.version}.${module.extension}
|
||||
lib/${module.artifactId}-${module.version}.${module.extension}
|
||||
</outputFileNameMapping>
|
||||
<scope>provided</scope>
|
||||
</dependencySet>
|
||||
@@ -116,7 +131,7 @@
|
||||
<moduleSet>
|
||||
<includes>
|
||||
<include>
|
||||
org.springframework.batch:spring-batch-samples
|
||||
org.springframework.batch:org.springframework.batch.samples
|
||||
</include>
|
||||
</includes>
|
||||
<binaries>
|
||||
@@ -126,52 +141,61 @@
|
||||
<dependencySets>
|
||||
<dependencySet>
|
||||
<outputFileNameMapping>
|
||||
lib/${module.groupId}/${module.version}/${module.artifactId}-${module.version}.${module.extension}
|
||||
lib/${module.artifactId}-${module.version}.${module.extension}
|
||||
</outputFileNameMapping>
|
||||
<scope>runtime</scope>
|
||||
<excludes>
|
||||
<exclude>
|
||||
org.springframework.batch:spring-batch
|
||||
org.springframework.batch:org.springframework.batch
|
||||
</exclude>
|
||||
<exclude>
|
||||
org.springframework.batch:spring-batch-core
|
||||
org.springframework.batch:org.springframework.batch.test
|
||||
</exclude>
|
||||
<exclude>
|
||||
org.springframework.batch:spring-batch-infrastructure
|
||||
org.springframework.batch:org.springframework.batch.core
|
||||
</exclude>
|
||||
<exclude>
|
||||
org.springframework.batch:org.springframework.batch.infrastructure
|
||||
</exclude>
|
||||
</excludes>
|
||||
</dependencySet>
|
||||
<dependencySet>
|
||||
<outputFileNameMapping>
|
||||
lib/${module.groupId}/${module.version}/${module.artifactId}-${module.version}.${module.extension}
|
||||
lib/${module.artifactId}-${module.version}.${module.extension}
|
||||
</outputFileNameMapping>
|
||||
<scope>provided</scope>
|
||||
<excludes>
|
||||
<exclude>
|
||||
org.springframework.batch:spring-batch
|
||||
org.springframework.batch:org.springframework.batch
|
||||
</exclude>
|
||||
<exclude>
|
||||
org.springframework.batch:spring-batch-core
|
||||
org.springframework.batch:org.springframework.batch.test
|
||||
</exclude>
|
||||
<exclude>
|
||||
org.springframework.batch:spring-batch-infrastructure
|
||||
org.springframework.batch:org.springframework.batch.core
|
||||
</exclude>
|
||||
<exclude>
|
||||
org.springframework.batch:org.springframework.batch.infrastructure
|
||||
</exclude>
|
||||
</excludes>
|
||||
</dependencySet>
|
||||
<dependencySet>
|
||||
<outputFileNameMapping>
|
||||
lib/${module.groupId}/${module.version}/${module.artifactId}-${module.version}.${module.extension}
|
||||
lib/${module.artifactId}-${module.version}.${module.extension}
|
||||
</outputFileNameMapping>
|
||||
<scope>test</scope>
|
||||
<excludes>
|
||||
<exclude>
|
||||
org.springframework.batch:spring-batch
|
||||
org.springframework.batch:org.springframework.batch
|
||||
</exclude>
|
||||
<exclude>
|
||||
org.springframework.batch:spring-batch-core
|
||||
org.springframework.batch:org.springframework.batch.test
|
||||
</exclude>
|
||||
<exclude>
|
||||
org.springframework.batch:spring-batch-infrastructure
|
||||
org.springframework.batch:org.springframework.batch.core
|
||||
</exclude>
|
||||
<exclude>
|
||||
org.springframework.batch:org.springframework.batch.infrastructure
|
||||
</exclude>
|
||||
</excludes>
|
||||
</dependencySet>
|
||||
|
||||
35
dist/src/it/settings.xml
vendored
Normal file
35
dist/src/it/settings.xml
vendored
Normal file
@@ -0,0 +1,35 @@
|
||||
<?xml version="1.0"?>
|
||||
<settings>
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>it-repo</id>
|
||||
<activation>
|
||||
<activeByDefault>true</activeByDefault>
|
||||
</activation>
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>local.central</id>
|
||||
<url>@localRepositoryUrl@</url>
|
||||
<releases>
|
||||
<enabled>true</enabled>
|
||||
</releases>
|
||||
<snapshots>
|
||||
<enabled>true</enabled>
|
||||
</snapshots>
|
||||
</repository>
|
||||
</repositories>
|
||||
<pluginRepositories>
|
||||
<pluginRepository>
|
||||
<id>local.central</id>
|
||||
<url>@localRepositoryUrl@</url>
|
||||
<releases>
|
||||
<enabled>true</enabled>
|
||||
</releases>
|
||||
<snapshots>
|
||||
<enabled>true</enabled>
|
||||
</snapshots>
|
||||
</pluginRepository>
|
||||
</pluginRepositories>
|
||||
</profile>
|
||||
</profiles>
|
||||
</settings>
|
||||
Reference in New Issue
Block a user