diff options
author | Ralf Mollik | 2019-04-25 12:54:41 +0000 |
---|---|---|
committer | Ralf Mollik | 2019-04-25 12:54:41 +0000 |
commit | 66edc47645580ee70faf4062369dede1e93bafa5 (patch) | |
tree | 2b985e652cfe462ddce6a4080d3bc615cb2b71e3 | |
parent | bdc58462363e4a1264d60d560118ca96e46c377e (diff) | |
download | org.eclipse.osbp.softwarefactory-66edc47645580ee70faf4062369dede1e93bafa5.tar.gz org.eclipse.osbp.softwarefactory-66edc47645580ee70faf4062369dede1e93bafa5.tar.xz org.eclipse.osbp.softwarefactory-66edc47645580ee70faf4062369dede1e93bafa5.zip |
adjusted legal info
6 files changed, 31 insertions, 77 deletions
diff --git a/jenkins.build.config.xml b/jenkins.build.config.xml index 3a0e976..1cefef3 100644 --- a/jenkins.build.config.xml +++ b/jenkins.build.config.xml @@ -100,7 +100,6 @@ <jenkins.build.dependency>org.eclipse.osbp.xtext.report</jenkins.build.dependency> <jenkins.build.dependency>org.eclipse.osbp.xtext.signal</jenkins.build.dependency> <jenkins.build.dependency>org.eclipse.osbp.xtext.statemachine</jenkins.build.dependency> - <jenkins.build.dependency>org.eclipse.osbp.xtext.strategy</jenkins.build.dependency> <jenkins.build.dependency>org.eclipse.osbp.xtext.table</jenkins.build.dependency> <jenkins.build.dependency>org.eclipse.osbp.xtext.table.common</jenkins.build.dependency> <jenkins.build.dependency>org.eclipse.osbp.xtext.topology</jenkins.build.dependency> diff --git a/org.eclipse.osbp.softwarefactory.feature/feature.xml b/org.eclipse.osbp.softwarefactory.feature/feature.xml index 89c845e..abb5923 100644 --- a/org.eclipse.osbp.softwarefactory.feature/feature.xml +++ b/org.eclipse.osbp.softwarefactory.feature/feature.xml @@ -4,7 +4,9 @@ id="org.eclipse.osbp.softwarefactory.feature" label="%featureName" version="0.9.0.qualifier" - provider-name="%providerName"> + provider-name="%providerName" + plugin="org.eclipse.osbp.license.full"> + <description> %description @@ -339,10 +341,6 @@ version="0.0.0"/> <includes - id="org.eclipse.osbp.xtext.strategy.feature" - version="0.0.0"/> - - <includes id="org.eclipse.osbp.xtext.table.common.feature" version="0.0.0"/> diff --git a/org.eclipse.osbp.softwarefactory.feature/pom.xml b/org.eclipse.osbp.softwarefactory.feature/pom.xml index 8ebc815..d3211ca 100644 --- a/org.eclipse.osbp.softwarefactory.feature/pom.xml +++ b/org.eclipse.osbp.softwarefactory.feature/pom.xml @@ -511,13 +511,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.eclipse.osbp.xtext.strategy</groupId> - <artifactId>org.eclipse.osbp.xtext.strategy.feature</artifactId> - <version>${project.version}</version> - <type>eclipse-feature</type> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.eclipse.osbp.xtext.table.common</groupId> <artifactId>org.eclipse.osbp.xtext.table.common.feature</artifactId> <version>${project.version}</version> diff --git a/org.eclipse.osbp.softwarefactory.runtime.feature/feature.xml b/org.eclipse.osbp.softwarefactory.runtime.feature/feature.xml index 14c7bfd..203968c 100644 --- a/org.eclipse.osbp.softwarefactory.runtime.feature/feature.xml +++ b/org.eclipse.osbp.softwarefactory.runtime.feature/feature.xml @@ -3,7 +3,9 @@ id="org.eclipse.osbp.softwarefactory.runtime.feature" label="%featureName" version="0.9.0.qualifier" - provider-name="%providerName"> + provider-name="%providerName" + plugin="org.eclipse.osbp.license.full"> + <description> %description @@ -52,12 +54,16 @@ <includes id="org.eclipse.osbp.dependencies.feature.e4tools.runtime" version="0.0.0"/> - + <includes id="org.eclipse.osbp.dependencies.feature.eclipse.core" version="0.0.0"/> <includes + id="org.eclipse.osbp.dependencies.feature.eclipse.ecf" + version="0.0.0"/> + + <includes id="org.eclipse.osbp.dependencies.feature.eclipse.emf" version="0.0.0"/> @@ -230,30 +236,6 @@ version="0.0.0"/> <includes - id="org.eclipse.ecf.core.feature" - version="0.0.0"/> - - <includes - id="org.eclipse.ecf.core.ssl.feature" - version="0.0.0"/> - - <includes - id="org.eclipse.ecf.filetransfer.feature" - version="0.0.0"/> - - <includes - id="org.eclipse.ecf.filetransfer.httpclient4.feature" - version="0.0.0"/> - - <includes - id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature" - version="0.0.0"/> - - <includes - id="org.eclipse.ecf.filetransfer.ssl.feature" - version="0.0.0"/> - - <includes id="org.eclipse.osbp.runtime.functionlibrary.validation.feature" version="0.0.0"/> @@ -1037,13 +1019,6 @@ unpack="false"/> <plugin - id="org.eclipse.osbp.xtext.strategy" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin id="org.eclipse.osbp.xtext.table" download-size="0" install-size="0" diff --git a/org.eclipse.osbp.softwarefactory.runtime.feature/pom.xml b/org.eclipse.osbp.softwarefactory.runtime.feature/pom.xml index 8f6f03f..e088434 100644 --- a/org.eclipse.osbp.softwarefactory.runtime.feature/pom.xml +++ b/org.eclipse.osbp.softwarefactory.runtime.feature/pom.xml @@ -13,7 +13,6 @@ <artifactId>org.eclipse.osbp.softwarefactory.runtime.feature</artifactId> <packaging>eclipse-feature</packaging> - <dependencies> <dependency> <groupId>org.eclipse.osbp.vaaclipse.addons</groupId> @@ -194,73 +193,61 @@ </dependency> <dependency> <groupId>org.eclipse.osbp.dependencies</groupId> - <artifactId>org.eclipse.osbp.dependencies.feature.apache.cxf</artifactId> - <version>${project.version}</version> + <artifactId>org.eclipse.osbp.dependencies.feature.activemq</artifactId> + <version>5.14.5-SNAPSHOT</version> <type>eclipse-feature</type> </dependency> <dependency> <groupId>org.eclipse.osbp.dependencies</groupId> - <artifactId> - org.eclipse.osbp.dependencies.feature.jackson.core - </artifactId> + <artifactId>org.eclipse.osbp.dependencies.feature.apache.cxf</artifactId> <version>${project.version}</version> <type>eclipse-feature</type> </dependency> <dependency> <groupId>org.eclipse.osbp.dependencies</groupId> - <artifactId>org.eclipse.osbp.dependencies.feature.vaadin.external</artifactId> + <artifactId>org.eclipse.osbp.dependencies.feature.jackson.core</artifactId> <version>${project.version}</version> <type>eclipse-feature</type> </dependency> <dependency> <groupId>org.eclipse.osbp.dependencies</groupId> - <artifactId>org.eclipse.osbp.dependencies.feature.vaadin.addons</artifactId> - <version>${project.version}</version> + <artifactId>org.eclipse.osbp.dependencies.feature.quartz</artifactId> + <version>2.2.1-SNAPSHOT</version> <type>eclipse-feature</type> </dependency> <dependency> <groupId>org.eclipse.osbp.dependencies</groupId> - <artifactId>org.eclipse.osbp.dependencies.feature.vaadin</artifactId> - <version>${vaadin.version}-SNAPSHOT</version> + <artifactId>org.eclipse.osbp.dependencies.feature.vaadin.external</artifactId> + <version>${project.version}</version> <type>eclipse-feature</type> </dependency> <dependency> <groupId>org.eclipse.osbp.dependencies</groupId> - <artifactId>org.eclipse.osbp.dependencies.feature.activemq</artifactId> - <version>5.14.5-SNAPSHOT</version> + <artifactId>org.eclipse.osbp.dependencies.feature.vaadin.addons</artifactId> + <version>${project.version}</version> <type>eclipse-feature</type> </dependency> <dependency> <groupId>org.eclipse.osbp.dependencies</groupId> - <artifactId>org.eclipse.osbp.dependencies.feature.quartz</artifactId> - <version>2.2.1-SNAPSHOT</version> + <artifactId>org.eclipse.osbp.dependencies.feature.vaadin</artifactId> + <version>${vaadin.version}-SNAPSHOT</version> <type>eclipse-feature</type> </dependency> <dependency> - <groupId> - org.eclipse.osbp.runtime.functionlibrary.validation - </groupId> - <artifactId> - org.eclipse.osbp.runtime.functionlibrary.validation.feature - </artifactId> + <groupId>org.eclipse.osbp.runtime.functionlibrary.validation</groupId> + <artifactId>org.eclipse.osbp.runtime.functionlibrary.validation.feature</artifactId> <version>${project.version}</version> <type>eclipse-feature</type> </dependency> <dependency> <groupId>org.eclipse.osbp.dependencies</groupId> - <artifactId> - org.eclipse.osbp.dependencies.feature.postgresql - </artifactId> + <artifactId>org.eclipse.osbp.dependencies.feature.postgresql</artifactId> <version>42.2.2-SNAPSHOT</version> <type>eclipse-feature</type> </dependency> <dependency> - <groupId> - org.eclipse.osbp.gemini.dbaccess.postgresql - </groupId> - <artifactId> - org.eclipse.gemini.dbaccess.postgresql.feature - </artifactId> + <groupId>org.eclipse.osbp.gemini.dbaccess.postgresql</groupId> + <artifactId>org.eclipse.gemini.dbaccess.postgresql.feature</artifactId> <version>1.1.0-SNAPSHOT</version> <type>eclipse-feature</type> </dependency> diff --git a/org.eclipse.osbp.softwarefactory.target.feature/feature.xml b/org.eclipse.osbp.softwarefactory.target.feature/feature.xml index 77f8e28..5b8edea 100644 --- a/org.eclipse.osbp.softwarefactory.target.feature/feature.xml +++ b/org.eclipse.osbp.softwarefactory.target.feature/feature.xml @@ -4,7 +4,9 @@ id="org.eclipse.osbp.softwarefactory.target.feature" label="%featureName" version="0.9.0.qualifier" - provider-name="%providerName"> + provider-name="%providerName" + plugin="org.eclipse.osbp.license.full"> + <description> %description |