Skip to content
This repository has been archived by the owner on Jun 15, 2023. It is now read-only.

Commit

Permalink
Issue #3: improve build
Browse files Browse the repository at this point in the history
  • Loading branch information
@magnet
magnet committed Nov 19, 2017
1 parent e317a18 commit 8bcf23d
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 204 deletions.
2 changes: 1 addition & 1 deletion aspecio-core/osgi.bnd
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Bundle-SymbolicName: io.primeval.aspecio
Private-Package: com.github.gfx.util, org.objectweb.asm, org.objectweb.asm.*
Private-Package: com.github.gfx.util
Bundle-Activator: io.primeval.aspecio.internal.AspecioActivator
Import-Package: org.slf4j;resolution:=optional, *
87 changes: 9 additions & 78 deletions aspecio-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,6 @@
</properties>

<dependencies>
<!-- OSGi -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>6.0.0</version>
</dependency>

<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.cmpn</artifactId>
<version>6.0.0</version>
</dependency>

<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.annotation</artifactId>
<version>6.0.0</version>
</dependency>

<dependency>
<groupId>io.primeval</groupId>
<artifactId>primeval-reflex</artifactId>
Expand All @@ -45,96 +26,46 @@
<version>2.0.0</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.12</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>5.1</version>
</dependency>

<!-- packaged in bundle -->
<dependency>
<groupId>com.github.gfx.util</groupId>
<artifactId>weak-identity-hash-map</artifactId>
<version>2.0.0</version>
<scope>provided</scope>
</dependency>


<!-- TEST -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.2.0</version>
<scope>test</scope>
</dependency>

</dependencies>

<profiles>
<profile>
<id>release</id>
<id>release-aspecio</id>
<activation>
<property>
<name>release</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.3</version>
<executions>
<execution>
<id>generate-javadoc</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
<inherited>false</inherited>
</execution>
</executions>
<configuration>
<quiet>true</quiet>
<excludePackageNames>io.primeval.aspecio.internal,
io.primeval.aspecio.internal.*</excludePackageNames>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<build>
<plugins>
<plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
41 changes: 3 additions & 38 deletions aspecio-examples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,51 +12,16 @@
<artifactId>aspecio-examples</artifactId>

<dependencies>
<!-- OSGi -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>6.0.0</version>
</dependency>

<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.cmpn</artifactId>
<version>6.0.0</version>
</dependency>

<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.util.promise</artifactId>
<version>1.0.0</version>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>21.0</version>
</dependency>

<dependency>
<groupId>io.primeval.aspecio</groupId>
<artifactId>aspecio-core</artifactId>
<version>${project.version}</version>
</dependency>


<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.12</version>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>

</dependencies>

<build>
<plugins>
<plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
43 changes: 0 additions & 43 deletions aspecio-it/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,45 +13,14 @@
<description>Integration tests for Aspecio</description>

<dependencies>
<!-- OSGi -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>6.0.0</version>
</dependency>

<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.cmpn</artifactId>
<version>6.0.0</version>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>21.0</version>
</dependency>

<dependency>
<groupId>io.primeval.aspecio</groupId>
<artifactId>aspecio-core</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>io.primeval.aspecio</groupId>
<artifactId>aspecio-examples</artifactId>
<version>${project.version}</version>
</dependency>



<!-- TEST -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.12</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
Expand All @@ -62,12 +31,6 @@
<artifactId>logback-classic</artifactId>
<version>1.1.3</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam</artifactId>
Expand Down Expand Up @@ -152,12 +115,6 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.2.0</version>
<scope>test</scope>
</dependency>


</dependencies>
Expand Down
70 changes: 26 additions & 44 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,74 +9,56 @@
<relativePath />
</parent>



<groupId>io.primeval.aspecio</groupId>
<artifactId>aspecio</artifactId>
<version>2.0.0-SNAPSHOT</version>

<packaging>pom</packaging>

<name>Aspecio Project</name>

<description>OSGi Service Aspects</description>
<url>http://primeval.io/aspecio</url>

<organization>
<name>Primeval</name>
<url>http://www.primeval.io</url>
</organization>

<developers>
<developer>
<id>magnet</id>
<name>Simon Chemouil</name>
<organization>Lambdacube</organization>
</developer>
</developers>

<licenses>
<license>
<name>Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<url>http://primeval.io/aspecio</url>

<scm>
<url>https://github.com/primeval-io/aspecio</url>
</scm>

<properties>
<primeval-3rdparty-bom.version>1.0.0-SNAPSHOT</primeval-3rdparty-bom.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.primeval</groupId>
<artifactId>primeval-thirdparty-bom</artifactId>
<version>${primeval-3rdparty-bom.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>


<profiles>
<profile>
<id>release</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.5</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<id>deploy-aspecio</id>
<activation>
<property>
<name>deploy</name>
</property>
</activation>
<modules>
<module>aspecio-core</module>
</modules>
</profile>
<profile>
<id>default</id>
<activation>
<activeByDefault>true</activeByDefault>
<property>
<name>!deploy</name>
</property>
</activation>

<modules>
Expand Down

0 comments on commit 8bcf23d

Please sign in to comment.