Skip to content

Commit

Permalink
Upversion to 2.7.0 and align with Eclipse 2019-09
Browse files Browse the repository at this point in the history 
   - switch javax.inject from require bundle to import package

Signed-off-by: Ondrej Dockal <odockal@redhat.com>
  • Loading branch information
@odockal @jkopriva
odockal authored and jkopriva committed Jul 11, 2019
1 parent 28c7798 commit d86f5ad
Show file tree
Hide file tree
Showing 114 changed files with 233 additions and 224 deletions.
2 changes: 1 addition & 1 deletion archetype/pom.xml
View file
Expand Up @@ -16,7 +16,7 @@
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.reddeer</groupId>
<version>2.6.0-SNAPSHOT</version>
<version>2.7.0-SNAPSHOT</version>
<artifactId>eclipse-reddeer-archetype</artifactId>
<packaging>maven-archetype</packaging>
<name>RedDeer Archetype</name>
Expand Down
4 changes: 2 additions & 2 deletions archetype/src/main/resources/archetype-resources/pom.xml
View file
Expand Up @@ -2,8 +2,8 @@
#set( $symbol_pound = '#' )
#set( $symbol_dollar = '$' )
#set( $symbol_escape = '\' )
#if ($reddeer_version == "2.6.0" )
#set( $rd_repository = 'http://download.eclipse.org/reddeer/releases/2.6.0/' )
#if ($reddeer_version == "2.7.0" )
#set( $rd_repository = 'http://download.eclipse.org/reddeer/releases/2.7.0/' )
#else
#set ( $rd_repository = 'http://download.eclipse.org/reddeer/snapshots/' )
#end
Expand Down
4 changes: 2 additions & 2 deletions archetype/src/test/resources/projects/eclipse-reddeer-archetype/archetype.properties
View file
Expand Up @@ -2,6 +2,6 @@ package=foo.bar.myplugin.simrel
version=1.0.0-SNAPSHOT
groupId=foo.bar.myplugin
artifactId=reddeer.archetype
tycho_version=1.2.0
eclipse_platform=2018-12
tycho_version=1.4.0
eclipse_platform=2019-06
reddeer_version=master
2 changes: 1 addition & 1 deletion features/org.eclipse.reddeer.codegen.feature/feature.xml
View file
Expand Up @@ -14,7 +14,7 @@
<feature
id="org.eclipse.reddeer.codegen.feature"
label="%featureName"
version="2.6.0.qualifier"
version="2.7.0.qualifier"
provider-name="Eclipse.org - RedDeer">

<description>
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.reddeer.codegen.feature/pom.xml
View file
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.eclipse.reddeer</groupId>
<artifactId>features</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.7.0-SNAPSHOT</version>
</parent>
<build>
<plugins>
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.reddeer.e4.feature/feature.xml
View file
Expand Up @@ -14,7 +14,7 @@
<feature
id="org.eclipse.reddeer.e4.feature"
label="%featureName"
version="2.6.0.qualifier"
version="2.7.0.qualifier"
provider-name="Eclipse.org - RedDeer">

<description url="https://github.com/jboss-reddeer/reddeer/wiki">
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.reddeer.e4.feature/pom.xml
View file
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.eclipse.reddeer</groupId>
<artifactId>features</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.7.0-SNAPSHOT</version>
</parent>
<build>
<plugins>
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.reddeer.eclipse.feature/feature.xml
View file
Expand Up @@ -14,7 +14,7 @@
<feature
id="org.eclipse.reddeer.eclipse.feature"
label="%featureName"
version="2.6.0.qualifier"
version="2.7.0.qualifier"
provider-name="Eclipse.org - RedDeer">

<description url="https://github.com/jboss-reddeer/reddeer/wiki">
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.reddeer.eclipse.feature/pom.xml
View file
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.eclipse.reddeer</groupId>
<artifactId>features</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.7.0-SNAPSHOT</version>
</parent>
<build>
<plugins>
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.reddeer.gef.spy.feature/feature.xml
View file
Expand Up @@ -14,7 +14,7 @@
<feature
id="org.eclipse.reddeer.gef.spy.feature"
label="%featureName"
version="2.6.0.qualifier"
version="2.7.0.qualifier"
provider-name="Eclipse.org - RedDeer">

