Browse Source

Merge branch 'stable-5.6' into stable-5.7

* stable-5.6:
  Remove unused imports
  Silence API warnings
  Remove erraneously merged source features

Change-Id: Iad4da36d82e8a4dad965c0de52910a4ce4e2d2da
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
tags/v5.10.0.202012021225-rc1
Matthias Sohn 3 years ago
parent
commit
0248c58b48

+ 0
- 31
org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/feature.xml View File

@@ -1,31 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.jgit.pgm.source"
label="%featureName"
version="5.3.9.qualifier"
provider-name="%providerName">

<description url="http://www.eclipse.org/jgit/">
%description
</description>

<copyright>
%copyright
</copyright>

<license url="%licenseURL">
%license
</license>

<url>
<update label="%updateSiteName" url="http://download.eclipse.org/egit/updates"/>
<discovery label="%updateSiteName" url="http://download.eclipse.org/egit/updates"/>
</url>

<plugin
id="org.eclipse.jgit.pgm.source"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>

+ 0
- 62
org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.source.feature/pom.xml View File

@@ -1,62 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (C) 2012, 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
under the terms of the Eclipse Distribution License v1.0 which
accompanies this distribution, is reproduced below, and is
available at http://www.eclipse.org/org/documents/edl-v10.php

All rights reserved.

Redistribution and use in source and binary forms, with or
without modification, are permitted provided that the following
conditions are met:

- Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.

- Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials provided
with the distribution.

- Neither the name of the Eclipse Foundation, Inc. nor the
names of its contributors may be used to endorse or promote
products derived from this software without specific prior
written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-->

<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>

<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
<version>5.3.9-SNAPSHOT</version>
</parent>

<groupId>org.eclipse.jgit.feature</groupId>
<artifactId>org.eclipse.jgit.pgm.source</artifactId>
<packaging>eclipse-feature</packaging>

<name>JGit Command Line Interface Source Feature</name>

</project>

+ 0
- 31
org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.source.feature/feature.xml View File

@@ -1,31 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.jgit.ssh.apache.source"
label="%featureName"
version="5.3.9.qualifier"
provider-name="%providerName">

<description url="http://www.eclipse.org/jgit/">
%description
</description>

<copyright>
%copyright
</copyright>

<license url="%licenseURL">
%license
</license>

<url>
<update label="%updateSiteName" url="http://download.eclipse.org/egit/updates"/>
<discovery label="%updateSiteName" url="http://download.eclipse.org/egit/updates"/>
</url>

<plugin
id="org.eclipse.jgit.ssh.apache.source"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>

+ 0
- 62
org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.source.feature/pom.xml View File

@@ -1,62 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (C) 2018 Thomas Wolf <thomas.wolf@paranor.ch>
and other copyright owners as documented in the project's IP log.

This program and the accompanying materials are made available
under the terms of the Eclipse Distribution License v1.0 which
accompanies this distribution, is reproduced below, and is
available at http://www.eclipse.org/org/documents/edl-v10.php

All rights reserved.

Redistribution and use in source and binary forms, with or
without modification, are permitted provided that the following
conditions are met:

- Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.

- Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials provided
with the distribution.

- Neither the name of the Eclipse Foundation, Inc. nor the
names of its contributors may be used to endorse or promote
products derived from this software without specific prior
written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-->

<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>

<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
<version>5.3.9-SNAPSHOT</version>
</parent>

<groupId>org.eclipse.jgit.feature</groupId>
<artifactId>org.eclipse.jgit.ssh.apache.source</artifactId>
<packaging>eclipse-feature</packaging>

<name>JGit Apache MINA ssh Source Feature</name>

</project>

Loading…
Cancel
Save