new branch

This commit is contained in:
Rob Austin
2021-01-26 18:25:46 +00:00
parent 5de3832ca4
commit 5e631917dc
2 changed files with 13 additions and 17 deletions
+13 -14
View File
@@ -15,8 +15,7 @@
<version>3.21ea2-SNAPSHOT</version>
<name>OpenHFT/Chronicle-Map</name>
<description>Chronicle-Map</description>
<packaging>bundle</packaging>
<dependencyManagement>
<dependencies>
@@ -269,7 +268,7 @@
</resources>
<plugins>
<plugin>
<!-- <plugin>
<groupId>net.openhft</groupId>
<artifactId>binary-compatibility-enforcer-plugin</artifactId>
<version>1.0.7</version>
@@ -365,10 +364,10 @@
<additionalOptions>-Xdoclint:none</additionalOptions>
</configuration>
</plugin>
-->
<!-- used to allow getClass().getPackage().getImplementationVersion() -->
<plugin>
<!-- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
@@ -380,7 +379,7 @@
</archive>
</configuration>
</plugin>
</plugin>-->
<!--
generate maven dependencies versions file that can be used later
to install the right bundle in test phase.
@@ -389,7 +388,7 @@
target/classes/META-INF/maven/dependencies.properties
-->
<plugin>
<!-- <plugin>
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>depends-maven-plugin</artifactId>
<executions>
@@ -400,8 +399,8 @@
</goals>
</execution>
</executions>
</plugin>
<plugin>
</plugin>-->
<!-- <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
@@ -422,10 +421,10 @@
</instructions>
</configuration>
<executions>
<!--
&lt;!&ndash;
This execution makes sure that the manifest is available
when the tests are executed
-->
&ndash;&gt;
<execution>
<goals>
<goal>manifest</goal>
@@ -433,8 +432,8 @@
</execution>
</executions>
</plugin>
<plugin>
-->
<!-- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.0.0</version>
@@ -450,7 +449,7 @@
</configuration>
</execution>
</executions>
</plugin>
</plugin>-->
<!-- Enable again once TC works-->
<!--
@@ -18,7 +18,6 @@ package net.openhft.chronicle.map;
import net.openhft.chronicle.algo.bitset.ReusableBitSet;
import net.openhft.chronicle.algo.hashing.LongHashFunction;
import net.openhft.chronicle.analytics.Analytics;
import net.openhft.chronicle.bytes.Bytes;
import net.openhft.chronicle.bytes.BytesStore;
import net.openhft.chronicle.bytes.PointerBytesStore;
@@ -49,8 +48,6 @@ import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Type;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import java.util.function.BiFunction;