<description url="https://github.com/jboss-reddeer/reddeer/wiki">
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.reddeer.gef.spy.feature/pom.xml
View file
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.eclipse.reddeer</groupId>
<artifactId>features</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.7.0-SNAPSHOT</version>
</parent>
<build>
<plugins>
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.reddeer.graphiti.feature/feature.xml
View file
Expand Up @@ -14,7 +14,7 @@
<feature
id="org.eclipse.reddeer.graphiti.feature"
label="%featureName"
version="2.6.0.qualifier"
version="2.7.0.qualifier"
provider-name="Eclipse.org - RedDeer">

<description url="https://github.com/jboss-reddeer/reddeer/wiki">
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.reddeer.graphiti.feature/pom.xml
View file
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.eclipse.reddeer</groupId>
<artifactId>features</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.7.0-SNAPSHOT</version>
</parent>
<build>
<plugins>
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.reddeer.logparser.feature/feature.xml
View file
Expand Up @@ -14,7 +14,7 @@
<feature
id="org.eclipse.reddeer.logparser.feature"
label="%featureName"
version="2.6.0.qualifier"
version="2.7.0.qualifier"
provider-name="Eclipse.org - RedDeer">

<description url="https://github.com/jboss-reddeer/reddeer/wiki">
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.reddeer.logparser.feature/pom.xml
View file
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.eclipse.reddeer</groupId>
<artifactId>features</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.7.0-SNAPSHOT</version>
</parent>

<build>
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.reddeer.recorder.feature/feature.xml
View file
Expand Up @@ -14,7 +14,7 @@
<feature
id="org.eclipse.reddeer.recorder.feature"
label="%featureName"
version="2.6.0.qualifier"
version="2.7.0.qualifier"
provider-name="Eclipse.org - RedDeer">

<description url="https://github.com/jboss-reddeer/reddeer/wiki">
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.reddeer.recorder.feature/pom.xml
View file
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.eclipse.reddeer</groupId>
<artifactId>features</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.7.0-SNAPSHOT</version>
</parent>
<build>
<plugins>
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.reddeer.selenium.feature/feature.xml
View file
Expand Up @@ -14,7 +14,7 @@
<feature
id="org.eclipse.reddeer.selenium.feature"
label="%featureName"
version="2.6.0.qualifier"
version="2.7.0.qualifier"
provider-name="Eclipse.org - RedDeer">

<description url="https://github.com/jboss-reddeer/reddeer/wiki">
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.reddeer.selenium.feature/pom.xml
View file
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.eclipse.reddeer</groupId>
<artifactId>features</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.7.0-SNAPSHOT</version>
</parent>

<build>
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.reddeer.spy.feature/feature.xml
View file
Expand Up @@ -14,7 +14,7 @@
<feature
id="org.eclipse.reddeer.spy.feature"
label="%featureName"
version="2.6.0.qualifier"
version="2.7.0.qualifier"
provider-name="Eclipse.org - RedDeer">

<description url="https://github.com/jboss-reddeer/reddeer/wiki">
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.reddeer.spy.feature/pom.xml
View file
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.eclipse.reddeer</groupId>
<artifactId>features</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.7.0-SNAPSHOT</version>
</parent>

<build>
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.reddeer.swt.feature/feature.xml
View file
Expand Up @@ -14,7 +14,7 @@
<feature
id="org.eclipse.reddeer.swt.feature"
label="%featureName"
version="2.6.0.qualifier"
version="2.7.0.qualifier"
provider-name="Eclipse.org - RedDeer">

<description url="https://github.com/jboss-reddeer/reddeer/wiki">
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.reddeer.swt.feature/pom.xml
View file
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.eclipse.reddeer</groupId>
<artifactId>features</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.7.0-SNAPSHOT</version>
</parent>
<build>
<plugins>
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.reddeer.tests.feature/feature.xml
View file
Expand Up @@ -14,7 +14,7 @@
<feature
id="org.eclipse.reddeer.tests.feature"
label="%featureName"
version="2.6.0.qualifier"
version="2.7.0.qualifier"
provider-name="Eclipse.org - RedDeer">

