Skip to content

Commit

Permalink
Updates to add java9 header, and create new build
Browse files Browse the repository at this point in the history
  • Loading branch information
@scottslewis
scottslewis committed Mar 2, 2018
1 parent 1bcc155 commit 2b87f64
Show file tree
Hide file tree
Showing 15 changed files with 116 additions and 57 deletions.
Binary file modified build/artifacts.jar
View file
Binary file not shown.
Binary file modified build/content.jar
View file
Binary file not shown.
Binary file renamed ...ovider.jms.feature_2.6.0.201712171126.jar → ...ovider.jms.feature_2.7.0.201803011626.jar
View file
Binary file not shown.
Binary file renamed ...s.activemq.broker_5.14.5.201712171126.jar → ...activemq.broker_5.14.100.201803011626.jar
View file
Binary file not shown.
Binary file renamed ...ider.jms.activemq_5.14.5.201712171126.jar → ...er.jms.activemq_5.14.100.201803011626.jar
View file
Binary file not shown.
Binary file renamed ....ecf.provider.jms_1.10.0.201712171126.jar → ...cf.provider.jms_1.10.100.201803011626.jar
View file
Binary file not shown.
23 changes: 12 additions & 11 deletions bundles/org.eclipse.ecf.provider.jms.activemq.broker/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,24 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: ECF ActiveMQ Provider Broker
Bundle-SymbolicName: org.eclipse.ecf.provider.jms.activemq.broker
Bundle-Version: 5.14.5.qualifier
Automatic-Module-Name: org.eclipse.ecf.provider.jms.activemq.broker
Bundle-Version: 5.14.100.qualifier
Bundle-Activator: org.eclipse.ecf.internal.provider.jms.activemq.broker.Activator
Bundle-Vendor: Eclipse.org - ECF
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: javax.jms;version="1.1.0",
org.eclipse.ecf.core;version="3.0.0",
org.eclipse.ecf.core.events,
org.eclipse.ecf.core.identity,
org.eclipse.ecf.core.provider,
org.eclipse.ecf.core.security,
org.eclipse.ecf.provider.jms.identity,
org.eclipse.ecf.remoteservice.provider;version="1.0.0",
org.osgi.framework;version="1.3.0"
org.eclipse.ecf.core;version="[3.0.0,4.0.0)",
org.eclipse.ecf.core.events;version="[3.0.0,4.0.0)",
org.eclipse.ecf.core.identity;version="[3.0.0,4.0.0)",
org.eclipse.ecf.core.provider;version="[3.0.0,4.0.0)",
org.eclipse.ecf.core.security;version="[3.0.0,4.0.0)",
org.eclipse.ecf.provider.jms.identity;version="[1.0.0,2.0.0)",
org.eclipse.ecf.remoteservice.provider;version="[1.0.0,2.0.0)",
org.osgi.framework;version="[1.3.0,2.0.0)"
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.ecf.provider.jms.activemq.broker
Require-Bundle: org.eclipse.equinox.common,
org.eclipse.ecf.provider.jms.activemq;bundle-version="5.8.0"
Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.0.0,4.0.0)",
org.eclipse.ecf.provider.jms.activemq;bundle-version="[5.0.0,6.0.0)"
Bundle-Localization: plugin
Bundle-ClassPath: .,
lib/activemq5.14.5/activemq-all-5.14.5.jar,
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.ecf.provider.jms.activemq.broker/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.eclipse.ecf.provider.jms.activemq.broker</artifactId>
<version>5.14.5-SNAPSHOT</version>
<version>5.14.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
43 changes: 22 additions & 21 deletions bundles/org.eclipse.ecf.provider.jms.activemq/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin.name
Bundle-SymbolicName: org.eclipse.ecf.provider.jms.activemq
Bundle-Version: 5.14.5.qualifier
Automatic-Module-Name: org.eclipse.ecf.provider.jms.activemq
Bundle-Version: 5.14.100.qualifier
Bundle-Activator: org.eclipse.ecf.internal.provider.jms.activemq.Activator
Bundle-Vendor: %plugin.provider
Bundle-Localization: plugin
Require-Bundle: org.eclipse.equinox.common,
org.eclipse.ecf.provider.jms;bundle-version="1.3.0"
Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.0.0,4.0.0)",
org.eclipse.ecf.provider.jms;bundle-version="[1.3.0,2.0.0)"
Eclipse-LazyStart: true
Eclipse-BuddyPolicy: global
Bundle-ClassPath: .,
Expand All @@ -16,24 +17,24 @@ Bundle-ClassPath: .,
lib/activemq5.14.5/slf4j-api-1.7.13.jar,
lib/activemq5.14.5/hawtbuf-1.11.jar
Import-Package: javax.jms;version="1.1.0",
org.eclipse.ecf.core;version="3.0.0",
org.eclipse.ecf.core.identity;version="3.2.0",
org.eclipse.ecf.core.provider,
org.eclipse.ecf.core.security,
org.eclipse.ecf.core.sharedobject,
org.eclipse.ecf.core.util,
org.eclipse.ecf.provider.comm,
org.eclipse.ecf.provider.generic,
org.eclipse.ecf.provider.jms.channel,
org.eclipse.ecf.provider.jms.container,
org.eclipse.ecf.provider.jms.identity,
org.eclipse.ecf.provider.remoteservice.generic,
org.eclipse.ecf.remoteservice,
org.eclipse.ecf.remoteservice.provider;version="1.0.0",
org.eclipse.equinox.concurrent.future;version="1.0.0",
org.osgi.framework,
org.osgi.service.log,
org.osgi.util.tracker
org.eclipse.ecf.core;version="[3.0.0,4.0.0)",
org.eclipse.ecf.core.events;version="[3.0.0,4.0.0)",
org.eclipse.ecf.core.identity;version="[3.0.0,4.0.0)",
org.eclipse.ecf.core.provider;version="[3.0.0,4.0.0)",
org.eclipse.ecf.core.security;version="[3.0.0,4.0.0)",
org.eclipse.ecf.core.sharedobject;version="[2.0.0,3.0.0)",
org.eclipse.ecf.core.sharedobject.util;version="[2.0.0,3.0.0)",
org.eclipse.ecf.core.util;version="[3.0.0,4.0.0)",
org.eclipse.ecf.provider.comm;version="[4.0.0,5.0.0)",
org.eclipse.ecf.provider.generic;version="[4.0.0,5.0.0)",
org.eclipse.ecf.provider.remoteservice.generic;version="[4.0.0,5.0.0)",
org.eclipse.ecf.remoteservice;version="[6.0.0,9.0.0)",
org.eclipse.ecf.remoteservice.events;version="[6.0.0,7.0.0)",
org.eclipse.ecf.remoteservice.provider;version="[1.0.0,2.0.0)",
org.eclipse.equinox.concurrent.future;version="[1.0.0,2.0.0)",
org.osgi.framework;version="[1.3.0,2.0.0)",
org.osgi.service.log;version="[1.3.0,2.0.0)",
org.osgi.util.tracker;version="[1.3.2,2.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Provide-Capability: osgi.remoteserviceadmin.distribution; configs:List<String>="ecf.jms.activemq.tcp.client,ecf.jms.activemq.tcp.manager,ecf.jms.activemq.tcp.manager.lb.svchost,ecf.jms.activemq.tcp.lb.server"; version:Version=1.1
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.ecf.provider.jms.activemq/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.eclipse.ecf.provider.jms.activemq</artifactId>
<version>5.14.5-SNAPSHOT</version>
<version>5.14.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
41 changes: 21 additions & 20 deletions bundles/org.eclipse.ecf.provider.jms/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %plugin.name
Bundle-SymbolicName: org.eclipse.ecf.provider.jms
Bundle-Version: 1.10.0.qualifier
Automatic-Module-Name: org.eclipse.ecf.provider.jms
Bundle-Version: 1.10.100.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.ecf.internal.provider.jms.Activator
Bundle-Vendor: %plugin.provider
Expand All @@ -12,25 +13,25 @@ Export-Package: org.eclipse.ecf.provider.jms.channel;version="1.5.0",
org.eclipse.ecf.provider.jms.container;version="1.5.0",
org.eclipse.ecf.provider.jms.identity;version="1.5.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.eclipse.equinox.common
Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.0.0,4.0.0)"
Import-Package: javax.jms;version="1.1.0",
org.eclipse.core.runtime.jobs,
org.eclipse.ecf.core,
org.eclipse.ecf.core.events,
org.eclipse.ecf.core.identity,
org.eclipse.ecf.core.provider;version="3.1.0",
org.eclipse.ecf.core.security,
org.eclipse.ecf.core.sharedobject,
org.eclipse.ecf.core.sharedobject.util,
org.eclipse.ecf.core.util,
org.eclipse.ecf.provider.comm,
org.eclipse.ecf.provider.generic,
org.eclipse.ecf.provider.remoteservice.generic,
org.eclipse.ecf.remoteservice;version="6.0.0",
org.eclipse.ecf.remoteservice.events;version="6.0.0",
org.eclipse.ecf.remoteservice.provider;version="1.0.0",
org.eclipse.equinox.concurrent.future;version="1.0.0",
org.osgi.framework;version="1.3.0",
org.osgi.service.log;version="1.3.0",
org.osgi.util.tracker;version="1.3.2"
org.eclipse.ecf.core;version="[3.0.0,4.0.0)",
org.eclipse.ecf.core.events;version="[3.0.0,4.0.0)",
org.eclipse.ecf.core.identity;version="[3.0.0,4.0.0)",
org.eclipse.ecf.core.provider;version="[3.0.0,4.0.0)",
org.eclipse.ecf.core.security;version="[3.0.0,4.0.0)",
org.eclipse.ecf.core.sharedobject;version="[2.0.0,3.0.0)",
org.eclipse.ecf.core.sharedobject.util;version="[2.0.0,3.0.0)",
org.eclipse.ecf.core.util;version="[3.0.0,4.0.0)",
org.eclipse.ecf.provider.comm;version="[4.0.0,5.0.0)",
org.eclipse.ecf.provider.generic;version="[4.0.0,5.0.0)",
org.eclipse.ecf.provider.remoteservice.generic;version="[4.0.0,5.0.0)",
org.eclipse.ecf.remoteservice;version="[6.0.0,9.0.0)",
org.eclipse.ecf.remoteservice.events;version="[6.0.0,7.0.0)",
org.eclipse.ecf.remoteservice.provider;version="[1.0.0,2.0.0)",
org.eclipse.equinox.concurrent.future;version="[1.0.0,2.0.0)",
org.osgi.framework;version="[1.3.0,2.0.0)",
org.osgi.service.log;version="[1.3.0,2.0.0)",
org.osgi.util.tracker;version="[1.3.2,2.0.0)"
Bundle-ActivationPolicy: lazy
2 changes: 1 addition & 1 deletion bundles/org.eclipse.ecf.provider.jms/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.eclipse.ecf.provider.jms</artifactId>
<version>1.10.0-SNAPSHOT</version>
<version>1.10.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
2 changes: 1 addition & 1 deletion features/org.eclipse.ecf.provider.jms.feature/feature.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.ecf.provider.jms.feature"
label="Eclipse Communication Framework JMS Provider"
version="2.6.0.qualifier"
version="2.7.0.qualifier"
provider-name="Eclipse.org - ECF">

