diff options
| author | Michael Keppler <Michael.Keppler@gmx.de> | 2023-12-23 20:31:11 +0100 |
|---|---|---|
| committer | Michael Keppler <Michael.Keppler@gmx.de> | 2023-12-23 20:31:11 +0100 |
| commit | 331fa023e43b82297cfdd77ea5ec4be995cb4a61 (patch) | |
| tree | d129ad7d4d2812c25746619001762f1ff153e03a | |
| parent | b1cc74b75b771279d81de15833da514c71513648 (diff) | |
| download | jgit-331fa023e43b82297cfdd77ea5ec4be995cb4a61.tar.gz jgit-331fa023e43b82297cfdd77ea5ec4be995cb4a61.zip | |
Remove invalid/unnecessary Maven settings
* Remove jgit.target POM and remove it from the module list. This was
only necessary when the target file had to be referenced as an artifact.
Meanwhile we reference it directly by its path, and can remove the Maven
build around it.
* Remove tycho configuration options that are no longer valid (resolved
was removed very early, probably before 1.0; includePackedArtifacts was
removed in 3.0). Also remove duplicate version specification.
Change-Id: Ifa69065dd73bf586b8359541375e065f5f60aa03
3 files changed, 0 insertions, 42 deletions
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF deleted file mode 100644 index 43b29e5e70..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF +++ /dev/null @@ -1,5 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: JGit Target Platform Bundle -Bundle-SymbolicName: org.eclipse.jgit.target -Bundle-Version: 6.9.0.qualifier diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml deleted file mode 100644 index e3599e8dbb..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright (C) 2013, Matthias Sohn <matthias.sohn@sap.com> and others - - This program and the accompanying materials are made available under the - terms of the Eclipse Distribution License v. 1.0 which is available at - http://www.eclipse.org/org/documents/edl-v10.php. - - SPDX-License-Identifier: BSD-3-Clause ---> -<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>6.9.0-SNAPSHOT</version> - </parent> - - <artifactId>org.eclipse.jgit.target</artifactId> - <packaging>pom</packaging> - <name>JGit Target Platform</name> -</project>
\ No newline at end of file diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 76cbc70d96..9422775fce 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -43,7 +43,6 @@ </pluginRepositories> <modules> - <module>org.eclipse.jgit.target</module> <module>org.eclipse.jgit.feature</module> <module>org.eclipse.jgit.gpg.bc.feature</module> <module>org.eclipse.jgit.http.apache.feature</module> @@ -201,10 +200,6 @@ <plugin> <groupId>org.eclipse.tycho</groupId> <artifactId>target-platform-configuration</artifactId> - <version>${tycho-version}</version> - <configuration> - <resolver>p2</resolver> - </configuration> </plugin> <plugin> <groupId>org.cyclonedx</groupId> @@ -304,7 +299,6 @@ <artifactId>target-platform-configuration</artifactId> <version>${tycho-version}</version> <configuration> - <resolver>p2</resolver> <pomDependencies>consider</pomDependencies> <target> <file>${project.basedir}/../org.eclipse.jgit.target/${target-platform}.target</file> @@ -434,9 +428,6 @@ <plugin> <groupId>org.eclipse.tycho</groupId> <artifactId>target-platform-configuration</artifactId> - <configuration> - <includePackedArtifacts>true</includePackedArtifacts> - </configuration> </plugin> <plugin> <groupId>org.eclipse.cbi.maven.plugins</groupId> @@ -477,9 +468,6 @@ <plugin> <groupId>org.eclipse.tycho</groupId> <artifactId>target-platform-configuration</artifactId> - <configuration> - <includePackedArtifacts>true</includePackedArtifacts> - </configuration> </plugin> <plugin> <groupId>org.eclipse.tycho</groupId> |