Skip to content

Commit

Permalink
Bumped version to 1.8
Browse files Browse the repository at this point in the history
  • Loading branch information
creckord committed Jul 25, 2019
1 parent d3f7612 commit 536d0c7
Show file tree
Hide file tree
Showing 25 changed files with 47 additions and 47 deletions.
2 changes: 1 addition & 1 deletion org.eclipse.epp.mpc-parent/bundle/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.epp.mpc</groupId>
<artifactId>org.eclipse.epp.mpc-parent</artifactId>
<version>1.7.7-SNAPSHOT</version>
<version>1.8.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.epp.mpc-parent/feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.epp.mpc</groupId>
<artifactId>org.eclipse.epp.mpc-parent</artifactId>
<version>1.7.7-SNAPSHOT</version>
<version>1.8.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
34 changes: 17 additions & 17 deletions org.eclipse.epp.mpc-parent/pom.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<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>

Expand All @@ -9,16 +11,14 @@

<groupId>org.eclipse.epp.mpc</groupId>
<artifactId>org.eclipse.epp.mpc-parent</artifactId>
<version>1.7.7-SNAPSHOT</version>
<version>1.8.0-SNAPSHOT</version>
<packaging>pom</packaging>

<properties>
<mpc-version>${project.version}</mpc-version>
<target-platform>staging</target-platform>
<java-version>1.8</java-version>
<java-bree>JavaSE-${java-version}</java-bree>
<!-- We need at least 1.8.0 to run the build, even though we're still building with 1.5 source level.
Otherwise some plugin downloads won't work and the test runtime can't start -->
<enforced.java.version>[1.8.0,)</enforced.java.version>
<java-jdk>SYSTEM</java-jdk>

Expand All @@ -29,10 +29,10 @@

<skip-source-check>true</skip-source-check>
<skip-sign>true</skip-sign>
<!-- FIXME skip-pack is currently not supported, because
1) tycho-pack200b-plugin:pack doesn't support it and doing it with profiles is a mess
2) pack has moved to the release profile so it won't happen in regular dev/ci builds anyway -->

<!-- FIXME skip-pack is currently not supported, because
1) tycho-pack200b-plugin:pack doesn't support it and doing it with profiles is a mess
2) pack has moved to the release profile so it won't happen in regular dev/ci builds anyway -->
<skip-pack>true</skip-pack>

<tycho.scmUrl>scm:git:https://git.eclipse.org/r/mpc/org.eclipse.epp.mpc</tycho.scmUrl>
Expand Down Expand Up @@ -174,8 +174,8 @@
<version>${tycho-version}</version>
<configuration>
<encoding>UTF-8</encoding>
<useJDK>${java-jdk}</useJDK>
<strictCompilerTarget>true</strictCompilerTarget>
<useJDK>${java-jdk}</useJDK>
<strictCompilerTarget>true</strictCompilerTarget>
</configuration>
</plugin>

Expand All @@ -190,11 +190,11 @@
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireJavaVersion>
<version>${enforced.java.version}</version>
</requireJavaVersion>
</rules>
<rules>
<requireJavaVersion>
<version>${enforced.java.version}</version>
</requireJavaVersion>
</rules>
</configuration>
</execution>
</executions>
Expand Down Expand Up @@ -370,7 +370,7 @@
</plugins>
</pluginManagement>
</build>

<pluginRepositories>
<pluginRepository>
<id>eclipse-maven-releases</id>
Expand All @@ -391,7 +391,7 @@
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
</pluginRepository>
</pluginRepositories>

