Skip to content

Commit

Permalink
Fixed pom for proper generation of jar and OSGi mainfest.
Browse files Browse the repository at this point in the history
  • Loading branch information
@valdar
valdar committed Nov 29, 2018
1 parent c6d217f commit 033ec2f
Show file tree
Hide file tree
Showing 4 changed files with 82 additions and 76 deletions.
9 changes: 6 additions & 3 deletions build.xml
View file
Expand Up @@ -213,7 +213,8 @@
<xmlproperty file="${ant.file}" collapseAttributes="true"/>
<jar destfile="${dist.dir}/jgroups-raft-${version}.jar"
basedir="${compile.dir}"
includes="org/jgroups/**">
includes="org/jgroups/**"
excludes="org/jgroups/tests/**">
<fileset dir="${conf.dir}" includes="*.dtd, *.xml, jg-messages*.properties" excludes="*-service.xml"/>
<fileset dir="${root.dir}">
<include name="README*"/>
Expand All @@ -226,7 +227,9 @@
<mkdir dir="${dist.dir}"/>
<jar jarfile="${dist.dir}/jgroups-raft-${version}-sources.jar"
basedir="${src.dir}"
includes="org/jgroups/**">
includes="org/jgroups/**"
excludes="org/jgroups/tests/**">
<fileset dir="${conf.dir}" includes="*.dtd, *.xml, jg-messages*.properties" excludes="*-service.xml"/>
</jar>
</target>

Expand Down Expand Up @@ -373,7 +376,7 @@
threadcount="@{threadcount}"
usedefaultlisteners="false"
outputdir="@{outputdir}"
listeners="org.jgroups.raft.util.JUnitXMLReporter"
listeners="org.jgroups.tests.utils.JUnitXMLReporter"
timeout="${unittest.timeout}"
timeOut="${unittest.timeout}"
verbose="0"
Expand Down
8 changes: 4 additions & 4 deletions ivysettings.xml
View file
Expand Up @@ -3,10 +3,10 @@
<settings defaultResolver="default"/>
<credentials host="${nexus.host}" realm="Sonatype Nexus Repository Manager" username="${nexus.user}" passwd="${nexus.password}"/>

<!--<property name="nexus-public"
value="https://repository.jboss.org/nexus/content/groups/public"/>-->
<property name="nexus-public" value="${nexus.url}"/>
<property name="nexus-snapshots" value="${nexus.snapshots.url}"/>
<property name="nexus-public" value="https://repository.jboss.org/nexus/content/groups/public"/>
<property name="nexus-snapshots" value="https://repository.jboss.org/nexus/content/groups/public"/>
<!--<property name="nexus-public" value="${nexus.url}"/>-->
<!--<property name="nexus-snapshots" value="${nexus.snapshots.url}"/>-->

<property
name="m2-location"
Expand Down
139 changes: 71 additions & 68 deletions pom.xml
View file
Expand Up @@ -16,6 +16,14 @@
<nexus.server.url>https://repository.jboss.org/nexus</nexus.server.url>
<nexus.snapshot.server.id>jboss-snapshots-repository</nexus.snapshot.server.id>
<nexus.snapshot.server.url>https://repository.jboss.org/nexus/content/repositories/snapshots/</nexus.snapshot.server.url>

<testng.version>6.8.7</testng.version>

<jgroups.version>4.0.15.Final</jgroups.version>
<leveldbjni.version>1.8</leveldbjni.version>
<mapdb.version>1.0.8</mapdb.version>
<commons-io.version>2.5</commons-io.version>
<log4j.version>2.11.1</log4j.version>
</properties>

