Skip to content

Commit

Permalink
Downgraded jserialcomm temporarily
Browse files Browse the repository at this point in the history
  • Loading branch information
Steve O'Hara committed Mar 28, 2020
1 parent ed1e686 commit 1eaf1ce
Show file tree
Hide file tree
Showing 6 changed files with 389 additions and 148 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ For instructions on how to use the library, visit the wiki [here](https://github
# Releases
Stable releases can be downloaded here

https://search.maven.org/search?q=g:com.ghgande
https://mvnrepository.com/artifact/com.ghgande/j2mod

Snapshot releases can be downloaded here

https://oss.sonatype.org/content/repositories/snapshots/com/ghgande/j2mod
https://oss.sonatype.org/content/repositories/snapshots/com/ghgande/j2mod/

# Known Issues

Expand Down
3 changes: 3 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -200,4 +200,7 @@ _(**NOT BACKWARDS COMPATIBLE**)_
* Upgraded to jSerialComm 2.6.0

## Version 2.6.2
* Downgraded jSerialComm until https://github.com/Fazecast/jSerialComm/issues/277 is resolved
* Upgraded log4j to prevent security issue
* added ModPoll class to mirror ModPoll exe capabilities
* Created fat executable jar for testing ModPoll features
22 changes: 22 additions & 0 deletions assembly.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
<!-- TODO: a jarjar format would be better -->
<id>jar-with-dependencies</id>
<formats>
<format>jar</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<dependencySets>
<dependencySet>
<outputDirectory>/</outputDirectory>
<useProjectArtifact>true</useProjectArtifact>
<unpack>true</unpack>
<scope>test</scope>
<excludes>
<exclude>org.apache.commons:commons-exec</exclude>
<exclude>junit:junit</exclude>
</excludes>
</dependencySet>
</dependencySets>
</assembly>
44 changes: 36 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
<dependency>
<groupId>com.fazecast</groupId>
<artifactId>jSerialComm</artifactId>
<version>2.6.0</version>
<version>2.5.3</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -138,21 +138,22 @@
<Implementation-Title>${project.name}</Implementation-Title>
<Implementation-Version>${project.version}</Implementation-Version>
<Implemenation-Vendor>${project.organization.name}</Implemenation-Vendor>
<Main-Class>com.ghgande.j2mod.modbus.util.ModPoll</Main-Class>
</manifestEntries>
</archive>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>3.5.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Import-Package>*jSerialComm*, org.slf4j;version="[1.6,2)"</Import-Package>
</instructions>
</configuration>
<extensions>true</extensions>
<configuration>
<instructions>
<Import-Package>*jSerialComm*, org.slf4j;version="[1.6,2)"</Import-Package>
</instructions>
</configuration>
</plugin>

<plugin>
Expand Down Expand Up @@ -202,6 +203,33 @@
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.4.1</version>
<configuration>
<descriptors>
<descriptor>assembly.xml</descriptor>
</descriptors>
<finalName>${project.build.finalName}-with-dependencies</finalName>
<appendAssemblyId>false</appendAssemblyId>
<archive>
<manifest>
<mainClass>com.ghgande.j2mod.modbus.util.ModPoll</mainClass>
</manifest>
</archive>
</configuration>
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
Expand Down
Loading

0 comments on commit 1eaf1ce

Please sign in to comment.