Skip to content

Commit

Permalink
Merge remote-tracking branch 'jitsi/update-deps'
Browse files Browse the repository at this point in the history
  • Loading branch information
@cobratbq
cobratbq committed Jun 30, 2020
2 parents ee2330e + aff8595 commit 445fe2a
Show file tree
Hide file tree
Showing 11 changed files with 983 additions and 937 deletions.
49 changes: 49 additions & 0 deletions .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: Java CI with Maven

on: [push, pull_request]

jobs:
build:
runs-on: ubuntu-latest

strategy:
matrix:
java: [ '1.8', '11' ]

name: ${{ matrix.java }}
steps:
- uses: actions/checkout@v2.1.0
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v1.3.0
with:
java-version: ${{ matrix.java }}
server-id: ossrh
server-username: SONATYPE_USER
server-password: SONATYPE_PW

- name: Build
run: mvn -B verify javadoc:javadoc

- name: Attach jars
uses: actions/upload-artifact@v2
with:
name: jar
path: target/otr4j-*

- name: Extract Branch Name
run: echo "::set-env name=BRANCH::$(echo ${GITHUB_REF#refs/heads/})"

- name: Release to Maven Central
if: env.BRANCH == 'master'
env:
SONATYPE_USER: ${{ secrets.SONATYPE_USER }}
SONATYPE_PW: ${{ secrets.SONATYPE_PW }}
run: |
cat <(echo -e "${{ secrets.GPG_KEY }}") | gpg --batch --import
gpg --list-secret-keys --keyid-format LONG
mvn \
--no-transfer-progress \
--batch-mode \
-Dgpg.passphrase="${{ secrets.GPG_PW }}" \
-DperformRelease=true \
deploy
9 changes: 5 additions & 4 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
bin/
target/
.classpath
.project
.settings/
*.orig
otr.properties
*.iml

/.classpath
/.project
/.settings/
/*.iml
/.idea
94 changes: 69 additions & 25 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<groupId>org.jitsi</groupId>
<artifactId>org.otr4j</artifactId>
<version>0.23-SNAPSHOT</version>
<packaging>jar</packaging>
<packaging>bundle</packaging>
<name>otr4j library</name>
<url>http://github.com/jitsi/otr4j</url>
<description>
Expand All @@ -23,7 +23,7 @@
<name>George Politis</name>
<email>gp@jitsi.org</email>
<organization>Jitsi</organization>
<organizationUrl>http://www.jitsi.org</organizationUrl>
<organizationUrl>https://jitsi.org</organizationUrl>
<roles>
<role>Project-Administrator</role>
<role>Developer</role>
Expand All @@ -45,31 +45,31 @@
</scm>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version.oldstyle>1.6</java.version.oldstyle>
<java.version.newstyle>6</java.version.newstyle>
<java.version.oldstyle>1.8</java.version.oldstyle>
<java.version.newstyle>8</java.version.newstyle>
</properties>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.9</version>
<version>4.13</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>[1.56,)</version>
<version>1.65</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.9.5</version>
<artifactId>mockito-core</artifactId>
<version>3.3.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.3.2</version>
<version>3.10</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -99,9 +99,9 @@
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>3.0.5</version>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>4.0.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand All @@ -121,7 +121,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.8.1</version>
<version>3.1.0</version>
</plugin>
</plugins>
</reporting>
Expand All @@ -140,7 +140,7 @@
<configuration>
<rules>
<requireMavenVersion>
<version>3.0.5</version>
<version>3.5.0</version>
</requireMavenVersion>
</rules>
</configuration>
Expand Down Expand Up @@ -191,7 +191,7 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.3</version>
<version>1.6.8</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
Expand All @@ -203,14 +203,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -225,19 +217,64 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>4.2.1</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-Name>OTR for Java</Bundle-Name>
<Bundle-SymbolicName>org.otr4j</Bundle-SymbolicName>
<Automatic-Module-Name>org.otr4j</Automatic-Module-Name>
<Bundle-RequiredExecutionEnvironment>JavaSE-1.8
</Bundle-RequiredExecutionEnvironment>
<Bundle-License>
Apache-2.0;link="https://github.com/jitsi/otr4j/raw/master/LICENSE"
</Bundle-License>
<_removeheaders>Bnd-*, Tool, Require-Capability, Include-Resource
</_removeheaders>
<Include-Resource>
{maven-resources},
META-INF/LICENSE=LICENSE
</Include-Resource>
</instructions>
</configuration>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>signing</id>
<activation>
<property>
<name>performRelease</name>
<value>true</value>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.5</version>
<version>1.6</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>install</phase>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
<configuration>
<gpgArguments>
<arg>--pinentry-mode</arg>
<arg>loopback</arg>
</gpgArguments>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -271,10 +308,17 @@
</plugin>
</plugins>
</build>
</profile>
</profiles>

<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>
</project>
2 changes: 1 addition & 1 deletion src/main/java/net/java/otr4j/OtrEngineHost.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ void requireEncryptedMessage(SessionID sessionID,
/**
* Get instructions for the necessary fragmentation operations.
*
* If no fragmentation is necessary, return <code>null</code> to set the default
* If no fragmentation is necessary, return {@code null} to set the default
* fragmentation instructions which are to use an unlimited number of
* messages of unlimited size each. Hence fragmentation is not necessary or
* applied.
Expand Down
Loading

0 comments on commit 445fe2a

Please sign in to comment.