<organization>
Expand Down Expand Up @@ -109,45 +117,40 @@
<dependency>
<groupId>org.jgroups</groupId>
<artifactId>jgroups</artifactId>
<version>4.0.12.Final</version>
<version>${jgroups.version}</version>
</dependency>
<dependency>
<groupId>org.fusesource.leveldbjni</groupId>
<artifactId>leveldbjni-all</artifactId>
<version>1.8</version>
<version>${leveldbjni.version}</version>
</dependency>
<dependency>
<groupId>org.mapdb</groupId>
<artifactId>mapdb</artifactId>
<version>1.0.6</version>
<version>${mapdb.version}</version>
</dependency>
<!--dependency>
<groupId>org.jetbrains.xodus</groupId>
<artifactId></artifactId>
<version></version>
</dependency-->
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.14</version>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>${log4j.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.0</version>
<version>${log4j.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version>
<version>${commons-io.version}</version>
</dependency>
<!-- Test dependencies -->
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.8.7</version>
<version>${testng.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -168,18 +171,18 @@
<directory>${project.build.directory}/schema</directory>
</resource>
<resource>
<directory>${project.basedir}</directory>
<includes>
<include>INSTALL.html</include>
<include>LICENSE</include>
<include>README</include>
</includes>
<directory>${project.basedir}</directory>
<includes>
<include>INSTALL.html</include>
<include>LICENSE</include>
<include>README</include>
</includes>
</resource>
<resource>
<directory>${project.basedir}/lib</directory>
<includes>
<include>licenses/thirdparty*</include>
</includes>
<directory>${project.basedir}/lib</directory>
<includes>
<include>licenses/thirdparty*</include>
</includes>
</resource>
</resources>
<plugins>
Expand All @@ -199,10 +202,6 @@
<configuration>
<source>1.8</source>
<target>1.8</target>
<excludes>
<exclude>org/jgroups/util/JUnitXMLReporter.java</exclude>
<!--<exclude>org/jgroups/demos/**</exclude>-->
</excludes>
</configuration>
</plugin>
<plugin>
Expand All @@ -229,40 +228,39 @@
</rules>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>add-source</id>
<phase>validate</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<!-- These tests have to go in the main jar -->
<source>tests/other</source>
<source>tests/perf</source>
</sources>
</configuration>
</execution>
<execution>
<id>add-test-source</id>
<phase>validate</phase>
<goals>
<goal>add-test-source</goal>
</goals>
<configuration>
<sources>
<source>tests/junit-functional</source>
<!-- tests/other and tests/perf are included in the normal sources -->
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>add-source</id>
<phase>validate</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<!-- These tests have to go in the main jar -->
<source>tests/other</source>
<source>tests/perf</source>
</sources>
</configuration>
</execution>
<execution>
<id>add-test-source</id>
<phase>validate</phase>
<goals>
<goal>add-test-source</goal>
</goals>
<configuration>
<sources>
<source>tests/junit-functional</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
Expand Down Expand Up @@ -305,10 +303,10 @@
</plugin>
<!-- Make sure we generate src jars too -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<inherited>true</inherited>
<executions>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<inherited>true</inherited>
<executions>
<execution>
<id>attach-sources</id>
<phase>verify</phase>
Expand All @@ -335,11 +333,16 @@
<instructions>
<Main-Class>org.jgroups.Version</Main-Class>
<Implementation-Version>${project.version}</Implementation-Version>
<Import-Package>
!org.testng.*,
*
</Import-Package>
<Export-Package>
!org.testng,
schema;version=${project.version},
${project.groupId}.*;version=${project.version}
${project.groupId}.raft.*;version=${project.version},
${project.groupId}.protocol.raft.*;version=${project.version}
</Export-Package>
<!--Bundle-RequiredExecutionEnvironment>1.8</Bundle-RequiredExecutionEnvironment-->
</instructions>
</configuration>
</plugin>
Expand Down
2 changes: 1 addition & 1 deletion ...g/jgroups/raft/util/JUnitXMLReporter.java → ...jgroups/tests/utils/JUnitXMLReporter.java
View file
@@ -1,4 +1,4 @@
package org.jgroups.raft.util;
package org.jgroups.tests.utils;

import org.jgroups.util.*;
import org.testng.IConfigurationListener2;
Expand Down

0 comments on commit 033ec2f

Please sign in to comment.