Skip to content

External osgi bundles upgrade #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gudipatiharitha wants to merge 36 commits into
base: external-osgi-bundles_2.0
Choose a base branch
from
Open

External osgi bundles upgrade #5

Show file tree
Hide file tree
Changes from 32 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
ba2131e
Upgrade java version
atishbeehyv123 Jul 31, 2018
f882f0a
Updated maven-bundle-plugin version
pdheerajgoud Jul 31, 2018
ddfdd2a
Created Spring JCL, Spring Integration core and Spring integration JM…
atishbeehyv123 Aug 1, 2018
120dd88
Updated spring integration core and jms to version 4.1.12 and retry t…
atishbeehyv123 Aug 6, 2018
a8067c4
Changed versioning format of bundles
atishbeehyv123 Aug 6, 2018
427899f
changed openid version
pdheerajgoud Aug 8, 2018
b41dbf7
Added open-id to list of modules in parent pom
gudipatiharitha Aug 9, 2018
0e7e943
Added Dependencies
atishbeehyv123 Aug 16, 2018
b61a119
Gson and reflections
gudipatiharitha Aug 16, 2018
dc3c9e9
Jackson upgrade
gudipatiharitha Aug 17, 2018
bfdd7e9
lambdaj, aether and time - internal versions didnt change
gudipatiharitha Aug 17, 2018
3aa267c
Added Bundle for openId4java
atishbeehyv123 Aug 22, 2018
28f4bfb
Created activemq bundle.
atishbeehyv123 Aug 22, 2018
2bcfed7
Created a spring web osgi bundle.
atishbeehyv123 Aug 27, 2018
24de429
Made couple of dependancies optional in activemq
gudipatiharitha Aug 30, 2018
8db9128
spring-security-core and gemini-blueprint-extender bundles
gudipatiharitha Aug 30, 2018
10d152b
Changed Export-Package to just have extender
gudipatiharitha Aug 31, 2018
21d7363
embedded gemini-core and io to fix pit in config-core
gudipatiharitha Aug 31, 2018
5e8fc86
added as dependencies gemini-core and io to fix pit in config-core
gudipatiharitha Sep 2, 2018
605dd7c
Removed servlet related export packages from spring-web.
atishbeehyv123 Sep 3, 2018
e5e0ace
Inlined activemq broker and client, Inlined gemini's bluprint core, i…
atishbeehyv123 Sep 7, 2018
d3d3232
Added version for servlet import in spring web.
atishbeehyv123 Sep 12, 2018
bdb3a8f
Removed core nad io in Embed-dependancies and added original Export a…
gudipatiharitha Sep 23, 2018
8669756
Import Package Error
gudipatiharitha Sep 25, 2018
7b275f8
Made all activemq dependencies inline, exposed javax.jms from activemq.
atishbeehyv123 Sep 25, 2018
3d3560f
Merge branch 'external-osgi-bundles_upgrade' of https://github.com/mo…
atishbeehyv123 Sep 25, 2018
2877df6
Import required packages
gudipatiharitha Sep 25, 2018
a793e53
Import required packages
gudipatiharitha Sep 25, 2018
3c69fbc
Merge remote-tracking branch 'origin/external-osgi-bundles_upgrade' i…
gudipatiharitha Sep 25, 2018
3a60497
Fixed version for guava Import Package.
atishbeehyv123 Sep 25, 2018
97fa256
Added org.eclipse.gemini.blueprint.blueprint.container to export list
pdheerajgoud Oct 3, 2018
01fe5d5
added org.w3c.dom, in Import Packages
atishbeehyv123 Oct 4, 2018
22165d2
Changed Export-Package to just have extender
gudipatiharitha Oct 10, 2018
50864a2
Fix for Multiple guice dependency
atishbeehyv123 Oct 12, 2018
89cc850
add mvnrepository to pom.xml
gudipatiharitha Jan 30, 2019
7b98bd4
add mvnrepository to pom.xml ( added central earlier now added anothe…
gudipatiharitha Jan 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
251 changes: 163 additions & 88 deletions activemq/pom.xml
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions aether-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version>
<version>2.6</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
Expand Down Expand Up @@ -207,7 +207,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>2.3.4</version>
<version>3.5.1</version>
<extensions>true</extensions>
<configuration>
<instructions>
Expand Down
2 changes: 1 addition & 1 deletion c3p0-fragment-bundle/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>2.3.4</version>
<version>3.5.1</version>
<extensions>true</extensions>
<configuration>
<instructions>
Expand Down
2 changes: 1 addition & 1 deletion commons-configuration/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>2.3.4</version>
<version>3.5.1</version>
<extensions>true</extensions>
<configuration>
<instructions>
Expand Down
2 changes: 1 addition & 1 deletion ektorp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>2.3.4</version>
<version>3.5.1</version>
<extensions>true</extensions>
<configuration>
<instructions>
Expand Down
201 changes: 201 additions & 0 deletions gemini-blueprint-extender/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,201 @@
<?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"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<groupId>org.eclipse.gemini.blueprint</groupId>
<artifactId>org.motechproject.gemini-blueprint-extender</artifactId>
<version>${gemini.blueprint.extender.version}-${release.tag}</version>
<packaging>bundle</packaging>
<name>Gemini Blueprint Extender</name>
<description>
This is created same as gemini-blueprint-extender with just wring import
blueprint.blueprint removed
</description>


<parent>
<artifactId>external-osgi-bundles</artifactId>
<groupId>org.motechproject</groupId>
<version>1.0.14</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<properties>
<modules.root.dir>${basedir}/..</modules.root.dir>
<gemini.blueprint.extender.version>2.1.0.RELEASE</gemini.blueprint.extender.version>
</properties>


<dependencies>
<dependency>
<groupId>org.eclipse.gemini.blueprint</groupId>
<artifactId>gemini-blueprint-extender</artifactId>
<version>${gemini.blueprint.extender.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.spring-beans</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.spring-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.spring-context</artifactId>
</exclusion>
<exclusion>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.gemini.blueprint</groupId>
<artifactId>gemini-blueprint-core</artifactId>
<version>${gemini.blueprint.extender.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.spring-beans</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.spring-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.spring-context</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.spring-aop</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.spring-expression</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.gemini.blueprint</groupId>
<artifactId>gemini-blueprint-io</artifactId>
<version>${gemini.blueprint.extender.version}</version>
</dependency>
</dependencies>

<build>
<plugins>

<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>unpack-sources</id>
<goals>
<goal>unpack</goal>
</goals>
<phase>package</phase>
<configuration>
<outputDirectory>${project.build.directory}/sources</outputDirectory>
<artifactItems>
<artifactItem>
<groupId>org.eclipse.gemini.blueprint</groupId>
<artifactId>gemini-blueprint-extender</artifactId>
<version>${gemini.blueprint.extender.version}</version>
<classifier>sources</classifier>
</artifactItem>
<artifactItem>
<groupId>org.eclipse.gemini.blueprint</groupId>
<artifactId>gemini-blueprint-core</artifactId>
<version>${gemini.blueprint.extender.version}</version>
<classifier>sources</classifier>
</artifactItem>
<artifactItem>
<groupId>org.eclipse.gemini.blueprint</groupId>
<artifactId>gemini-blueprint-io</artifactId>
<version>${gemini.blueprint.extender.version}</version>
<classifier>sources</classifier>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<artifactId>maven-assembly-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>3.5.1</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-Activator>org.eclipse.gemini.blueprint.extender.internal.boot.ChainActivator</Bundle-Activator>
<Import-Package>org.osgi.service.blueprint.container;version="1.0.0";r
esolution:=optional,org.osgi.framework;version="1.3",org.osgi.service
.event;version="1.1";resolution:=optional,org.osgi.util.tracker;versi
on="1.3",org.apache.commons.logging;version="[1.0,2.0)",org.eclipse.gemini.blueprint;versi
on="[2.1.0.RELEASE,2.1.0.RELEASE]",org.eclipse.gemini.blueprint.conte
xt;version="[2.1.0.RELEASE,2.1.0.RELEASE]",org.eclipse.gemini.bluepri
nt.context.event;version="[2.1.0.RELEASE,2.1.0.RELEASE]",org.eclipse.
gemini.blueprint.context.support;version="[2.1.0.RELEASE,2.1.0.RELEAS
E]",org.eclipse.gemini.blueprint.extender;version="[2.1.0.RELEASE,2.1
.0.RELEASE]",org.eclipse.gemini.blueprint.extender.event;version="[2.
1.0.RELEASE,2.1.0.RELEASE]",org.eclipse.gemini.blueprint.io;version="
[2.1.0.RELEASE,2.1.0.RELEASE]",org.eclipse.gemini.blueprint.service.e
xporter.support;version="[2.1.0.RELEASE,2.1.0.RELEASE]",org.eclipse.g
emini.blueprint.service.importer;version="[2.1.0.RELEASE,2.1.0.RELEAS
E]",org.eclipse.gemini.blueprint.service.importer.event;version="[2.1
.0.RELEASE,2.1.0.RELEASE]",org.eclipse.gemini.blueprint.service.impor
ter.support;version="[2.1.0.RELEASE,2.1.0.RELEASE]",org.eclipse.gemin
i.blueprint.util;version="[2.1.0.RELEASE,2.1.0.RELEASE]",org.springfr
amework.beans;version="[4.3.0,4.4)",org.springframework.beans.factory
;version="[4.3.0,4.4)",org.springframework.beans.factory.config;versi
on="[4.3.0,4.4)",org.springframework.beans.factory.parsing;version="[
4.3.0,4.4)",org.springframework.beans.factory.support;version="[4.3.0
,4.4)",org.springframework.beans.factory.xml;version="[4.3.0,4.4)",or
g.springframework.context;version="[4.3.0,4.4)",org.springframework.c
ontext.event;version="[4.3.0,4.4)",org.springframework.core;version="
[4.3.0,4.4)",org.springframework.core.convert;version="[4.3.0,4.4)",o
rg.springframework.core.io;version="[4.3.0,4.4)",org.springframework.
core.io.support;version="[4.3.0,4.4)",org.springframework.core.task;v
ersion="[4.3.0,4.4)",org.springframework.scheduling.concurrent;versio
n="[4.3.0,4.4)",org.springframework.util;version="[4.3.0,4.4)",org.xm
l.sax;resolution:=optional,org.eclipse.gemini.blueprint.extensions.an
notation;resolution:=optional;version="[2.1.0.RELEASE,2.1.0.RELEASE]"
,org.osgi.service.blueprint.reflect;version="1.0.0";resolution:=optio
nal,org.osgi.service.cm;version="1.2";resolution:=optional</Import-Package>
<Export-Package>org.eclipse.gemini.blueprint.extender;version="2.1.0.R
ELEASE";uses:="org.eclipse.gemini.blueprint.context,org.eclipse.gemin
i.blueprint.service.importer,org.osgi.framework,org.springframework.b
eans,org.springframework.beans.factory.config",org.eclipse.gemini.blu
eprint.extender.event;version="2.1.0.RELEASE";uses:="org.eclipse.gemi
ni.blueprint.context.event,org.eclipse.gemini.blueprint.service.impor
ter.event,org.osgi.framework,org.springframework.context",org.eclipse
.gemini.blueprint.extender.support;version="2.1.0.RELEASE";uses:="org
.eclipse.gemini.blueprint.context,org.eclipse.gemini.blueprint.extend
er,org.eclipse.gemini.blueprint.extender.support.scanning,org.osgi.fr
amework,org.springframework.beans.factory",org.eclipse.gemini.bluepri
nt.extender.support.scanning;version="2.1.0.RELEASE";uses:="org.osgi.
framework",org.osgi.service.blueprint;version=1;uses:="org.osgi.servi
ce.blueprint.container,org.osgi.service.blueprint.reflect",org.eclipse.gemini.blueprint.blueprint.container</Export-Package>
<Bundle-Vendor>Eclipse</Bundle-Vendor>
<Bundle-SymbolicName>org.motechproject.gemini-blueprint-extender</Bundle-SymbolicName>
<Embed-Dependency>
<!-- gemini-blueprint-core;inline=true,
gemini-blueprint-io;inline=true,-->
gemini-blueprint-extender;inline=true
</Embed-Dependency>
</instructions>
</configuration>
</plugin>

</plugins>
</build>

</project>
4 changes: 2 additions & 2 deletions gson/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

<properties>
<modules.root.dir>${basedir}/../..</modules.root.dir>
<gson.version>1.7.1</gson.version>
<gson.version>2.8.0</gson.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -68,7 +68,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>2.3.4</version>
<version>3.5.1</version>
<extensions>true</extensions>
<configuration>
<instructions>
Expand Down
Loading