Skip to content

Commit

Permalink
Upgrade to 2022-12 platform release
Browse files Browse the repository at this point in the history
  • Loading branch information
Christoph Läubrich committed Dec 7, 2022
1 parent 92b350f commit 873028c
Show file tree
Hide file tree
Showing 10 changed files with 31 additions and 47 deletions.
16 changes: 8 additions & 8 deletions p2-maven-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,17 +59,17 @@
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.equinox.p2.repository</artifactId>
<version>2.6.200</version>
<version>2.6.300</version>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi.compatibility.state</artifactId>
<version>1.2.700</version>
<version>1.2.800</version>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.equinox.p2.publisher.eclipse</artifactId>
<version>1.4.100</version>
<version>1.4.200</version>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
Expand Down Expand Up @@ -147,7 +147,7 @@
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.equinox.p2.garbagecollector</artifactId>
<version>1.2.0</version>
<version>1.2.100</version>
</dependency>
<!-- Equinox -->
<dependency>
Expand All @@ -158,7 +158,7 @@
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.equinox.simpleconfigurator</artifactId>
<version>1.4.100</version>
<version>1.4.200</version>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
Expand All @@ -173,7 +173,7 @@
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.equinox.simpleconfigurator.manipulator</artifactId>
<version>2.2.0</version>
<version>2.2.100</version>
</dependency>
<!-- ECF -->
<dependency>
Expand Down Expand Up @@ -206,13 +206,13 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
<version>2.2.2</version>
<version>2.2.4</version>
</dependency>
<!-- OSGi API -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.component</artifactId>
<version>1.5.0</version>
<version>1.5.1-RC1</version>
</dependency>
<!-- others -->
<dependency>
Expand Down
26 changes: 5 additions & 21 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId>
<version>0.3.5</version>
<version>0.9.0.M1</version>
<!-- classes from plexus-container-default come with the maven installation -->
<!-- BUT groupId/artifactId was changed from
plexus-container-default (maven 2.0.x)
Expand All @@ -166,7 +166,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
<version>4.5.0</version>
<version>4.6.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
Expand Down Expand Up @@ -225,7 +225,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>4.8.0</version>
<version>4.9.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -243,7 +243,7 @@
<dependency>
<groupId>org.apache.bcel</groupId>
<artifactId>bcel</artifactId>
<version>6.5.0</version>
<version>6.7.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
Expand All @@ -269,30 +269,14 @@
<dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.bndlib</artifactId>
<version>6.3.1</version>
<version>6.4.0</version>
<exclusions>
<exclusion>
<groupId>org.osgi</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- pin depenedency for now -->
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
<version>(,1.71]</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpg-jdk18on</artifactId>
<version>(,1.71]</version>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.equinox.p2.core</artifactId>
<version>(,2.6.200]</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
2 changes: 1 addition & 1 deletion sisu-osgi/sisu-osgi-connect/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.component</artifactId>
<version>1.5.0</version>
<version>1.5.1-RC1</version>
</dependency>
<dependency>
<groupId>org.eclipse.sisu</groupId>
Expand Down
8 changes: 4 additions & 4 deletions tycho-apitools-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<dependency>
<groupId>org.eclipse.pde</groupId>
<artifactId>org.eclipse.pde.api.tools</artifactId>
<version>1.2.900</version>
<version>1.2.1100</version>
<type>eclipse-plugin</type>
<exclusions>
<exclusion>
Expand All @@ -39,7 +39,7 @@
<dependency>
<groupId>org.eclipse.pde</groupId>
<artifactId>org.eclipse.pde.core</artifactId>
<version>3.15.200</version>
<version>3.16.0</version>
<type>eclipse-plugin</type>
<exclusions>
<exclusion>
Expand All @@ -51,12 +51,12 @@
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.equinox.common</artifactId>
<version>3.16.200</version>
<version>3.17.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.core</artifactId>
<version>3.31.0</version>
<version>3.32.0</version>
</dependency>
</dependencies>
<build>
Expand Down
6 changes: 3 additions & 3 deletions tycho-build/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,20 +90,20 @@
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.equinox.p2.repository</artifactId>
<version>2.6.200</version>
<version>2.6.300</version>
</dependency>

<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi.compatibility.state</artifactId>
<version>1.2.700</version>
<version>1.2.800</version>
</dependency>


<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.equinox.p2.publisher.eclipse</artifactId>
<version>1.4.100</version>
<version>1.4.200</version>
</dependency>


Expand Down
10 changes: 5 additions & 5 deletions tycho-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.core.runtime</artifactId>
<version>3.26.0</version>
<version>3.26.100</version>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
Expand All @@ -279,22 +279,22 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.util.promise</artifactId>
<version>1.2.0</version>
<version>1.3.0-RC1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>2.0.2</version>
<version>2.0.5</version>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.equinox.p2.director.app</artifactId>
<version>1.2.200</version>
<version>1.2.300</version>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.equinox.p2.repository.tools</artifactId>
<version>2.3.100</version>
<version>2.3.200</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
Expand Down
4 changes: 2 additions & 2 deletions tycho-gpg-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.equinox.p2.artifact.repository</artifactId>
<version>1.4.500</version>
<version>1.4.600</version>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.equinox.p2.repository</artifactId>
<version>2.6.200</version>
<version>2.6.300</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion ...ository-plugin/src/main/java/org/eclipse/tycho/plugins/p2/repository/MavenP2SiteMojo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
}
arguments.add("-publicKeys");
arguments.add(publicKeysFile.getAbsolutePath());
} catch (IOException | PGPException e) {
} catch (Exception e) {
throw new MojoExecutionException("failed to generate public-key section", e);
}
}
Expand Down
2 changes: 1 addition & 1 deletion tycho-packaging-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<dependency>
<groupId>com.konghq</groupId>
<artifactId>unirest-java</artifactId>
<version>3.13.11</version>
<version>4.0.0-RC2</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion tycho-surefire/tycho-surefire-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
<dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.bndlib</artifactId>
<version>6.3.1</version>
<version>6.4.0</version>
<type>jar</type>
</dependency>

Expand Down

0 comments on commit 873028c

Please sign in to comment.