diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2023-05-23 19:25:05 -0400 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | 2023-05-23 19:25:05 -0400 |
| commit | 590f03b7dc203aadb5606f330a79065a2f81f850 (patch) | |
| tree | d70427e952e65c24cd3670eaad590800bc5baf4e /org.eclipse.jgit.packaging | |
| parent | 44461b215ea3e307837c7124300d86ac6abe11cb (diff) | |
| parent | d3d0ec4290393d71d1557b7bd582234ab023e9eb (diff) | |
| download | jgit-590f03b7dc203aadb5606f330a79065a2f81f850.tar.gz jgit-590f03b7dc203aadb5606f330a79065a2f81f850.zip | |
Merge changes Ib0f18147,I2a9308c0,Ica15a5dd
* changes:
Update to Tycho 4.0.0-SNAPSHOT
PGP sign p2 artefacts
Revert 'Use net.i2p.crypto:eddsa directly from Maven Central'
Diffstat (limited to 'org.eclipse.jgit.packaging')
16 files changed, 81 insertions, 146 deletions
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index 2a127bc9b6..058aa695db 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -107,4 +107,37 @@ <version>${project.version}</version> </dependency> </dependencies> + + <profiles> + <profile> + <id>gpg-sign</id> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-gpg-plugin</artifactId> + <executions> + <execution> + <id>pgpsigner</id> + <phase>package</phase> + <goals> + <goal>sign-p2-artifacts</goal> + </goals> + <configuration> + <keyname>E3E144E1</keyname> <!-- JGit public key --> + <skipIfJarsigned>true</skipIfJarsigned> <!-- Sign if not already JAR-signed. --> + <forceSignature> + <bundle>bcpg</bundle> + <bundle>bcpkix</bundle> + <bundle>bcprov</bundle> + <bundle>bcutil</bundle> + </forceSignature> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target index 0d735fe327..64dc0b1c40 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.17" sequenceNumber="1684355033"> +<target name="jgit-4.17" sequenceNumber="1684863563"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> <unit id="com.jcraft.jsch.source" version="0.1.55.v20221112-0806"/> <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/> <unit id="com.jcraft.jzlib.source" version="1.1.3.v20220502-1820"/> + <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20220506-1020"/> + <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20220506-1020"/> <unit id="org.apache.ant" version="1.10.12.v20211102-1452"/> <unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/> <unit id="org.apache.httpcomponents.httpclient" version="4.5.14.v20221207-1049"/> @@ -170,16 +172,6 @@ </dependency> </dependencies> </location> - <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="eddsa"> - <dependencies> - <dependency> - <groupId>net.i2p.crypto</groupId> - <artifactId>eddsa</artifactId> - <version>0.3.0</version> - <type>jar</type> - </dependency> - </dependencies> - </location> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="bytebuddy"> <dependencies> <dependency> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target index 0f8cc197d5..137ea8091c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.18" sequenceNumber="1684355033"> +<target name="jgit-4.18" sequenceNumber="1684863564"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> <unit id="com.jcraft.jsch.source" version="0.1.55.v20221112-0806"/> <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/> <unit id="com.jcraft.jzlib.source" version="1.1.3.v20220502-1820"/> + <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20220506-1020"/> + <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20220506-1020"/> <unit id="org.apache.ant" version="1.10.12.v20211102-1452"/> <unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/> <unit id="org.apache.httpcomponents.httpclient" version="4.5.14.v20221207-1049"/> @@ -170,16 +172,6 @@ </dependency> </dependencies> </location> - <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="eddsa"> - <dependencies> - <dependency> - <groupId>net.i2p.crypto</groupId> - <artifactId>eddsa</artifactId> - <version>0.3.0</version> - <type>jar</type> - </dependency> - </dependencies> - </location> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="bytebuddy"> <dependencies> <dependency> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target index 0bc8f116cb..ce9239b755 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.19-staging" sequenceNumber="1684355033"> +<target name="jgit-4.19-staging" sequenceNumber="1684863566"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> <unit id="com.jcraft.jsch.source" version="0.1.55.v20221112-0806"/> <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/> <unit id="com.jcraft.jzlib.source" version="1.1.3.v20220502-1820"/> + <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20220506-1020"/> + <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20220506-1020"/> <unit id="org.apache.ant" version="1.10.12.v20211102-1452"/> <unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/> <unit id="org.apache.httpcomponents.httpclient" version="4.5.14.v20221207-1049"/> @@ -170,16 +172,6 @@ </dependency> </dependencies> </location> - <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="eddsa"> - <dependencies> - <dependency> - <groupId>net.i2p.crypto</groupId> - <artifactId>eddsa</artifactId> - <version>0.3.0</version> - <type>jar</type> - </dependency> - </dependencies> - </location> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="bytebuddy"> <dependencies> <dependency> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target index a65894ceec..5251b63a2d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.20" sequenceNumber="1684355033"> +<target name="jgit-4.20" sequenceNumber="1684863568"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> <unit id="com.jcraft.jsch.source" version="0.1.55.v20221112-0806"/> <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/> <unit id="com.jcraft.jzlib.source" version="1.1.3.v20220502-1820"/> + <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20220506-1020"/> + <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20220506-1020"/> <unit id="org.apache.ant" version="1.10.12.v20211102-1452"/> <unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/> <unit id="org.apache.httpcomponents.httpclient" version="4.5.14.v20221207-1049"/> @@ -170,16 +172,6 @@ </dependency> </dependencies> </location> - <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="eddsa"> - <dependencies> - <dependency> - <groupId>net.i2p.crypto</groupId> - <artifactId>eddsa</artifactId> - <version>0.3.0</version> - <type>jar</type> - </dependency> - </dependencies> - </location> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="bytebuddy"> <dependencies> <dependency> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target index b66c977bd7..1777f44a64 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.21" sequenceNumber="1684355033"> +<target name="jgit-4.21" sequenceNumber="1684863576"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> <unit id="com.jcraft.jsch.source" version="0.1.55.v20221112-0806"/> <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/> <unit id="com.jcraft.jzlib.source" version="1.1.3.v20220502-1820"/> + <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20220506-1020"/> + <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20220506-1020"/> <unit id="org.apache.ant" version="1.10.12.v20211102-1452"/> <unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/> <unit id="org.apache.httpcomponents.httpclient" version="4.5.14.v20221207-1049"/> @@ -170,16 +172,6 @@ </dependency> </dependencies> </location> - <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="eddsa"> - <dependencies> - <dependency> - <groupId>net.i2p.crypto</groupId> - <artifactId>eddsa</artifactId> - <version>0.3.0</version> - <type>jar</type> - </dependency> - </dependencies> - </location> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="bytebuddy"> <dependencies> <dependency> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target index 6692b4f596..91b6faee2e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.22" sequenceNumber="1684355033"> +<target name="jgit-4.22" sequenceNumber="1684863578"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> <unit id="com.jcraft.jsch.source" version="0.1.55.v20221112-0806"/> <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/> <unit id="com.jcraft.jzlib.source" version="1.1.3.v20220502-1820"/> + <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20220506-1020"/> + <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20220506-1020"/> <unit id="org.apache.ant" version="1.10.12.v20211102-1452"/> <unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/> <unit id="org.apache.httpcomponents.httpclient" version="4.5.14.v20221207-1049"/> @@ -170,16 +172,6 @@ </dependency> </dependencies> </location> - <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="eddsa"> - <dependencies> - <dependency> - <groupId>net.i2p.crypto</groupId> - <artifactId>eddsa</artifactId> - <version>0.3.0</version> - <type>jar</type> - </dependency> - </dependencies> - </location> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="bytebuddy"> <dependencies> <dependency> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target index 5ce07dbba1..fa4806b3be 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.23" sequenceNumber="1684355033"> +<target name="jgit-4.23" sequenceNumber="1684863581"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> <unit id="com.jcraft.jsch.source" version="0.1.55.v20221112-0806"/> <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/> <unit id="com.jcraft.jzlib.source" version="1.1.3.v20220502-1820"/> + <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20220506-1020"/> + <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20220506-1020"/> <unit id="org.apache.ant" version="1.10.12.v20211102-1452"/> <unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/> <unit id="org.apache.httpcomponents.httpclient" version="4.5.14.v20221207-1049"/> @@ -170,16 +172,6 @@ </dependency> </dependencies> </location> - <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="eddsa"> - <dependencies> - <dependency> - <groupId>net.i2p.crypto</groupId> - <artifactId>eddsa</artifactId> - <version>0.3.0</version> - <type>jar</type> - </dependency> - </dependencies> - </location> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="bytebuddy"> <dependencies> <dependency> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target index 09b8fccaa6..76cbdea71e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.24" sequenceNumber="1684355033"> +<target name="jgit-4.24" sequenceNumber="1684863583"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> <unit id="com.jcraft.jsch.source" version="0.1.55.v20221112-0806"/> <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/> <unit id="com.jcraft.jzlib.source" version="1.1.3.v20220502-1820"/> + <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20220506-1020"/> + <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20220506-1020"/> <unit id="org.apache.ant" version="1.10.12.v20211102-1452"/> <unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/> <unit id="org.apache.httpcomponents.httpclient" version="4.5.14.v20221207-1049"/> @@ -170,16 +172,6 @@ </dependency> </dependencies> </location> - <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="eddsa"> - <dependencies> - <dependency> - <groupId>net.i2p.crypto</groupId> - <artifactId>eddsa</artifactId> - <version>0.3.0</version> - <type>jar</type> - </dependency> - </dependencies> - </location> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="bytebuddy"> <dependencies> <dependency> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target index 47f2af56af..1c82c39258 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.25" sequenceNumber="1684355033"> +<target name="jgit-4.25" sequenceNumber="1684863586"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> <unit id="com.jcraft.jsch.source" version="0.1.55.v20221112-0806"/> <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/> <unit id="com.jcraft.jzlib.source" version="1.1.3.v20220502-1820"/> + <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20220506-1020"/> + <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20220506-1020"/> <unit id="org.apache.ant" version="1.10.12.v20211102-1452"/> <unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/> <unit id="org.apache.httpcomponents.httpclient" version="4.5.14.v20221207-1049"/> @@ -170,16 +172,6 @@ </dependency> </dependencies> </location> - <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="eddsa"> - <dependencies> - <dependency> - <groupId>net.i2p.crypto</groupId> - <artifactId>eddsa</artifactId> - <version>0.3.0</version> - <type>jar</type> - </dependency> - </dependencies> - </location> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="bytebuddy"> <dependencies> <dependency> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target index f3e052535c..4b20653cbe 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.26" sequenceNumber="1684355033"> +<target name="jgit-4.26" sequenceNumber="1684863590"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> <unit id="com.jcraft.jsch.source" version="0.1.55.v20221112-0806"/> <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/> <unit id="com.jcraft.jzlib.source" version="1.1.3.v20220502-1820"/> + <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20220506-1020"/> + <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20220506-1020"/> <unit id="org.apache.ant" version="1.10.12.v20211102-1452"/> <unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/> <unit id="org.apache.httpcomponents.httpclient" version="4.5.14.v20221207-1049"/> @@ -170,16 +172,6 @@ </dependency> </dependencies> </location> - <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="eddsa"> - <dependencies> - <dependency> - <groupId>net.i2p.crypto</groupId> - <artifactId>eddsa</artifactId> - <version>0.3.0</version> - <type>jar</type> - </dependency> - </dependencies> - </location> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="bytebuddy"> <dependencies> <dependency> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index 66de83ec80..3749fcda73 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.27" sequenceNumber="1684355033"> +<target name="jgit-4.27" sequenceNumber="1684863593"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> <unit id="com.jcraft.jsch.source" version="0.1.55.v20221112-0806"/> <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/> <unit id="com.jcraft.jzlib.source" version="1.1.3.v20220502-1820"/> + <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20220506-1020"/> + <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20220506-1020"/> <unit id="org.apache.ant" version="1.10.12.v20211102-1452"/> <unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/> <unit id="org.apache.httpcomponents.httpclient" version="4.5.14.v20221207-1049"/> @@ -170,16 +172,6 @@ </dependency> </dependencies> </location> - <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="eddsa"> - <dependencies> - <dependency> - <groupId>net.i2p.crypto</groupId> - <artifactId>eddsa</artifactId> - <version>0.3.0</version> - <type>jar</type> - </dependency> - </dependencies> - </location> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="bytebuddy"> <dependencies> <dependency> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index 150c051a64..62fcd32b5b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="jgit-4.28" sequenceNumber="1684355033"> +<target name="jgit-4.28" sequenceNumber="1684863596"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> <unit id="com.jcraft.jsch.source" version="0.1.55.v20221112-0806"/> <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/> <unit id="com.jcraft.jzlib.source" version="1.1.3.v20220502-1820"/> + <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20220506-1020"/> + <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20220506-1020"/> <unit id="org.apache.ant" version="1.10.12.v20211102-1452"/> <unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/> <unit id="org.apache.httpcomponents.httpclient" version="4.5.14.v20221207-1049"/> @@ -170,16 +172,6 @@ </dependency> </dependencies> </location> - <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="eddsa"> - <dependencies> - <dependency> - <groupId>net.i2p.crypto</groupId> - <artifactId>eddsa</artifactId> - <version>0.3.0</version> - <type>jar</type> - </dependency> - </dependencies> - </location> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="bytebuddy"> <dependencies> <dependency> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd index 05ba2f972f..cbb7d1e104 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd @@ -96,19 +96,6 @@ maven bytebuddy } } -maven eddsa - scope = compile - dependencyDepth = none - missingManifest = error - includeSources -{ - dependency { - groupId = "net.i2p.crypto" - artifactId = "eddsa" - version = "0.3.0" - } -} - maven gson scope = compile dependencyDepth = none diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20230302014618-2023-03.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20230302014618-2023-03.tpd index 3b85df2778..8578b2cdf5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20230302014618-2023-03.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20230302014618-2023-03.tpd @@ -6,6 +6,8 @@ location "https://download.eclipse.org/tools/orbit/downloads/drops/R202303020146 com.jcraft.jsch.source [0.1.55.v20221112-0806,0.1.55.v20221112-0806] com.jcraft.jzlib [1.1.3.v20220502-1820,1.1.3.v20220502-1820] com.jcraft.jzlib.source [1.1.3.v20220502-1820,1.1.3.v20220502-1820] + net.i2p.crypto.eddsa [0.3.0.v20220506-1020,0.3.0.v20220506-1020] + net.i2p.crypto.eddsa.source [0.3.0.v20220506-1020,0.3.0.v20220506-1020] org.apache.ant [1.10.12.v20211102-1452,1.10.12.v20211102-1452] org.apache.ant.source [1.10.12.v20211102-1452,1.10.12.v20211102-1452] org.apache.httpcomponents.httpclient [4.5.14.v20221207-1049,4.5.14.v20221207-1049] diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 8e0af18870..0e1bea7b19 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -23,7 +23,7 @@ <properties> <java.version>11</java.version> - <tycho-version>2.7.5</tycho-version> + <tycho-version>4.0.0-SNAPSHOT</tycho-version> <target-platform>jgit-4.17</target-platform> </properties> @@ -36,6 +36,10 @@ <id>repo.eclipse.org.cbi-snapshots</id> <url>https://repo.eclipse.org/content/repositories/cbi-snapshots/</url> </pluginRepository> + <pluginRepository> + <id>tycho-snapshots</id> + <url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</url> + </pluginRepository> </pluginRepositories> <modules> @@ -287,6 +291,11 @@ <version>${tycho-version}</version> </plugin> <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-gpg-plugin</artifactId> + <version>${tycho-version}</version> + </plugin> + <plugin> <groupId>org.eclipse.cbi.maven.plugins</groupId> <artifactId>eclipse-jarsigner-plugin</artifactId> <version>1.3.5</version> |