<description>
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.ecf.provider.jms.feature/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.eclipse.ecf.provider.jms.feature</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.7.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
56 changes: 56 additions & 0 deletions releng/org.eclipse.ecf.provider.jms.target/ecf-oxygen.target
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?><target name="JMS Provider Oxygen Target" sequenceNumber="39">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.edit.ui.feature.group" version="2.13.0.v20170609-0928"/>
<unit id="org.eclipse.emf.edit.ui.source.feature.group" version="2.13.0.v20170609-0928"/>
<unit id="org.eclipse.pde.feature.group" version="3.13.2.v20171130-0510"/>
<unit id="org.eclipse.pde.source.feature.group" version="3.13.2.v20171130-0510"/>
<unit id="org.eclipse.platform.feature.group" version="4.7.2.v20171130-0510"/>
<unit id="org.eclipse.platform.source.feature.group" version="4.7.2.v20171130-0510"/>
<repository location="http://download.eclipse.org/releases/oxygen"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
<repository location="http://download.eclipse.org/cbi/updates/license/1.0.1.v20140414-1359"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.sun.syndication" version="0.9.0.v200803061811"/>
<unit id="javax.servlet" version="3.1.0.v201410161800"/>
<unit id="org.apache.commons.codec" version="1.9.0.v20170208-1614"/>
<unit id="org.apache.commons.logging" version="1.1.1.v201101211721"/>
<unit id="org.apache.hadoop.zookeeper" version="3.3.3.v201105210832"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.2.v20170210-0925"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.6.v20170210-0925"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
<unit id="org.eclipse.ecf.core.feature.feature.group" version="1.4.0.v20170516-2248"/>
<unit id="org.eclipse.ecf.core.feature.group" version="3.13.8.v20170715-2257"/>
<unit id="org.eclipse.ecf.core.feature.source.feature.group" version="1.4.0.v20170516-2248"/>
<unit id="org.eclipse.ecf.core.source.feature.group" version="3.13.8.v20170715-2257"/>
<unit id="org.eclipse.ecf.core.ssl.feature.feature.group" version="1.1.0.v20170110-1317"/>
<unit id="org.eclipse.ecf.core.ssl.feature.source.feature.group" version="1.1.0.v20170110-1317"/>
<unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="3.13.8.v20170715-2257"/>
<unit id="org.eclipse.ecf.filetransfer.feature.source.feature.group" version="3.13.8.v20170715-2257"/>
<unit id="org.eclipse.ecf.filetransfer.httpclient4.feature.feature.group" version="3.13.8.v20170715-2257"/>
<unit id="org.eclipse.ecf.filetransfer.httpclient4.feature.source.feature.group" version="3.13.8.v20170715-2257"/>
<unit id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.feature.group" version="1.1.0.v20170110-1317"/>
<unit id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.source.feature.group" version="1.1.0.v20170110-1317"/>
<unit id="org.eclipse.ecf.filetransfer.ssl.feature.feature.group" version="1.1.0.v20170110-1317"/>
<unit id="org.eclipse.ecf.filetransfer.ssl.feature.source.feature.group" version="1.1.0.v20170110-1317"/>
<unit id="org.eclipse.ecf.remoteservice.sdk.examples.feature.feature.group" version="1.0.0.v20170816-0237"/>
<unit id="org.eclipse.ecf.remoteservice.sdk.examples.feature.source.feature.group" version="1.0.0.v20170816-0237"/>
<unit id="org.eclipse.ecf.remoteservice.sdk.feature.feature.group" version="3.13.8.v20170816-0246"/>
<unit id="org.eclipse.ecf.remoteservice.sdk.feature.source.feature.group" version="3.13.8.v20170816-0246"/>
<unit id="org.jdom" version="1.1.1.v201101151400"/>
<unit id="org.json" version="1.0.0.v201011060100"/>
<unit id="org.objectweb.asm" version="5.0.1.v201404251740"/>
<unit id="org.xbill.dns" version="2.0.8.v201112050911"/>
<repository location="http://download.eclipse.org/rt/ecf/3.13.8/site.p2"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="javax.jms" version="1.1.0.v201205091237"/>
<unit id="javax.jms.source" version="1.1.0.v201205091237"/>
<repository location="http://download.eclipse.org/tools/orbit/R-builds/R20170516192513/repository"/>
</location>
</locations>
</target>

0 comments on commit 2b87f64

Please sign in to comment.