<description url="https://github.com/jboss-reddeer/reddeer/wiki">
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.reddeer.tests.feature/pom.xml
View file
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.eclipse.reddeer</groupId>
<artifactId>features</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.7.0-SNAPSHOT</version>
</parent>
<build>
<plugins>
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.reddeer.ui.feature/feature.xml
View file
Expand Up @@ -14,7 +14,7 @@
<feature
id="org.eclipse.reddeer.ui.feature"
label="%featureName"
version="2.6.0.qualifier"
version="2.7.0.qualifier"
provider-name="Eclipse.org - RedDeer">

<description url="https://github.com/jboss-reddeer/reddeer/wiki">
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.reddeer.ui.feature/pom.xml
View file
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.eclipse.reddeer</groupId>
<artifactId>features</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.7.0-SNAPSHOT</version>
</parent>
<build>
<plugins>
Expand Down
2 changes: 1 addition & 1 deletion features/pom.xml
View file
Expand Up @@ -16,7 +16,7 @@
<parent>
<groupId>org.eclipse.reddeer</groupId>
<artifactId>parent</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.7.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.reddeer</groupId>
<artifactId>features</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion jacoco-report/pom.xml
View file
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.eclipse.reddeer</groupId>
<artifactId>parent</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.7.0-SNAPSHOT</version>
</parent>

