Skip to content

Commit

Permalink
JNG-3834 prepare release (#108)
Browse files Browse the repository at this point in the history
* JNG-3834 Fixing CI build for prepare release

* Add license headers

* JNG-3834 Remove javax karaf dependency

* JNG-3834 Aggregate karaf features

* Bump version

Co-authored-by: Robert Csakany <robert.csakany@blackbelt.hu>
  • Loading branch information
robertcsakany and Robert Csakany authored Sep 15, 2022
1 parent 2f2dfff commit 27bfc9f
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 26 deletions.
1 change: 0 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,3 @@ updates:
- dependency-name: org.slf4j:slf4j-api
- dependency-name: org.jruby:jruby-complete
- dependency-name: org.apache.maven.plugins/maven-install-plugin

28 changes: 14 additions & 14 deletions features/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,14 @@
<descriptor>mvn:org.apache.karaf.features/framework/${karaf-version}/xml/features</descriptor>
<descriptor>mvn:org.apache.karaf.features/standard/${karaf-version}/xml/features</descriptor>
<descriptor>mvn:org.apache.cxf.karaf/apache-cxf/${cxf-version}/xml/features</descriptor>s
<descriptor>mvn:hu.blackbelt.karaf.features/google-features/${google-karaf-features-version}/xml/features</descriptor>
<descriptor>mvn:hu.blackbelt.karaf.features/antlr-features/${antlr-karaf-features-version}/xml/features</descriptor>
<descriptor>mvn:hu.blackbelt.karaf.features/bouncycastle-features/${bouncycastle-karaf-features-version}/xml/features</descriptor>
<descriptor>mvn:hu.blackbelt.karaf.features/apache-commons-features/${apache-commons-karaf-features-version}/xml/features</descriptor>
<descriptor>mvn:hu.blackbelt.karaf.features/apache-httpclient-features/${apache-httpclient-karaf-features-version}/xml/features</descriptor>
<descriptor>mvn:hu.blackbelt.karaf.features/apache-poi-features/${apache-poi-karaf-features-version}/xml/features</descriptor>
<descriptor>mvn:hu.blackbelt.karaf.features/eclipse-emf-features/${eclipse-emf-karaf-features-version}/xml/features</descriptor>
<descriptor>mvn:hu.blackbelt.karaf.features/eclipse-epsilon-features/${eclipse-epsilon-karaf-features-version}/xml/features</descriptor>
<descriptor>mvn:hu.blackbelt.karaf.features/google-features/${karaf-features-version}/xml/features</descriptor>
<descriptor>mvn:hu.blackbelt.karaf.features/antlr-features/${karaf-features-version}/xml/features</descriptor>
<descriptor>mvn:hu.blackbelt.karaf.features/bouncycastle-features/${karaf-features-version}/xml/features</descriptor>
<descriptor>mvn:hu.blackbelt.karaf.features/apache-commons-features/${karaf-features-version}/xml/features</descriptor>
<descriptor>mvn:hu.blackbelt.karaf.features/apache-httpclient-features/${karaf-features-version}/xml/features</descriptor>
<descriptor>mvn:hu.blackbelt.karaf.features/apache-poi-features/${karaf-features-version}/xml/features</descriptor>
<descriptor>mvn:hu.blackbelt.karaf.features/eclipse-emf-features/${karaf-features-version}/xml/features</descriptor>
<descriptor>mvn:hu.blackbelt.karaf.features/eclipse-epsilon-features/${karaf-features-version}/xml/features</descriptor>
<descriptor>file:${project.build.directory}/feature/feature.xml</descriptor>
</descriptors>
<distribution>org.apache.karaf.features:framework</distribution>
Expand Down Expand Up @@ -118,7 +118,7 @@
<dependency>
<groupId>hu.blackbelt.karaf.features</groupId>
<artifactId>google-features</artifactId>
<version>${google-karaf-features-version}</version>
<version>${karaf-features-version}</version>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
Expand All @@ -127,7 +127,7 @@
<dependency>
<groupId>hu.blackbelt.karaf.features</groupId>
<artifactId>bouncycastle-features</artifactId>
<version>${bouncycastle-karaf-features-version}</version>
<version>${karaf-features-version}</version>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
Expand All @@ -136,7 +136,7 @@
<dependency>
<groupId>hu.blackbelt.karaf.features</groupId>
<artifactId>apache-commons-features</artifactId>
<version>${apache-commons-karaf-features-version}</version>
<version>${karaf-features-version}</version>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
Expand All @@ -145,7 +145,7 @@
<dependency>
<groupId>hu.blackbelt.karaf.features</groupId>
<artifactId>apache-poi-features</artifactId>
<version>${apache-poi-karaf-features-version}</version>
<version>${karaf-features-version}</version>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
Expand All @@ -154,7 +154,7 @@
<dependency>
<groupId>hu.blackbelt.karaf.features</groupId>
<artifactId>eclipse-emf-features</artifactId>
<version>${eclipse-emf-karaf-features-version}</version>
<version>${karaf-features-version}</version>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
Expand All @@ -163,7 +163,7 @@
<dependency>
<groupId>hu.blackbelt.karaf.features</groupId>
<artifactId>antlr-features</artifactId>
<version>${antlr-karaf-features-version}</version>
<version>${karaf-features-version}</version>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
Expand Down
15 changes: 4 additions & 11 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</issueManagement>
<properties>

<revision>1.4.0-SNAPSHOT</revision>
<revision>1.5.0-SNAPSHOT</revision>
<maven>3.8.3</maven>

<deployOnly>false</deployOnly>
Expand All @@ -33,16 +33,9 @@
<epsilon-version>2.4.0</epsilon-version>
<karaf-version>4.4.1</karaf-version>
<cxf-version>3.3.1</cxf-version>
<osgi-utils-version>1.0.12</osgi-utils-version>
<google-karaf-features-version>1.0.7</google-karaf-features-version>
<javax-karaf-features-version>1.0.2</javax-karaf-features-version>
<bouncycastle-karaf-features-version>1.61.2</bouncycastle-karaf-features-version>
<eclipse-emf-karaf-features-version>1.0.1</eclipse-emf-karaf-features-version>
<eclipse-epsilon-karaf-features-version>1.0.6</eclipse-epsilon-karaf-features-version>
<antlr-karaf-features-version>1.0.1</antlr-karaf-features-version>
<apache-commons-karaf-features-version>1.0.6</apache-commons-karaf-features-version>
<apache-poi-karaf-features-version>1.0.4</apache-poi-karaf-features-version>
<apache-httpclient-karaf-features-version>1.0.0</apache-httpclient-karaf-features-version>

<osgi-utils-version>1.1.0</osgi-utils-version>
<karaf-features-version>2.0.0</karaf-features-version>

<!--suppress UnresolvedMavenProperty -->
<logback-test-config>${maven.multiModuleProjectDirectory}/logback-test.xml</logback-test-config>
Expand Down

0 comments on commit 27bfc9f

Please sign in to comment.