* stable-3.0: Prepare post 3.0.2-rc2 builds JGit v3.0.2.201309041250-rc2 Uncomment eclipse-jar-signer plugin Update build to use CBI jarsigner plugin Update maven plugins Update to Orbit Kepler SR1 release R20130827064939 Change-Id: Iaa8bba21c300dd1de2b91a77cddf6727fbc66340 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>tags/v3.1.0.201309270735-rc1
@@ -91,6 +91,17 @@ | |||
<testSourceDirectory>src/</testSourceDirectory> | |||
<plugins> | |||
<plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-jar-plugin</artifactId> | |||
<executions> | |||
<execution> | |||
<goals> | |||
<goal>test-jar</goal> | |||
</goals> | |||
</execution> | |||
</executions> | |||
</plugin> | |||
<plugin> | |||
<artifactId>maven-surefire-plugin</artifactId> | |||
<configuration> |
@@ -112,6 +112,17 @@ | |||
</testResource> | |||
</testResources> | |||
<plugins> | |||
<plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-jar-plugin</artifactId> | |||
<executions> | |||
<execution> | |||
<goals> | |||
<goal>test-jar</goal> | |||
</goals> | |||
</execution> | |||
</executions> | |||
</plugin> | |||
<plugin> | |||
<artifactId>maven-surefire-plugin</artifactId> | |||
<configuration> |
@@ -105,10 +105,21 @@ | |||
<plugins> | |||
<plugin> | |||
<artifactId>maven-surefire-plugin</artifactId> | |||
<configuration> | |||
<argLine>-Xmx256m -Dfile.encoding=UTF-8 -Djava.io.tmpdir=${project.build.directory}</argLine> | |||
</configuration> | |||
<groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-jar-plugin</artifactId> | |||
<executions> | |||
<execution> | |||
<goals> | |||
<goal>test-jar</goal> | |||
</goals> | |||
</execution> | |||
</executions> | |||
</plugin> | |||
<plugin> | |||
<artifactId>maven-surefire-plugin</artifactId> | |||
<configuration> | |||
<argLine>-Xmx256m -Dfile.encoding=UTF-8</argLine> | |||
</configuration> | |||
</plugin> | |||
</plugins> | |||
</build> |
@@ -8,7 +8,7 @@ | |||
http://www.eclipse.org/legal/epl-v10.html | |||
--> | |||
<?pde version="3.6"?> | |||
<target name="jgit.target" sequenceNumber="54"> | |||
<target name="jgit.target" sequenceNumber="55"> | |||
<locations> | |||
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit"> | |||
<repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-7.x/7.6.11.v20130520/"/> | |||
@@ -30,39 +30,33 @@ | |||
<unit id="org.eclipse.jetty.util.source" version="7.6.11.v20130520"/> | |||
</location> | |||
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit"> | |||
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20130517111416/repository/"/> | |||
<unit id="org.apache.ant.source" version="1.8.2.v201303080311"/> | |||
<unit id="org.apache.ant" version="1.8.2.v201303080311"/> | |||
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20130827064939/repository/"/> | |||
<unit id="org.apache.ant.source" version="1.8.4.v201303080030"/> | |||
<unit id="org.apache.ant" version="1.8.4.v201303080030"/> | |||
<unit id="org.apache.commons.compress" version="1.4.1.v201301140946"/> | |||
<unit id="org.apache.commons.compress.source" version="1.4.1.v201301140946"/> | |||
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/> | |||
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/> | |||
<unit id="org.kohsuke.args4j" version="2.0.21.v201301150030"/> | |||
<unit id="org.kohsuke.args4j.source" version="2.0.21.v201301150030"/> | |||
<unit id="org.hamcrest.core" version="1.1.0.v20090501071000"/> | |||
<unit id="org.hamcrest.core.source" version="1.1.0.v20090501071000"/> | |||
<unit id="org.hamcrest.generator" version="1.1.0.v20090501071000"/> | |||
<unit id="org.hamcrest.generator.source" version="1.1.0.v20090501071000"/> | |||
<unit id="org.hamcrest.integration" version="1.1.0.v201303031500"/> | |||
<unit id="org.hamcrest.integration.source" version="1.1.0.v201303031500"/> | |||
<unit id="org.hamcrest.library" version="1.1.0.v20090501071000"/> | |||
<unit id="org.hamcrest.library.source" version="1.1.0.v20090501071000"/> | |||
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/> | |||
<unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/> | |||
<unit id="org.hamcrest.text.source" version="1.1.0.v20090501071000"/> | |||
<unit id="javaewah" version="0.5.6.v201210150900"/> | |||
<unit id="org.hamcrest.core" version="1.3.0.v201303031735"/> | |||
<unit id="org.hamcrest.core.source" version="1.3.0.v201303031735"/> | |||
<unit id="javaewah" version="0.5.6.v201307211000"/> | |||
<unit id="javaewah.source" version="0.5.6.v201307211000"/> | |||
<unit id="org.objenesis" version="1.0.0.v201105211943"/> | |||
<unit id="org.objenesis.source" version="1.0.0.v201105211943"/> | |||
<unit id="org.mockito" version="1.8.4.v201303031500"/> | |||
<unit id="org.mockito.source" version="1.8.4.v201303031500"/> | |||
<unit id="com.jcraft.jsch" version="0.1.46.v201205102330"/> | |||
<unit id="com.jcraft.jsch.source" version="0.1.46.v201205102330"/> | |||
<unit id="org.junit" version="4.8.2.v4_8_2_v20130308-0413"/> | |||
<unit id="org.junit.source" version="4.8.2.v4_8_2_v20130308-0413"/> | |||
<unit id="org.junit" version="4.11.0.v201303080030"/> | |||
<unit id="org.junit.source" version="4.11.0.v201303080030"/> | |||
<unit id="com.google.protobuf" version="2.4.0.v201105131100"/> | |||
<unit id="com.google.protobuf.source" version="2.4.0.v201105131100"/> | |||
<unit id="javax.servlet" version="2.5.0.v201103041518"/> | |||
<unit id="javax.servlet.source" version="2.5.0.v201103041518"/> | |||
<unit id="org.tukaani.xz" version="1.3.0.v201308270617"/> | |||
<unit id="org.tukaani.xz.source" version="1.3.0.v201308270617"/> | |||
</location> | |||
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit"> | |||
<repository location="http://download.eclipse.org/releases/juno/"/> |
@@ -1,6 +1,6 @@ | |||
<?xml version="1.0" encoding="UTF-8"?> | |||
<!-- | |||
Copyright (C) 2009-2012, Matthias Sohn <matthias.sohn@sap.com> | |||
Copyright (C) 2009, 2013, Matthias Sohn <matthias.sohn@sap.com> | |||
and other copyright owners as documented in the project's IP log. | |||
This program and the accompanying materials are made available | |||
@@ -60,8 +60,16 @@ | |||
<properties> | |||
<tycho-version>0.18.0</tycho-version> | |||
<tycho-extras-version>0.18.0</tycho-extras-version> | |||
</properties> | |||
<pluginRepositories> | |||
<pluginRepository> | |||
<id>repo.eclipse.org.cbi-releases</id> | |||
<url>https://repo.eclipse.org/content/repositories/cbi-releases/</url> | |||
</pluginRepository> | |||
</pluginRepositories> | |||
<modules> | |||
<module>org.eclipse.jgit.target</module> | |||
<module>org.eclipse.jgit.feature</module> | |||
@@ -181,9 +189,154 @@ | |||
</environments> | |||
</configuration> | |||
</plugin> | |||
<plugin> | |||
<groupId>org.eclipse.tycho</groupId> | |||
<artifactId>tycho-p2-plugin</artifactId> | |||
<version>${tycho-version}</version> | |||
</plugin> | |||
<plugin> | |||
<groupId>org.eclipse.tycho.extras</groupId> | |||
<artifactId>tycho-pack200a-plugin</artifactId> | |||
<version>${tycho-extras-version}</version> | |||
</plugin> | |||
<plugin> | |||
<groupId>org.eclipse.tycho.extras</groupId> | |||
<artifactId>tycho-pack200b-plugin</artifactId> | |||
<version>${tycho-extras-version}</version> | |||
</plugin> | |||
<plugin> | |||
<groupId>org.eclipse.cbi.maven.plugins</groupId> | |||
<artifactId>eclipse-jarsigner-plugin</artifactId> | |||
<version>1.0.4</version> | |||
</plugin> | |||
</plugins> | |||
</pluginManagement> | |||
</build> | |||
<profiles> | |||
<profile> | |||
<id>eclipse-sign</id> | |||
<build> | |||
<plugins> | |||
<plugin> | |||
<groupId>org.eclipse.tycho</groupId> | |||
<artifactId>target-platform-configuration</artifactId> | |||
<configuration> | |||
<includePackedArtifacts>true</includePackedArtifacts> | |||
</configuration> | |||
</plugin> | |||
<plugin> | |||
<groupId>org.eclipse.tycho.extras</groupId> | |||
<artifactId>tycho-pack200a-plugin</artifactId> | |||
<executions> | |||
<execution> | |||
<id>pack200-normalize</id> | |||
<goals> | |||
<goal>normalize</goal> | |||
</goals> | |||
<phase>verify</phase> | |||
</execution> | |||
</executions> | |||
</plugin> | |||
<plugin> | |||
<groupId>org.eclipse.cbi.maven.plugins</groupId> | |||
<artifactId>eclipse-jarsigner-plugin</artifactId> | |||
<executions> | |||
<execution> | |||
<id>sign</id> | |||
<goals> | |||
<goal>sign</goal> | |||
</goals> | |||
<phase>verify</phase> | |||
</execution> | |||
</executions> | |||
</plugin> | |||
<plugin> | |||
<groupId>org.eclipse.tycho.extras</groupId> | |||
<artifactId>tycho-pack200b-plugin</artifactId> | |||
<executions> | |||
<execution> | |||
<id>pack200-pack</id> | |||
<goals> | |||
<goal>pack</goal> | |||
</goals> | |||
<phase>verify</phase> | |||
</execution> | |||
</executions> | |||
</plugin> | |||
<plugin> | |||
<groupId>org.eclipse.tycho</groupId> | |||
<artifactId>tycho-p2-plugin</artifactId> | |||
<executions> | |||
<execution> | |||
<id>p2-metadata</id> | |||
<goals> | |||
<goal>p2-metadata</goal> | |||
</goals> | |||
<phase>verify</phase> | |||
</execution> | |||
</executions> | |||
<configuration> | |||
<defaultP2Metadata>false</defaultP2Metadata> | |||
</configuration> | |||
</plugin> | |||
</plugins> | |||
</build> | |||
</profile> | |||
<profile> | |||
<id>eclipse-pack</id> | |||
<build> | |||
<plugins> | |||
<plugin> | |||
<groupId>org.eclipse.tycho</groupId> | |||
<artifactId>target-platform-configuration</artifactId> | |||
<configuration> | |||
<includePackedArtifacts>true</includePackedArtifacts> | |||
</configuration> | |||
</plugin> | |||
<plugin> | |||
<groupId>org.eclipse.tycho.extras</groupId> | |||
<artifactId>tycho-pack200a-plugin</artifactId> | |||
<executions> | |||
<execution> | |||
<id>pack200-normalize</id> | |||
<goals> | |||
<goal>normalize</goal> | |||
</goals> | |||
</execution> | |||
</executions> | |||
</plugin> | |||
<plugin> | |||
<groupId>org.eclipse.tycho.extras</groupId> | |||
<artifactId>tycho-pack200b-plugin</artifactId> | |||
<executions> | |||
<execution> | |||
<id>pack200-pack</id> | |||
<goals> | |||
<goal>pack</goal> | |||
</goals> | |||
</execution> | |||
</executions> | |||
</plugin> | |||
<plugin> | |||
<groupId>org.eclipse.tycho</groupId> | |||
<artifactId>tycho-p2-plugin</artifactId> | |||
<executions> | |||
<execution> | |||
<id>p2-metadata</id> | |||
<goals> | |||
<goal>p2-metadata</goal> | |||
</goals> | |||
<phase>package</phase> | |||
</execution> | |||
</executions> | |||
<configuration> | |||
<defaultP2Metadata>false</defaultP2Metadata> | |||
</configuration> | |||
</plugin> | |||
</plugins> | |||
</build> | |||
</profile> | |||
</profiles> | |||
</project> | |||
@@ -106,5 +106,24 @@ | |||
<build> | |||
<sourceDirectory>src/</sourceDirectory> | |||
<testSourceDirectory>tst/</testSourceDirectory> | |||
<plugins> | |||
<plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-jar-plugin</artifactId> | |||
<executions> | |||
<execution> | |||
<goals> | |||
<goal>test-jar</goal> | |||
</goals> | |||
</execution> | |||
</executions> | |||
</plugin> | |||
<plugin> | |||
<artifactId>maven-surefire-plugin</artifactId> | |||
<configuration> | |||
<argLine>-Djava.io.tmpdir=${project.build.directory}</argLine> | |||
</configuration> | |||
</plugin> | |||
</plugins> | |||
</build> | |||
</project> |
@@ -133,6 +133,17 @@ | |||
</testResources> | |||
<plugins> | |||
<plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-jar-plugin</artifactId> | |||
<executions> | |||
<execution> | |||
<goals> | |||
<goal>test-jar</goal> | |||
</goals> | |||
</execution> | |||
</executions> | |||
</plugin> | |||
<plugin> | |||
<artifactId>maven-surefire-plugin</artifactId> | |||
<configuration> |
@@ -1,2 +0,0 @@ | |||
jarprocessor.exclude.pack=true | |||
jarprocessor.exclude.children=true |
@@ -178,7 +178,7 @@ | |||
<jgit-last-release-version>3.0.0.201306101825-r</jgit-last-release-version> | |||
<jsch-version>0.1.46</jsch-version> | |||
<javaewah-version>0.5.6</javaewah-version> | |||
<junit-version>4.5</junit-version> | |||
<junit-version>4.11</junit-version> | |||
<!-- TODO: update Maven dependency for args4j to 2.0.21 as soon as available on Maven Central --> | |||
<args4j-version>2.0.12</args4j-version> | |||
<commons-compress-version>1.4.1</commons-compress-version> | |||
@@ -195,6 +195,13 @@ | |||
</repository> | |||
</repositories> | |||
<pluginRepositories> | |||
<pluginRepository> | |||
<id>repo.eclipse.org.cbi-releases</id> | |||
<url>https://repo.eclipse.org/content/repositories/cbi-releases/</url> | |||
</pluginRepository> | |||
</pluginRepositories> | |||
<build> | |||
<pluginManagement> | |||
<plugins> | |||
@@ -212,12 +219,15 @@ | |||
<Implementation-Vendor-URL>${jgit-url}</Implementation-Vendor-URL> | |||
</manifestEntries> | |||
</archive> | |||
<!-- TODO: uncomment this in order to skip empty artifact of test modules as soon as bug 416299 is fixed | |||
<skipIfEmpty>true</skipIfEmpty> | |||
--> | |||
</configuration> | |||
</plugin> | |||
<plugin> | |||
<artifactId>maven-compiler-plugin</artifactId> | |||
<version>2.5.1</version> | |||
<version>3.1</version> | |||
</plugin> | |||
<plugin> | |||
@@ -228,7 +238,7 @@ | |||
<plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-shade-plugin</artifactId> | |||
<version>1.7.1</version> | |||
<version>2.1</version> | |||
</plugin> | |||
<plugin> | |||
@@ -240,31 +250,31 @@ | |||
<plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-dependency-plugin</artifactId> | |||
<version>2.5</version> | |||
<version>2.8</version> | |||
</plugin> | |||
<plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-source-plugin</artifactId> | |||
<version>2.2</version> | |||
<version>2.2.1</version> | |||
</plugin> | |||
<plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-javadoc-plugin</artifactId> | |||
<version>2.8.1</version> | |||
<version>2.9.1</version> | |||
</plugin> | |||
<plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-surefire-plugin</artifactId> | |||
<version>2.12.2</version> | |||
<version>2.16</version> | |||
</plugin> | |||
<plugin> | |||
<groupId>org.codehaus.mojo</groupId> | |||
<artifactId>build-helper-maven-plugin</artifactId> | |||
<version>1.7</version> | |||
<version>1.8</version> | |||
</plugin> | |||
<plugin> | |||
@@ -287,7 +297,7 @@ | |||
<plugin> | |||
<groupId>org.apache.maven.plugins</groupId> | |||
<artifactId>maven-pmd-plugin</artifactId> | |||
<version>2.7.1</version> | |||
<version>3.0.1</version> | |||
<configuration> | |||
<sourceEncoding>utf-8</sourceEncoding> | |||
<minimumTokens>100</minimumTokens> | |||
@@ -313,6 +323,22 @@ | |||
<minSeverity>info</minSeverity> | |||
</configuration> | |||
</plugin> | |||
<plugin> | |||
<groupId>org.eclipse.cbi.maven.plugins</groupId> | |||
<artifactId>eclipse-jarsigner-plugin</artifactId> | |||
<version>1.0.4</version> | |||
</plugin> | |||
<plugin> | |||
<groupId>org.eclipse.tycho.extras</groupId> | |||
<artifactId>tycho-pack200a-plugin</artifactId> | |||
<version>0.18.0</version> | |||
</plugin> | |||
<plugin> | |||
<groupId>org.eclipse.tycho.extras</groupId> | |||
<artifactId>tycho-pack200b-plugin</artifactId> | |||
<version>0.18.0</version> | |||
</plugin> | |||
</plugins> | |||
</pluginManagement> | |||
@@ -501,6 +527,64 @@ | |||
</plugins> | |||
</build> | |||
</profile> | |||
<profile> | |||
<id>eclipse-sign</id> | |||
<build> | |||
<plugins> | |||
<plugin> | |||
<groupId>org.eclipse.tycho.extras</groupId> | |||
<artifactId>tycho-pack200a-plugin</artifactId> | |||
<!-- TODO remove this configuration when https://git.eclipse.org/r/#/c/16027 is available --> | |||
<configuration> | |||
<supportedProjectTypes> | |||
<supportedProjectType>jar</supportedProjectType> | |||
</supportedProjectTypes> | |||
</configuration> | |||
<executions> | |||
<execution> | |||
<id>pack200-normalize</id> | |||
<goals> | |||
<goal>normalize</goal> | |||
</goals> | |||
<phase>verify</phase> | |||
</execution> | |||
</executions> | |||
</plugin> | |||
<plugin> | |||
<groupId>org.eclipse.cbi.maven.plugins</groupId> | |||
<artifactId>eclipse-jarsigner-plugin</artifactId> | |||
<executions> | |||
<execution> | |||
<id>sign</id> | |||
<phase>verify</phase> | |||
<goals> | |||
<goal>sign</goal> | |||
</goals> | |||
</execution> | |||
</executions> | |||
</plugin> | |||
<plugin> | |||
<groupId>org.eclipse.tycho.extras</groupId> | |||
<artifactId>tycho-pack200b-plugin</artifactId> | |||
<!-- TODO remove this configuration when https://git.eclipse.org/r/#/c/16027 is available --> | |||
<configuration> | |||
<supportedProjectTypes> | |||
<supportedProjectType>jar</supportedProjectType> | |||
</supportedProjectTypes> | |||
</configuration> | |||
<executions> | |||
<execution> | |||
<id>pack200-pack</id> | |||
<goals> | |||
<goal>pack</goal> | |||
</goals> | |||
<phase>verify</phase> | |||
</execution> | |||
</executions> | |||
</plugin> | |||
</plugins> | |||
</build> | |||
</profile> | |||
</profiles> | |||
<modules> |