Skip to content

Commit 4508818

Browse files
lburgazzolilburgazzoli
committed
remove logging from LinuxHelper, update versions
1 parent 5870168 commit 4508818

File tree

4 files changed

+9
-92
lines changed

4 files changed

+9
-92
lines changed

‎affinity-test/pom.xml‎

Lines changed: 4 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@
2424
<parent>
2525
<groupId>net.openhft</groupId>
2626
<artifactId>java-parent-pom</artifactId>
27-
<version>1.1.1</version>
27+
<version>1.1.2</version>
2828
<relativePath/>
2929
</parent>
3030

3131
<modelVersion>4.0.0</modelVersion>
3232

3333
<artifactId>affinity-test</artifactId>
34-
<version>2.1.3-SNAPSHOT</version>
34+
<version>2.1.6-SNAPSHOT</version>
3535
<packaging>bundle</packaging>
3636

3737
<name>OpenHFT/Java-Thread-Affinity/affinity-test</name>
@@ -43,7 +43,7 @@
4343
<groupId>net.openhft</groupId>
4444
<artifactId>third-party-bom</artifactId>
4545
<type>pom</type>
46-
<version>3.4.6</version>
46+
<version>3.4.10</version>
4747
<scope>import</scope>
4848
</dependency>
4949
<dependency>
@@ -124,29 +124,6 @@
124124

125125
<build>
126126
<plugins>
127-
<plugin>
128-
<groupId>org.apache.maven.plugins</groupId>
129-
<artifactId>maven-compiler-plugin</artifactId>
130-
<configuration>
131-
<source>${openhft.java.version}</source>
132-
<target>${openhft.java.version}</target>
133-
<encoding>UTF-8</encoding>
134-
<verbose>true</verbose>
135-
<fork>true</fork>
136-
<executable>${openhft.java.home}/bin/javac</executable>
137-
<compilerVersion>${openhft.java.version}</compilerVersion>
138-
</configuration>
139-
</plugin>
140-
<plugin>
141-
<groupId>org.apache.maven.plugins</groupId>
142-
<artifactId>maven-surefire-plugin</artifactId>
143-
<configuration>
144-
<jvm>${openhft.java.home}/bin/java</jvm>
145-
<systemPropertyVariables>
146-
<main.basedir>${project.basedir}</main.basedir>
147-
</systemPropertyVariables>
148-
</configuration>
149-
</plugin>
150127
<!--
151128
generate maven dependencies versions file that can be used later
152129
to install the right bundle in test phase.
@@ -201,60 +178,8 @@
201178
</build>
202179

203180
<scm>
204-
<url>scm:git:https://github.com/OpenHFT/Java-Lang.git</url>
181+
<url>scm:git:https://github.com/OpenHFT/Java-Thread-Affinity.git</url>
205182
</scm>
206183

207-
<!-- ******************************************************************* -->
208-
<!-- PROFILES -->
209-
<!-- ******************************************************************* -->
210-
211-
<profiles>
212-
213-
<profile>
214-
<id>jdk_default</id>
215-
<activation>
216-
<activeByDefault>true</activeByDefault>
217-
</activation>
218-
<properties>
219-
<openhft.java.home>${env.JAVA_HOME}</openhft.java.home>
220-
<openhft.java.version>1.6</openhft.java.version>
221-
</properties>
222-
</profile>
223-
224-
<profile>
225-
<id>jdk_6</id>
226-
<activation>
227-
<activeByDefault>false</activeByDefault>
228-
</activation>
229-
<properties>
230-
<openhft.java.home>${env.JAVA_HOME_6}</openhft.java.home>
231-
<openhft.java.version>1.6</openhft.java.version>
232-
</properties>
233-
</profile>
234-
235-
<profile>
236-
<id>jdk_7</id>
237-
<activation>
238-
<activeByDefault>false</activeByDefault>
239-
</activation>
240-
<properties>
241-
<openhft.java.home>${env.JAVA_HOME_7}</openhft.java.home>
242-
<openhft.java.version>1.7</openhft.java.version>
243-
</properties>
244-
</profile>
245-
246-
<profile>
247-
<id>jdk_8</id>
248-
<activation>
249-
<activeByDefault>false</activeByDefault>
250-
</activation>
251-
<properties>
252-
<openhft.java.home>${env.JAVA_HOME_8}</openhft.java.home>
253-
<openhft.java.version>1.7</openhft.java.version>
254-
</properties>
255-
</profile>
256-
257-
</profiles>
258-
259184
</project>
260185

