Skip to content
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.

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

FELIX-5900 - Donating a tool able to generate markdown documentation for SCR and Metatype #149

Open
wants to merge 10,000 commits into
base: trunk
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
10000 commits
Select commit Hold shift + click to select a range
a5e16b6
Use release http.whiteboard api
cziegeler Apr 23, 2018
d450f68
Use release http.whiteboard api
cziegeler Apr 23, 2018
784a7e2
Use release http.whiteboard api
cziegeler Apr 23, 2018
adca54b
Use released OSGi R7 api
cziegeler Apr 23, 2018
59c9229
Use released R7 apis
cziegeler Apr 23, 2018
28292f7
Use released R7 apis
cziegeler Apr 23, 2018
f0af2e4
Use released R7 api
cziegeler Apr 23, 2018
c1359eb
Remove R6 implementation in favour of R7 one
cziegeler Apr 23, 2018
00cceef
Move http base R7 to master
cziegeler Apr 23, 2018
7d12c2b
Move http bridge R7 to master
cziegeler Apr 23, 2018
92ece6f
Move http jetty R7 to master
cziegeler Apr 23, 2018
b6ddfe7
Move http itest R7 to master
cziegeler Apr 23, 2018
a6d44ec
Adjust versions
cziegeler Apr 23, 2018
ea6f139
Remove obsolete http directory
cziegeler Apr 23, 2018
e99f1fc
[Felix Converter] Remove dependency on OSGi Maven repo
bosschaert Apr 23, 2018
a31854a
[Felix Converter] Prepare Javadoc for release
bosschaert Apr 23, 2018
865b001
[maven-release-plugin] prepare release org.apache.felix.converter-1.0.0
bosschaert Apr 23, 2018
cb521ba
[maven-release-plugin] prepare for next development iteration
bosschaert Apr 23, 2018
b597828
FELIX-5838 Add OSGi Resource implementations to Felix Utils
bosschaert Apr 23, 2018
0872513
FELIX-5829: delete ImmutableMap/List.
karlpauls Apr 23, 2018
f584b1a
[FELIX-5839] Make checkAndLoadCache available for override
gnodet Apr 24, 2018
37513ba
[FELIX-5838] Move capability/requirement toString to a new ResourceUt…
gnodet Apr 24, 2018
4bcb5b3
[FELIX-5838] Make the filter usage a bit more coherent
gnodet Apr 24, 2018
ead1643
Correct version
cziegeler Apr 24, 2018
3709bc2
Add missing ca version property
cziegeler Apr 25, 2018
a60cf08
Move R7 configadmin to trunk
cziegeler Apr 26, 2018
223426e
Move R7 configadmin to trunk
cziegeler Apr 26, 2018
451224d
Move R7 SCR to trunk
cziegeler Apr 26, 2018
e1b6709
Move R7 scr to trunk
cziegeler Apr 26, 2018
3020b46
Move R7 configurator to trunk
cziegeler Apr 26, 2018
8823a3f
Update changelog
cziegeler Apr 26, 2018
49f4b99
Update changelog
cziegeler Apr 26, 2018
ec90747
Correct svn location
cziegeler Apr 26, 2018
a30efa4
[maven-release-plugin] prepare release org.apache.felix.configadmin-1…
cziegeler Apr 26, 2018
f8f987f
[maven-release-plugin] prepare for next development iteration
cziegeler Apr 26, 2018
6d951e5
Correct svn location
cziegeler Apr 26, 2018
d4e288c
Use configadmin 1.9.0
cziegeler Apr 26, 2018
b97dc51
[maven-release-plugin] prepare release org.apache.felix.scr-2.1.0
cziegeler Apr 26, 2018
342cd8a
[maven-release-plugin] prepare for next development iteration
cziegeler Apr 26, 2018
7fae5ca
Correct svn location
cziegeler Apr 26, 2018
3d00649
Use latest converter
cziegeler Apr 26, 2018
009f52d
Prepare for release
cziegeler Apr 26, 2018
3a0b957
[maven-release-plugin] prepare release org.apache.felix.http.parent-10
cziegeler Apr 26, 2018
e81ba24
[maven-release-plugin] prepare for next development iteration
cziegeler Apr 26, 2018
ea355bd
[maven-release-plugin] prepare release org.apache.felix.http.base-4.0.0
cziegeler Apr 26, 2018
408a576
[maven-release-plugin] prepare for next development iteration
cziegeler Apr 26, 2018
c8a96f0
[maven-release-plugin] prepare release org.apache.felix.http.whiteboa…
cziegeler Apr 26, 2018
68bf975
[maven-release-plugin] prepare for next development iteration
cziegeler Apr 26, 2018
cb65b93
[maven-release-plugin] prepare release org.apache.felix.http.bridge-4…
cziegeler Apr 26, 2018
bef3f97
[maven-release-plugin] prepare for next development iteration
cziegeler Apr 26, 2018
b244c3d
[maven-release-plugin] prepare release org.apache.felix.http.jetty-4.0.0
cziegeler Apr 26, 2018
c5b90e7
[maven-release-plugin] prepare for next development iteration
cziegeler Apr 26, 2018
7a82fda
Use released converter
cziegeler Apr 26, 2018
cf49215
[maven-release-plugin] prepare release org.apache.felix.configurator-…
cziegeler Apr 27, 2018
1eca303
[maven-release-plugin] prepare for next development iteration
cziegeler Apr 27, 2018
fabd361
Use correct dependency for osgi promises
cziegeler Apr 27, 2018
502e622
FELIX-5841 : Update webconsole plugin to DS 1.4 (R7)
cziegeler Apr 27, 2018
d35bba8
Fix up some javadoc in preparation for the release.
bosschaert May 1, 2018
f28b76c
Use Felix Parent Pom v5
bosschaert May 2, 2018
56d3459
[maven-release-plugin] prepare release org.apache.felix.utils-1.11.0
bosschaert May 2, 2018
34a961d
[maven-release-plugin] prepare for next development iteration
bosschaert May 2, 2018
699fcec
Update trunk to the osgi-r7 resolver
karlpauls May 3, 2018
1878353
Update trunk to the osgi-r7 framework
karlpauls May 3, 2018
dba7b60
Delete empty osgi-r7 dir.
karlpauls May 3, 2018
4375b59
Update to latest parent pom version 5
karlpauls May 3, 2018
0b08a65
Update to latest parent pom version 5
karlpauls May 3, 2018
b3c9531
Update to latest parent pom version 5 and current framework snapshot …
karlpauls May 3, 2018
41814af
Set version as 5.9.0-SNAPSHOT
karlpauls May 3, 2018
28fcc0b
FELIX-5773 : Update implementation to EventAdmin 1.4 (R7)
cziegeler May 4, 2018
f4fd49d
Avoid dependency to osgi.compendium
cziegeler May 4, 2018
1f78518
[maven-release-plugin] prepare release org.apache.felix.eventadmin-1.5.0
cziegeler May 4, 2018
a8df099
[maven-release-plugin] prepare for next development iteration
cziegeler May 4, 2018
3055edb
FELIX-5779 : Update metatype to R7
cziegeler May 4, 2018
b26785e
[maven-release-plugin] prepare release org.apache.felix.metatype-1.2.0
cziegeler May 4, 2018
a6ae219
[maven-release-plugin] prepare for next development iteration
cziegeler May 4, 2018
43b256b
Update changelog.txt
bosschaert May 8, 2018
062c941
prepare systemready contrib
dulvac May 8, 2018
62e1003
FELIX-5845 : org.apache.felix.cm.impl.persistence.PersistenceManagerP…
cziegeler May 8, 2018
fec3651
FELIX-5848 [contribution] Contribute System Ready to felix
dulvac May 9, 2018
8bb154a
Add test for FELIX-5849
cziegeler May 10, 2018
9a2b07b
More info to the FrameworkStartCheck
dulvac May 10, 2018
4106c73
Update tests to junit annotations
cziegeler May 11, 2018
3e2fa37
[FELIX-5855] Support array subscript in expander
gnodet May 17, 2018
a2d37b6
[FELIX-5856] Coercion between Object[] and List
gnodet May 17, 2018
ad104da
[FELIX-5856] Fix coercion between typed array and List
gnodet May 17, 2018
56ba0ac
[FELIX-5857] Provide a context classloader on the session to help wit…
gnodet May 17, 2018
a25c2e1
[logbackend] first commit
rotty3000 May 18, 2018
d99ae9f
[maven-release-plugin] prepare release org.apache.felix.configadmin-1…
cziegeler May 23, 2018
764acc6
[maven-release-plugin] prepare for next development iteration
cziegeler May 23, 2018
bbeda1c
Merge branch 'FELIX-5860' into trunk
gnodet May 24, 2018
43874dd
Revert "[FELIX-5860] Upgrade to OSGi R7"
gnodet May 24, 2018
6c9ecce
Update to felix-parent 5
jbonofre May 24, 2018
3736869
[maven-release-plugin] prepare release org.apache.felix.connect-0.2.0
jbonofre May 24, 2018
6e5cde8
[maven-release-plugin] prepare for next development iteration
jbonofre May 24, 2018
4135f37
Cancel Felix Connect 0.2.0 release
jbonofre May 25, 2018
2dcfb78
Update NOTICE file using Felix Connect name and adding ASF copyright
jbonofre May 25, 2018
c630981
Update NOTICE
jbonofre May 25, 2018
01b05ea
[maven-release-plugin] prepare release org.apache.felix.connect-0.2.0
jbonofre May 25, 2018
b3c5be9
[maven-release-plugin] prepare for next development iteration
jbonofre May 25, 2018
db14dec
[logback] rename and add integration test suite
rotty3000 May 28, 2018
2755274
[logback] do less work during release/deploy
rotty3000 May 28, 2018
1d2716f
FELIX-5848 FrameworkStartCheck and general improvements
dulvac Jun 4, 2018
0f47585
[FELIX-5794] maven-bundle-plugin fails to parse meta-persistence
gnodet Jun 8, 2018
018aeba
Make the FileInstall BAR plugin easier to build
Jun 11, 2018
38bfba7
FELIX-5865 : SCR r7 logging support doesn't work on equinox framework
cziegeler Jun 12, 2018
0e4a0f9
[logback] update project configurations
rotty3000 Jun 12, 2018
a8fe38f
FELIX-5867 reference field of type Logger for service LoggerFactory i…
rotty3000 Jun 12, 2018
e86f3d1
FELIX-5866 : scr does not respect the log level set in LoggerAdmin
cziegeler Jun 13, 2018
111ed75
Update changelog
cziegeler Jun 13, 2018
9bd7fbe
[FELIX-5869] [goto][jline] Weird error if the script contains unicode…
gnodet Jun 14, 2018
1a176e7
[maven-release-plugin] prepare release gogo-parent-3
gnodet Jun 14, 2018
bfc2b3d
[maven-release-plugin] rollback the release of gogo-parent-3
gnodet Jun 14, 2018
8090dba
Upgrade to latest felix parent
gnodet Jun 14, 2018
caa0628
[maven-release-plugin] prepare release gogo-parent-3
gnodet Jun 14, 2018
f2ea0c3
[maven-release-plugin] prepare for next development iteration
gnodet Jun 14, 2018
433a0c1
Upgrade to latest parent
gnodet Jun 14, 2018
de41d04
Upgrade to latest felix parent, fix poms
gnodet Jun 14, 2018
f75edf1
[maven-release-plugin] prepare release gogo-parent-4
gnodet Jun 14, 2018
78bb837
[maven-release-plugin] prepare for next development iteration
gnodet Jun 14, 2018
1508cb8
Upgrade to gogo-parent 4
gnodet Jun 14, 2018
f809e9c
[maven-release-plugin] prepare release org.apache.felix.gogo.runtime-…
gnodet Jun 14, 2018
ebc1019
[maven-release-plugin] prepare for next development iteration
gnodet Jun 14, 2018
b02d06a
Upgrade to gogo-parent 4
gnodet Jun 14, 2018
135f6f6
[maven-release-plugin] prepare release org.apache.felix.gogo.shell-1.1.0
gnodet Jun 14, 2018
8c35aa1
[maven-release-plugin] prepare for next development iteration
gnodet Jun 14, 2018
ced5e62
[maven-release-plugin] prepare release org.apache.felix.gogo.jline-1.1.0
gnodet Jun 14, 2018
32169dd
[maven-release-plugin] prepare for next development iteration
gnodet Jun 14, 2018
9063278
[maven-release-plugin] prepare release maven-bundle-plugin-3.5.1
gnodet Jun 14, 2018
aa197fa
[maven-release-plugin] prepare for next development iteration
gnodet Jun 14, 2018
1454115
FELIX-5870: Don't allow relative path instructions in bundleclasspath…
karlpauls Jun 15, 2018
54d492f
FELIX-5800: fix a bug where we where using the wrong properties map.
karlpauls Jun 15, 2018
975b8ea
FELIX-5800: Fix a small bug when calculating osgi.ee on > java9.
karlpauls Jun 18, 2018
0a1e13e
FELIX-5828: Remove support for android.
karlpauls Jun 18, 2018
ebbdb24
cleanup old directories
rotty3000 Jun 21, 2018
227838f
[logback] pre-release preparations
rotty3000 Jun 21, 2018
307e56c
[logback] maven ignores
rotty3000 Jun 21, 2018
c48f499
[logback] maven ignores... really this time
rotty3000 Jun 21, 2018
8512cb2
[logback] isolate itests into own profile
rotty3000 Jun 21, 2018
c6d95de
[maven-release-plugin] prepare release org.apache.felix.logback.react…
rotty3000 Jun 21, 2018
0f64eda
[maven-release-plugin] prepare for next development iteration
rotty3000 Jun 21, 2018
0c7f0ed
FELIX-5800: minor refactoring to not do the prop sub twice.
karlpauls Jun 22, 2018
3164ceb
[logback] revert attempted release
rotty3000 Jun 22, 2018
592d3da
[logback] fix parent dependency so felix.logback can be released by i…
rotty3000 Jun 22, 2018
d36557e
[logback] fix parent
rotty3000 Jun 22, 2018
8a33559
[maven-release-plugin] prepare release org.apache.felix.logback-1.0.0
rotty3000 Jun 22, 2018
afb405e
[maven-release-plugin] prepare for next development iteration
rotty3000 Jun 22, 2018
0bfe4ca
FELIX-5872 Fix timing issue in FrameworkStartTest. Other fixes
cschneider Jun 25, 2018
0ec5078
FELIX-5873 - Remove servlet context select to fix servlet in karaf
cschneider Jun 26, 2018
cad8a5f
FELIX-5874: Make URLHandlersContentHandlerProxy.getBuiltIn return the…
karlpauls Jun 27, 2018
6bfe771
FELIX-5875: allow org.osgi.framework.os.name et.al. to be given via t…
karlpauls Jun 29, 2018
23f4109
Update framework version to 1.9
karlpauls Jun 29, 2018
2927f22
FELIX-5876 Update to Log Service Specification 1.4
rotty3000 Jul 2, 2018
35c829f
Update changelog for release
karlpauls Jul 3, 2018
d73f139
Update changelog for release
karlpauls Jul 3, 2018
706e9da
FELIX-5877: Add missing org.w3c.dom exports
karlpauls Jul 3, 2018
a400057
Update changelog for release
karlpauls Jul 3, 2018
20486ee
Update to gogo 1.1.0 and jansi 1.17.1
karlpauls Jul 3, 2018
25f90c7
Update changelog for release
karlpauls Jul 3, 2018
3f194f0
Update changelog for release
karlpauls Jul 3, 2018
f079c18
[maven-release-plugin] prepare release org.apache.felix.resolver-2.0.0
karlpauls Jul 3, 2018
bbb00b8
[maven-release-plugin] prepare for next development iteration
karlpauls Jul 3, 2018
ffd0c94
[maven-release-plugin] prepare release org.apache.felix.framework-6.0.0
karlpauls Jul 3, 2018
d38552b
[maven-release-plugin] prepare for next development iteration
karlpauls Jul 3, 2018
4a0ed76
[maven-release-plugin] prepare release org.apache.felix.main-6.0.0
karlpauls Jul 3, 2018
bca34dc
[maven-release-plugin] prepare for next development iteration
karlpauls Jul 3, 2018
95d7490
Set development version to 6.1.0-SNAPSHOT
karlpauls Jul 3, 2018
51172c5
Set development version to 2.1.0-SNAPSHOT
karlpauls Jul 3, 2018
4f69e23
Set development version to 6.1.0-SNAPSHOT
karlpauls Jul 3, 2018
012b216
Update dependencies for release
karlpauls Jul 3, 2018
d41f15f
[maven-release-plugin] prepare release org.apache.felix.main.distribu…
karlpauls Jul 3, 2018
28c752f
[maven-release-plugin] prepare for next development iteration
karlpauls Jul 3, 2018
d9bc53c
[log] remove dependency on ConfigurationAdmin added in FELIX-5876
rotty3000 Jul 3, 2018
c43a02b
Update dependencies after release
karlpauls Jul 3, 2018
31bdadf
[log] update changelog
rotty3000 Jul 4, 2018
c05b054
FELIX-5880 : Add a framework extension fragment which helps load Feli…
rotty3000 Jul 4, 2018
0b66567
[logback] add tests for felix log service
rotty3000 Jul 4, 2018
1dfc111
[logback] use equinox from maven central
rotty3000 Jul 4, 2018
f70eaf9
Update bnd version. Export packages by annotation
cschneider Jul 4, 2018
6feebd7
[log] make resolving config admin service dependency possible
rotty3000 Jul 5, 2018
1660ac0
[logback] sync README with the CMS page
rotty3000 Jul 6, 2018
f49f83b
[log] create a readme file for easier documentation maintenance (just…
rotty3000 Jul 6, 2018
269c00d
Update changelog
karlpauls Jul 9, 2018
bd6734d
[log] pre-release cleanup
rotty3000 Jul 9, 2018
94cdf49
[log.extension] pre-release cleanup
rotty3000 Jul 9, 2018
5d8c49d
[maven-release-plugin] prepare release org.apache.felix.log-1.2.0
rotty3000 Jul 9, 2018
40967c9
[maven-release-plugin] prepare for next development iteration
rotty3000 Jul 9, 2018
d0e51b9
[maven-release-plugin] prepare release org.apache.felix.log.extension…
rotty3000 Jul 9, 2018
6d055a7
[maven-release-plugin] prepare for next development iteration
rotty3000 Jul 9, 2018
63a615a
FELIX-5882: Update to jetty version 9.4.11.v20180605
karlpauls Jul 9, 2018
f4a05fd
[maven-release-plugin] prepare release org.apache.felix.http.jetty-4.0.2
karlpauls Jul 9, 2018
4edfadc
[maven-release-plugin] prepare for next development iteration
karlpauls Jul 9, 2018
f45516d
FELIX-5873 - Change default servlet path to not collide with system c…
cschneider Jul 11, 2018
649fd96
FELIX-5873 - Docs
cschneider Jul 11, 2018
6cf9d4a
FELIX-5866 : scr does not respect the log level set in LoggerAdmin
cziegeler Jul 12, 2018
6389492
FELIX-5883 : Add support to enable and configure the jetty GzipHandle…
cziegeler Jul 12, 2018
5c22212
Updated docs
cschneider Jul 12, 2018
ba0771c
Improve servlet docs
cschneider Jul 12, 2018
c1ffb33
Improve servlet docs
cschneider Jul 12, 2018
2cde23a
Add rat plugin config
cschneider Jul 12, 2018
050df93
Add javadoc config
cschneider Jul 12, 2018
4bae72d
Switch to felix parent, add scm entry, add signature config for java 8
Jul 12, 2018
fa1bd84
FELIX-5885 : SCR uses an overly restrictive import range for promises
cziegeler Jul 13, 2018
3d01deb
Move why systemready and add project information
cschneider Jul 13, 2018
f2b6d7e
[maven-release-plugin] prepare release org.apache.felix.systemready-0…
cschneider Jul 13, 2018
1ba0c04
[maven-release-plugin] prepare for next development iteration
cschneider Jul 13, 2018
cd3dbb5
FELIX-5886: Only log errors if we can't load the bytes of an existing…
karlpauls Jul 13, 2018
894c1aa
Simplify pom.xml
cschneider Jul 16, 2018
3c147cb
FELIX-5889: make extension bundle capabilities be indexed by the reso…
karlpauls Jul 16, 2018
f638feb
Add comment
cschneider Jul 17, 2018
5539b4f
Add build status
cschneider Jul 17, 2018
d96bfe6
Remove test results badge as it does not work
cschneider Jul 17, 2018
6ee15de
Clean-up: use StringBuilder instead of StringBuffer everywhere.
karlpauls Jul 18, 2018
e511497
FELIX-5891 : Keep order of properties and objects. Apply patch from A…
cziegeler Jul 25, 2018
6ace05b
FELIX-5891 : Keep order of properties and objects. Apply patch from A…
cziegeler Jul 25, 2018
63cc337
FELIX-5891 : Keep order of properties and objects. Apply patch from A…
cziegeler Jul 25, 2018
3748360
[maven-release-plugin] prepare release org.apache.felix.configurator-…
cziegeler Jul 26, 2018
bcd3ee6
[maven-release-plugin] prepare for next development iteration
cziegeler Jul 26, 2018
3a06422
FELIX-5892 : Repeated calls to getFactoryConfiguration return differe…
cziegeler Jul 28, 2018
6413784
Update changelog
cziegeler Jul 31, 2018
926be00
[maven-release-plugin] prepare release org.apache.felix.configadmin-1…
cziegeler Jul 31, 2018
bb983d2
[maven-release-plugin] prepare for next development iteration
cziegeler Jul 31, 2018
13fa2ee
Update changelog
cziegeler Aug 2, 2018
da57a51
[maven-release-plugin] prepare release org.apache.felix.scr-2.1.2
cziegeler Aug 2, 2018
6744029
[maven-release-plugin] prepare for next development iteration
cziegeler Aug 2, 2018
5c12c07
FELIX-5896 : Avoid runtime dependency to javax.annotation package
cziegeler Aug 2, 2018
f0e1f65
FELIX-5858 : Additional server configured through OSGi factory config…
cziegeler Aug 2, 2018
5dfd888
[maven-release-plugin] prepare release org.apache.felix.http.parent-11
cziegeler Aug 2, 2018
1abc778
[maven-release-plugin] prepare for next development iteration
cziegeler Aug 2, 2018
b321aa7
Update to released parent pom
cziegeler Aug 2, 2018
f606d87
Update to released parent pom
cziegeler Aug 2, 2018
08135b2
[maven-release-plugin] prepare release org.apache.felix.http.base-4.0.2
cziegeler Aug 2, 2018
4767a5c
[maven-release-plugin] prepare for next development iteration
cziegeler Aug 2, 2018
2933efb
Update to base 4.0.2
cziegeler Aug 2, 2018
aa71e92
[maven-release-plugin] prepare release org.apache.felix.http.bridge-4…
cziegeler Aug 2, 2018
ad044df
[maven-release-plugin] prepare for next development iteration
cziegeler Aug 2, 2018
55ebeb9
[maven-release-plugin] prepare release org.apache.felix.http.jetty-4.0.4
cziegeler Aug 2, 2018
92b6d61
[maven-release-plugin] prepare for next development iteration
cziegeler Aug 2, 2018
40fb087
[PROPOSAL] add new MOJOs able to generate the Markdown documentation
simonetripodi Aug 6, 2018
9c83880
FELIX-5900 - Donating a tool able to generate markdown documentation for
simonetripodi Aug 18, 2018
913042e
FELIX-5900 - Donating a tool able to generate markdown documentation for
simonetripodi Aug 20, 2018
c787800
FELIX-5900 - Donating a tool able to generate markdown documentation for
simonetripodi Aug 20, 2018
7b6c575
FELIX-5900 - Donating a tool able to generate markdown documentation for
simonetripodi Aug 20, 2018
67eff04
FELIX-5900 - Donating a tool able to generate markdown documentation for
simonetripodi Aug 20, 2018
653d109
FELIX-5900 - Donating a tool able to generate markdown documentation for
simonetripodi Aug 20, 2018
2aae017
FELIX-5900 - Donating a tool able to generate markdown documentation for
simonetripodi Aug 20, 2018
a3cf4d5
FELIX-5900 - Donating a tool able to generate markdown documentation for
simonetripodi Aug 20, 2018
2dd082a
FELIX-5900 - Donating a tool able to generate markdown documentation for
simonetripodi Aug 20, 2018
c7c0676
FELIX-5900 - Donating a tool able to generate markdown documentation for
simonetripodi Aug 20, 2018
119f2fd
FELIX-5900 - Donating a tool able to generate markdown documentation for
simonetripodi Aug 20, 2018
2783282
FELIX-5900 - Donating a tool able to generate markdown documentation for
simonetripodi Aug 21, 2018
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
Prev Previous commit
Next Next commit
Use released R7 apis
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1829819 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
cziegeler committed Apr 23, 2018
commit 28292f73d563b55d13b745b1037724e5559e54c5
32 changes: 17 additions & 15 deletions osgi-r7/scr/pom.xml
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix-parent</artifactId>
<version>4</version>
<version>5</version>
<relativePath />
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -64,8 +64,6 @@
<bundle.file.name>
${bundle.build.name}/${project.build.finalName}.jar
</bundle.file.name>
<felix.java.version>7</felix.java.version>
<felix.ca.version>1.9.0-SNAPSHOT</felix.ca.version>
</properties>


@@ -82,28 +80,18 @@
<version>6.0.1</version>
<scope>provided</scope>
</dependency>
<!--
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.component</artifactId>
<version>1.3.0</version>
<scope>provided</scope>
</dependency>
-->
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
<version>${felix.ca.version}</version>
<version>1.4.0</version>
<scope>provided</scope>
</dependency>
<!--
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.cm</artifactId>
<version>1.5.0</version>
<version>1.6.0</version>
<scope>provided</scope>
</dependency>
-->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.log</artifactId>
@@ -153,6 +141,20 @@
<scope>provided</scope>
</dependency>

<!-- Testing -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.17.0</version>
<scope>test</scope>
</dependency>

<!-- Integration Testing with Pax Exam -->
<dependency>
<groupId>org.ops4j.pax.exam</groupId>

This file was deleted.

Loading