Skip to content

Commit

Permalink
Merge pull request #30 from eclipse/552650/to_0.7.0_M2
Browse files Browse the repository at this point in the history
Bug 552650 - Include Eclipse Passage 0.7.0 M2 for SimRel 2019-12 M2
  • Loading branch information
ruspl-afed authored Nov 4, 2019
2 parents 516de73 + fe372f5 commit a4f7d18
Show file tree
Hide file tree
Showing 25 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion bundles/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.eclipse.passage</groupId>
<artifactId>org.eclipse.passage.parent</artifactId>
<version>0.6.0-SNAPSHOT</version>
<version>0.7.0-SNAPSHOT</version>
<relativePath>../releng/org.eclipse.passage.parent</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<feature
id="org.eclipse.passage.lbc.execute.feature"
label="%featureName"
version="0.6.0.qualifier"
version="0.7.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<feature
id="org.eclipse.passage.lbc.target.feature"
label="%featureName"
version="0.6.0.qualifier"
version="0.7.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.passage.ldc.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<feature
id="org.eclipse.passage.ldc.feature"
label="%featureName"
version="0.6.0.qualifier"
version="0.7.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.passage.ldc"
license-feature="org.eclipse.license"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<feature
id="org.eclipse.passage.lic.compile.feature"
label="%featureName"
version="0.6.0.qualifier"
version="0.7.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<feature
id="org.eclipse.passage.lic.define.feature"
label="%featureName"
version="0.6.0.qualifier"
version="0.7.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<feature
id="org.eclipse.passage.lic.execute.feature"
label="%featureName"
version="0.6.0.qualifier"
version="0.7.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
Expand Down
10 changes: 5 additions & 5 deletions features/org.eclipse.passage.loc.operator.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<feature
id="org.eclipse.passage.loc.operator.feature"
label="%featureName"
version="0.6.0.qualifier"
version="0.7.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
Expand All @@ -31,14 +31,14 @@
%license
</license>

<requires>
<import feature="org.eclipse.passage.lic.define.feature" version="0.0.0" match="equivalent"/>
</requires>

<includes
id="org.eclipse.passage.loc.dashboard.feature"
version="0.0.0"/>

<requires>
<import feature="org.eclipse.passage.lic.define.feature" version="0.0.0" match="equivalent"/>
</requires>

<plugin
id="org.eclipse.passage.loc.operator"
download-size="0"
Expand Down
2 changes: 1 addition & 1 deletion features/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.eclipse.passage</groupId>
<artifactId>org.eclipse.passage.parent</artifactId>
<version>0.6.0-SNAPSHOT</version>
<version>0.7.0-SNAPSHOT</version>
<relativePath>../releng/org.eclipse.passage.parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.eclipse.passage</groupId>
<artifactId>org.eclipse.passage.parent</artifactId>
<version>0.6.0-SNAPSHOT</version>
<version>0.7.0-SNAPSHOT</version>
<relativePath>./releng/org.eclipse.passage.parent</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>

<product name="Passage Licensing Data Server" uid="org.eclipse.passage.lbc.server.product" id="org.eclipse.passage.lbc.server.product" application="org.eclipse.passage.lbc.server.application" version="0.6.0.qualifier" useFeatures="true" includeLaunchers="true">
<product name="Passage Licensing Data Server" uid="org.eclipse.passage.lbc.server.product" id="org.eclipse.passage.lbc.server.product" application="org.eclipse.passage.lbc.server.application" version="0.7.0.qualifier" useFeatures="true" includeLaunchers="true">

<configIni use="default">
</configIni>
Expand Down
2 changes: 1 addition & 1 deletion products/org.eclipse.passage.lbc.server.product/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ xmlns="http://maven.apache.org/POM/4.0.0"
<parent>
<groupId>org.eclipse.passage</groupId>
<artifactId>org.eclipse.passage.parent</artifactId>
<version>0.6.0-SNAPSHOT</version>
<version>0.7.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.passage.parent</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
ArSysOp - initial API and implementation
-->