‎affinity/pom.xml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<groupId>net.openhft</groupId>
4545
<artifactId>third-party-bom</artifactId>
4646
<type>pom</type>
47-
<version>3.4.8</version>
47+
<version>3.4.10</version>
4848
<scope>import</scope>
4949
</dependency>
5050
</dependencies>
@@ -57,17 +57,14 @@
5757
<groupId>org.slf4j</groupId>
5858
<artifactId>slf4j-api</artifactId>
5959
</dependency>
60-
6160
<dependency>
6261
<groupId>net.java.dev.jna</groupId>
6362
<artifactId>jna</artifactId>
6463
</dependency>
65-
6664
<dependency>
6765
<groupId>net.java.dev.jna</groupId>
6866
<artifactId>jna-platform</artifactId>
6967
</dependency>
70-
7168
<dependency>
7269
<groupId>org.kohsuke.jetbrains</groupId>
7370
<artifactId>annotations</artifactId>
@@ -78,13 +75,11 @@
7875
<artifactId>easymock</artifactId>
7976
<scope>test</scope>
8077
</dependency>
81-
8278
<dependency>
8379
<groupId>junit</groupId>
8480
<artifactId>junit</artifactId>
8581
<scope>test</scope>
8682
</dependency>
87-
8883
<dependency>
8984
<groupId>org.slf4j</groupId>
9085
<artifactId>slf4j-simple</artifactId>

‎affinity/src/main/java/net/openhft/affinity/impl/LinuxHelper.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,11 @@
33
import com.sun.jna.*;
44
import com.sun.jna.ptr.IntByReference;
55
import org.jetbrains.annotations.NotNull;
6-
import org.slf4j.Logger;
7-
import org.slf4j.LoggerFactory;
86

97
import java.util.Arrays;
108
import java.util.List;
119

1210
public class LinuxHelper {
13-
private static final Logger logger = LoggerFactory.getLogger(LinuxHelper.class);
1411
private static final String LIBRARY_NAME = "c";
1512
private static final VersionHelper UNKNOWN = new VersionHelper(0,0,0);
1613
private static final VersionHelper VERSION_2_6 = new VersionHelper(2,6,0);
@@ -114,11 +111,11 @@ public String toString() {
114111
try {
115112
if(CLibrary.INSTANCE.uname(uname) == 0) {
116113
ver = new VersionHelper(uname.getRealeaseVersion());
117-
logger.info("uname: " + uname);
118114
}
119115
} catch(Throwable e) {
120-
logger.warn("Failed to determine Linux version: " + e);
116+
//logger.warn("Failed to determine Linux version: " + e);
121117
}
118+
122119
version = ver;
123120
}
124121

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
<parent>
2525
<groupId>net.openhft</groupId>
2626
<artifactId>root-parent-pom</artifactId>
27-
<version>1.1.0</version>
27+
<version>1.1.1</version>
2828
<relativePath/>
2929
</parent>
3030

3131
<modelVersion>4.0.0</modelVersion>
3232
<artifactId>Java-Thread-Affinity</artifactId>
33-
<version>2.1.0-SNAPSHOT</version>
33+
<version>2.1.6-SNAPSHOT</version>
3434
<packaging>pom</packaging>
3535

3636
<name>Java Affinity Parent</name>

0 commit comments

Comments
 (0)