</project>
2 changes: 1 addition & 1 deletion org.eclipse.epp.mpc-target/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.epp.mpc</groupId>
<artifactId>org.eclipse.epp.mpc-parent</artifactId>
<version>1.7.7-SNAPSHOT</version>
<version>1.8.0-SNAPSHOT</version>
<relativePath>../org.eclipse.epp.mpc-parent</relativePath>
</parent>
<artifactId>org.eclipse.epp.mpc-target</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.epp.mpc-target/staging.target
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<unit id="org.hamcrest.library" version="0.0.0"/>
<unit id="org.junit" version="0.0.0"/>
<unit id="org.mockito" version="0.0.0"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20190602212107/repository"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20190709113129/repository"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.epp.mpc.apache.httpclient.feature.feature.group" version="0.0.0"/>
Expand Down
4 changes: 2 additions & 2 deletions org.eclipse.epp.mpc.core.win32/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.epp.mpc.core.win32;singleton:=true
Bundle-Version: 1.7.7.qualifier
Bundle-Version: 1.8.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Expand All @@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.osgi;bundle-version="3.6.0",
org.eclipse.equinox.util;bundle-version="1.0.500",
com.sun.jna;bundle-version="4.1.0",
com.sun.jna.platform;bundle-version="4.1.0"
Import-Package: org.eclipse.epp.internal.mpc.core.transport.httpclient;bundle-version="1.7.7",
Import-Package: org.eclipse.epp.internal.mpc.core.transport.httpclient;bundle-version="1.8.0",
com.sun.jna;version="4.1.0",
com.sun.jna.platform.win32;version="4.1.0",
org.apache.http.auth;version="4.3.6",
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.epp.mpc.core.win32/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.epp.mpc</groupId>
<artifactId>org.eclipse.epp.mpc-bundle</artifactId>
<version>1.7.7-SNAPSHOT</version>
<version>1.8.0-SNAPSHOT</version>
<relativePath>../org.eclipse.epp.mpc-parent/bundle</relativePath>
</parent>
<artifactId>org.eclipse.epp.mpc.core.win32</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.epp.mpc.core/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.epp.mpc.core;singleton:=true
Bundle-Version: 1.7.7.qualifier
Bundle-Version: 1.8.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.osgi;bundle-version="3.6.0",
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.epp.mpc.core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.epp.mpc</groupId>
<artifactId>org.eclipse.epp.mpc-bundle</artifactId>
<version>1.7.7-SNAPSHOT</version>
<version>1.8.0-SNAPSHOT</version>
<relativePath>../org.eclipse.epp.mpc-parent/bundle</relativePath>
</parent>
<artifactId>org.eclipse.epp.mpc.core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.epp.mpc.dependencies.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.epp.mpc.dependencies"
label="%featureName"
version="1.7.7.qualifier"
version="1.8.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="2.0.1">
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.epp.mpc.dependencies.feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.epp.mpc</groupId>
<artifactId>org.eclipse.epp.mpc-feature</artifactId>
<version>1.7.7-SNAPSHOT</version>
<version>1.8.0-SNAPSHOT</version>
<relativePath>../org.eclipse.epp.mpc-parent/feature</relativePath>
</parent>
<artifactId>org.eclipse.epp.mpc.dependencies</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.epp.mpc.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.epp.mpc"
label="%featureName"
version="1.7.7.qualifier"
version="1.8.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.epp.mpc.ui"
license-feature="org.eclipse.license"
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.epp.mpc.feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.epp.mpc</groupId>
<artifactId>org.eclipse.epp.mpc-feature</artifactId>
<version>1.7.7-SNAPSHOT</version>
<version>1.8.0-SNAPSHOT</version>
<relativePath>../org.eclipse.epp.mpc-parent/feature</relativePath>
</parent>
<artifactId>org.eclipse.epp.mpc</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.epp.mpc.help.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.epp.mpc.help.ui;singleton:=true
Bundle-Version: 1.7.7.qualifier
Bundle-Version: 1.8.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.help;bundle-version="3.5.0"
2 changes: 1 addition & 1 deletion org.eclipse.epp.mpc.help.ui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.eclipse.epp.mpc</groupId>
<artifactId>org.eclipse.epp.mpc-bundle</artifactId>
<version>1.7.7-SNAPSHOT</version>
<version>1.8.0-SNAPSHOT</version>
<relativePath>../org.eclipse.epp.mpc-parent/bundle</relativePath>
</parent>
<artifactId>org.eclipse.epp.mpc.help.ui</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.epp.mpc.site/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<groupId>org.eclipse.epp.mpc</groupId>
<artifactId>org.eclipse.epp.mpc-parent</artifactId>
<version>1.7.7-SNAPSHOT</version>
<version>1.8.0-SNAPSHOT</version>
<relativePath>../org.eclipse.epp.mpc-parent</relativePath>
</parent>
<artifactId>org.eclipse.epp.mpc.site</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions org.eclipse.epp.mpc.tests.catalog/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Marketplace Client Test Catalog
Bundle-SymbolicName: org.eclipse.epp.mpc.tests.catalog;singleton:=true
Bundle-Version: 1.7.7.qualifier
Bundle-Version: 1.8.0.qualifier
Bundle-Vendor: Eclipse Marketplace Client
Require-Bundle: org.eclipse.epp.mpc.ui;bundle-version="1.7.7"
Require-Bundle: org.eclipse.epp.mpc.ui;bundle-version="1.8.0"
2 changes: 1 addition & 1 deletion org.eclipse.epp.mpc.tests.catalog/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.eclipse.epp.mpc</groupId>
<artifactId>org.eclipse.epp.mpc-bundle</artifactId>
<version>1.7.7-SNAPSHOT</version>
<version>1.8.0-SNAPSHOT</version>
<relativePath>../org.eclipse.epp.mpc-parent/bundle</relativePath>
</parent>
<artifactId>org.eclipse.epp.mpc.tests.catalog</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions org.eclipse.epp.mpc.tests/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Marketplace Client Tests
Bundle-SymbolicName: org.eclipse.epp.mpc.tests
Bundle-Version: 1.7.7.qualifier
Bundle-Version: 1.8.0.qualifier
Bundle-Vendor: Eclipse Marketplace Client
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.osgi;bundle-version="3.6.0",
org.eclipse.core.runtime;bundle-version="3.6.0",
org.eclipse.epp.mpc.core;bundle-version="1.7.7",
org.eclipse.epp.mpc.ui;bundle-version="1.7.7",
org.eclipse.epp.mpc.core;bundle-version="[1.8.0,2.0.0)",
org.eclipse.epp.mpc.ui;bundle-version="[1.8.0,2.0.0)",
org.junit;bundle-version="4.7.0",
org.eclipse.equinox.p2.repository;bundle-version="2.0.0",
org.eclipse.equinox.p2.core;bundle-version="2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.epp.mpc.tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.epp.mpc</groupId>
<artifactId>org.eclipse.epp.mpc-bundle</artifactId>
<version>1.7.7-SNAPSHOT</version>
<version>1.8.0-SNAPSHOT</version>
<relativePath>../org.eclipse.epp.mpc-parent/bundle</relativePath>
</parent>
<artifactId>org.eclipse.epp.mpc.tests</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.epp.mpc.ui.css/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.epp.mpc.ui.css;singleton:=true
Bundle-Version: 1.7.7.qualifier
Bundle-Version: 1.8.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.e4.ui.services;bundle-version="[1.3.0,2.0.0)",
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.epp.mpc.ui.css/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.eclipse.epp.mpc</groupId>
<artifactId>org.eclipse.epp.mpc-bundle</artifactId>
<version>1.7.7-SNAPSHOT</version>
<version>1.8.0-SNAPSHOT</version>
<relativePath>../org.eclipse.epp.mpc-parent/bundle</relativePath>
</parent>
<artifactId>org.eclipse.epp.mpc.ui.css</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions org.eclipse.epp.mpc.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.epp.mpc.ui;singleton:=true
Bundle-Version: 1.7.7.qualifier
Bundle-Version: 1.8.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0",
org.eclipse.epp.mpc.core;bundle-version="1.7.7",
org.eclipse.epp.mpc.ui.css;bundle-version="1.7.7",
org.eclipse.epp.mpc.core;bundle-version="[1.8.0,2.0.0)",
org.eclipse.epp.mpc.ui.css;bundle-version="[1.8.0,2.0.0)",
org.eclipse.ui;bundle-version="3.6.0",
org.eclipse.equinox.p2.ui.discovery;bundle-version="[1.0.0,1.2.0)",
org.eclipse.equinox.p2.discovery;bundle-version="[1.0.0,1.2.0)",
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.epp.mpc.ui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.eclipse.epp.mpc</groupId>
<artifactId>org.eclipse.epp.mpc-bundle</artifactId>
<version>1.7.7-SNAPSHOT</version>
<version>1.8.0-SNAPSHOT</version>
<relativePath>../org.eclipse.epp.mpc-parent/bundle</relativePath>
</parent>
<artifactId>org.eclipse.epp.mpc.ui</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<artifactId>org.eclipse.epp.mpc-parent</artifactId>
<groupId>org.eclipse.epp.mpc</groupId>
<version>1.7.7-SNAPSHOT</version>
<version>1.8.0-SNAPSHOT</version>
<relativePath>org.eclipse.epp.mpc-parent</relativePath>
</parent>

Expand Down

0 comments on commit 536d0c7

Please sign in to comment.