<product name="Passage Licensing Operator Workbench" uid="org.eclipse.passage.loc.operator.product" id="org.eclipse.passage.loc.operator.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="0.6.0.qualifier" useFeatures="true" includeLaunchers="true">
<product name="Passage Licensing Operator Workbench" uid="org.eclipse.passage.loc.operator.product" id="org.eclipse.passage.loc.operator.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="0.7.0.qualifier" useFeatures="true" includeLaunchers="true">

<aboutInfo>
</aboutInfo>
Expand Down
2 changes: 1 addition & 1 deletion products/org.eclipse.passage.loc.operator.product/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.eclipse.passage</groupId>
<artifactId>org.eclipse.passage.parent</artifactId>
<version>0.6.0-SNAPSHOT</version>
<version>0.7.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.passage.parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion releng/org.eclipse.passage.lbc.aggregator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.eclipse.passage</groupId>
<artifactId>org.eclipse.passage.parent</artifactId>
<version>0.6.0-SNAPSHOT</version>
<version>0.7.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.passage.parent</relativePath>
</parent>
<modules>
Expand Down
2 changes: 1 addition & 1 deletion releng/org.eclipse.passage.lbc.repository/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.eclipse.passage</groupId>
<artifactId>org.eclipse.passage.parent</artifactId>
<version>0.6.0-SNAPSHOT</version>
<version>0.7.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.passage.parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion releng/org.eclipse.passage.ldc.aggregator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.eclipse.passage</groupId>
<artifactId>org.eclipse.passage.parent</artifactId>
<version>0.6.0-SNAPSHOT</version>
<version>0.7.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.passage.parent</relativePath>
</parent>
<modules>
Expand Down
2 changes: 1 addition & 1 deletion releng/org.eclipse.passage.ldc.repository/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.eclipse.passage</groupId>
<artifactId>org.eclipse.passage.parent</artifactId>
<version>0.6.0-SNAPSHOT</version>
<version>0.7.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.passage.parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion releng/org.eclipse.passage.lic.aggregator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.eclipse.passage</groupId>
<artifactId>org.eclipse.passage.parent</artifactId>
<version>0.6.0-SNAPSHOT</version>
<version>0.7.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.passage.parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion releng/org.eclipse.passage.lic.repository/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.eclipse.passage</groupId>
<artifactId>org.eclipse.passage.parent</artifactId>
<version>0.6.0-SNAPSHOT</version>
<version>0.7.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.passage.parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion releng/org.eclipse.passage.loc.aggregator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.eclipse.passage</groupId>
<artifactId>org.eclipse.passage.parent</artifactId>
<version>0.6.0-SNAPSHOT</version>
<version>0.7.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.passage.parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion releng/org.eclipse.passage.loc.repository/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.eclipse.passage</groupId>
<artifactId>org.eclipse.passage.parent</artifactId>
<version>0.6.0-SNAPSHOT</version>
<version>0.7.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.passage.parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion releng/org.eclipse.passage.parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<groupId>org.eclipse.passage</groupId>
<artifactId>org.eclipse.passage.parent</artifactId>
<version>0.6.0-SNAPSHOT</version>
<version>0.7.0-SNAPSHOT</version>
<packaging>pom</packaging>

<prerequisites>
Expand Down
2 changes: 1 addition & 1 deletion releng/org.eclipse.passage.target/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.eclipse.passage</groupId>
<artifactId>org.eclipse.passage.parent</artifactId>
<version>0.6.0-SNAPSHOT</version>
<version>0.7.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.passage.parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.eclipse.passage</groupId>
<artifactId>org.eclipse.passage.parent</artifactId>
<version>0.6.0-SNAPSHOT</version>
<version>0.7.0-SNAPSHOT</version>
<relativePath>../releng/org.eclipse.passage.parent</relativePath>
</parent>

Expand Down

0 comments on commit a4f7d18

Please sign in to comment.