Qortal/qortal
1
0
Fork 1
mirror of https://github.com/Qortal/qortal.git synced 2025-07-22 20:26:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

initial work towards OSGi

Browse Source 
refactored packages so they all start with org.qora

added some attempt at OSGi mega bundle using Maven (doesn't work)
This commit is contained in:
catbref
2019-01-04 10:19:33 +00:00
parent 9e425d3877
commit 5c6e239d76
209 changed files with 1325 additions and 1320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
pom.xml
View File

@@ -4,7 +4,7 @@
<groupId>org.qora</groupId>
<artifactId>qora-core</artifactId>
<version>2.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<packaging>bundle</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<bouncycastle.version>1.60</bouncycastle.version>
@@ -15,6 +15,7 @@
<slf4j.version>1.7.12</slf4j.version>
<swagger-api.version>2.0.6</swagger-api.version>
<swagger-ui.version>3.19.0</swagger-ui.version>
<felix-bundle-plugin.version>3.5.0</felix-bundle-plugin.version>
</properties>
<build>
<sourceDirectory>src/main/java</sourceDirectory>
@@ -118,12 +119,12 @@
<configuration>
<packages>
<package>
<pattern>data.**</pattern>
<template>${project.build.sourceDirectory}/data/package-info.java</template>
<pattern>org.qora.data.**</pattern>
<template>${project.build.sourceDirectory}/org/qora/data/package-info.java</template>
</package>
<package>
<pattern>api.models**</pattern>
<template>${project.build.sourceDirectory}/data/package-info.java</template>
<pattern>org.qora.api.model**</pattern>
<template>${project.build.sourceDirectory}/org/qora/data/package-info.java</template>
</package>
</packages>
<outputDirectory>${project.build.directory}/generated-sources/package-info</outputDirectory>
@@ -203,7 +204,7 @@
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>controller.Controller</mainClass>
<mainClass>org.qora.controller.Controller</mainClass>
<manifestEntries>
<Class-Path>. ..</Class-Path>
</manifestEntries>
@@ -213,6 +214,20 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${felix-bundle-plugin.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Include-Resource>
{maven-resources}, {maven-dependencies}
</Include-Resource>
<Bundle-ClassPath>.,..,{maven-dependencies}</Bundle-ClassPath>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
<repositories>
@@ -235,6 +250,11 @@
<artifactId>package-info-maven-plugin</artifactId>
<version>1.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>3.5.0</version>
</dependency>
<!-- HSQLDB for repository -->
<dependency>
<groupId>org.hsqldb</groupId>