<!-- Used by JaCoCo to generate an aggregated report -->
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.eclipse.reddeer.codegen/META-INF/MANIFEST.MF
View file
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: RedDeer CodeGen
Bundle-SymbolicName: org.eclipse.reddeer.codegen;singleton:=true
Bundle-Version: 2.6.0.qualifier
Bundle-Version: 2.7.0.qualifier
Bundle-Activator: org.eclipse.reddeer.codegen.Activator
Bundle-Vendor: Eclipse.org - RedDeer
Require-Bundle: org.eclipse.ui.ide,
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.eclipse.reddeer.codegen/pom.xml
View file
Expand Up @@ -16,7 +16,7 @@
<parent>
<groupId>org.eclipse.reddeer</groupId>
<artifactId>plugins</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.7.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.eclipse.reddeer.codegen</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.eclipse.reddeer.common/META-INF/MANIFEST.MF
View file
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: RedDeer Common
Bundle-Vendor: Eclipse.org - RedDeer
Bundle-SymbolicName: org.eclipse.reddeer.common
Bundle-Version: 2.6.0.qualifier
Bundle-Version: 2.7.0.qualifier
Require-Bundle: org.eclipse.swt,
org.hamcrest.core;bundle-version="1.3.0"
Bundle-ActivationPolicy: lazy
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.eclipse.reddeer.common/pom.xml
View file
Expand Up @@ -20,6 +20,6 @@
<parent>
<groupId>org.eclipse.reddeer</groupId>
<artifactId>plugins</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.7.0-SNAPSHOT</version>
</parent>
</project>
8 changes: 4 additions & 4 deletions plugins/org.eclipse.reddeer.core/META-INF/MANIFEST.MF
View file
Expand Up @@ -3,12 +3,12 @@ Bundle-ManifestVersion: 2
Bundle-Name: RedDeer Core
Bundle-Vendor: Eclipse.org - RedDeer
Bundle-SymbolicName: org.eclipse.reddeer.core
Bundle-Version: 2.6.0.qualifier
Require-Bundle: org.eclipse.reddeer.common;bundle-version="[2.2.0,2.6.1)",
Bundle-Version: 2.7.0.qualifier
Require-Bundle: org.eclipse.reddeer.common;bundle-version="[2.2.0,2.7.1)",
org.eclipse.swt,
org.hamcrest.core;bundle-version="1.3.0",
org.eclipse.reddeer.workbench.core;bundle-version="[2.2.0,2.6.1)";resolution:=optional,
org.eclipse.reddeer.e4.workbench.core;bundle-version="[2.2.0,2.6.1)";resolution:=optional
org.eclipse.reddeer.workbench.core;bundle-version="[2.2.0,2.7.1)";resolution:=optional,
org.eclipse.reddeer.e4.workbench.core;bundle-version="[2.2.0,2.7.1)";resolution:=optional
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.eclipse.reddeer.core.condition,
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.eclipse.reddeer.core/pom.xml
View file
Expand Up @@ -20,6 +20,6 @@
<parent>
<groupId>org.eclipse.reddeer</groupId>
<artifactId>plugins</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.7.0-SNAPSHOT</version>
</parent>
</project>
4 changes: 2 additions & 2 deletions plugins/org.eclipse.reddeer.direct/META-INF/MANIFEST.MF
View file
Expand Up @@ -3,11 +3,11 @@ Bundle-ManifestVersion: 2
Bundle-Name: RedDeer Direct
Bundle-Vendor: Eclipse.org - RedDeer
Bundle-SymbolicName: org.eclipse.reddeer.direct
Bundle-Version: 2.6.0.qualifier
Bundle-Version: 2.7.0.qualifier
Bundle-Activator: org.eclipse.reddeer.direct.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.reddeer.common;bundle-version="[2.2.0,2.6.1)",
org.eclipse.reddeer.common;bundle-version="[2.2.0,2.7.1)",
org.eclipse.core.resources;bundle-version="3.9.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.eclipse.reddeer.direct/pom.xml
View file
Expand Up @@ -20,6 +20,6 @@
<parent>
<groupId>org.eclipse.reddeer</groupId>
<artifactId>plugins</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.7.0-SNAPSHOT</version>
</parent>
</project>
4 changes: 2 additions & 2 deletions plugins/org.eclipse.reddeer.e4.workbench.core/META-INF/MANIFEST.MF
View file
Expand Up @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-Name: RedDeer E4 Workbench Core
Bundle-Vendor: Eclipse.org - RedDeer
Bundle-SymbolicName: org.eclipse.reddeer.e4.workbench.core
Bundle-Version: 2.6.0.qualifier
Require-Bundle: org.eclipse.reddeer.common;bundle-version="[2.2.0,2.6.1)",
Bundle-Version: 2.7.0.qualifier
Require-Bundle: org.eclipse.reddeer.common;bundle-version="[2.2.0,2.7.1)",
org.eclipse.swt,
org.eclipse.e4.ui.workbench,
org.eclipse.e4.ui.model.workbench,
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.eclipse.reddeer.e4.workbench.core/pom.xml
View file
Expand Up @@ -20,6 +20,6 @@
<parent>
<groupId>org.eclipse.reddeer</groupId>
<artifactId>plugins</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.7.0-SNAPSHOT</version>
</parent>
</project>
12 changes: 6 additions & 6 deletions plugins/org.eclipse.reddeer.e4.workbench/META-INF/MANIFEST.MF
View file
Expand Up @@ -3,18 +3,18 @@ Bundle-ManifestVersion: 2
Bundle-Name: RedDeer E4 Workbench
Bundle-Vendor: Eclipse.org - RedDeer
Bundle-SymbolicName: org.eclipse.reddeer.e4.workbench
Bundle-Version: 2.6.0.qualifier
Require-Bundle: org.eclipse.reddeer.common;bundle-version="[2.2.0,2.6.1)",
Bundle-Version: 2.7.0.qualifier
Require-Bundle: org.eclipse.reddeer.common;bundle-version="[2.2.0,2.7.1)",
org.eclipse.swt,
org.eclipse.e4.ui.workbench,
org.eclipse.e4.ui.model.workbench,
org.eclipse.e4.core.contexts,
org.eclipse.core.runtime,
org.hamcrest.core,
org.eclipse.reddeer.swt;bundle-version="[2.2.0,2.6.1)",
org.eclipse.reddeer.jface;bundle-version="[2.2.0,2.6.1)",
org.eclipse.reddeer.core;bundle-version="[2.2.0,2.6.1)",
org.eclipse.reddeer.e4.workbench.core;bundle-version="[2.2.0,2.6.1)"
org.eclipse.reddeer.swt;bundle-version="[2.2.0,2.7.1)",
org.eclipse.reddeer.jface;bundle-version="[2.2.0,2.7.1)",
org.eclipse.reddeer.core;bundle-version="[2.2.0,2.7.1)",
org.eclipse.reddeer.e4.workbench.core;bundle-version="[2.2.0,2.7.1)"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.eclipse.reddeer.workbench.exception,
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.eclipse.reddeer.e4.workbench/pom.xml
View file
Expand Up @@ -20,6 +20,6 @@
<parent>
<groupId>org.eclipse.reddeer</groupId>
<artifactId>plugins</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.7.0-SNAPSHOT</version>
</parent>
</project>

0 comments on commit d86f5ad

Please sign in to comment.