Changes from jitsi/jebml

.github/workflows/maven.yml

@@ -0,0 +1,99 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ jitsi ]
+  pull_request:
+    branches: [ jitsi ]
+
+env:
+  # Java version to use for the release
+  RELEASE_JAVA_VERSION: 11
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        java: [ 11, 17 ]
+
+    name: Java ${{ matrix.java }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up JDK ${{ matrix.java }}
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: ${{ matrix.java }}
+          cache: maven
+
+      - name: Build and test with Maven
+        run: mvn -B verify
+
+  release:
+    if: github.ref == 'refs/heads/jitsi'
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Set up JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: ${{ env.RELEASE_JAVA_VERSION }}
+          cache: maven
+          server-id: ossrh
+          server-username: SONATYPE_USER
+          server-password: SONATYPE_PW
+
+      - name: Install xmllint
+        shell: bash
+        run: |
+          sudo apt update
+          sudo apt install -y libxml2-utils
+
+      - name: Set tag Version
+        id: sets-tag-version
+        run: |
+          MVNVER=$(xmllint --xpath "/*[local-name()='project']/*[local-name()='version']/text()" pom.xml)
+          TAG_NAME="v${MVNVER/-SNAPSHOT/}"
+          echo "Tag name: ${TAG_NAME}"
+          echo "TAG_NAME=${TAG_NAME}" >> $GITHUB_OUTPUT
+
+      - name: Create Tag
+        uses: rickstaa/[email protected]
+        with:
+          tag_exists_error: false
+          tag: ${{ steps.sets-tag-version.outputs.TAG_NAME }}
+          message: "Automated tag"
+
+      - name: Set version
+        run: |
+          VERSION=`git describe --match "v[0-9\.]*" --long --dirty --always`
+          mvn -B versions:set -DnewVersion=${VERSION:1} -DgenerateBackupPoms=false
+
+      - name: Release to Maven Central
+        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 }}" \
+            -Drelease=true \
+            -DskipTests \
+            deploy

.gitignore

@@ -4,3 +4,4 @@ build/
 .classpath
 .settings/
 .project
+target

build.gradle

@@ -1,22 +1,16 @@
 apply plugin: 'java'
 apply plugin: 'maven'
-apply plugin: 'findbugs'
 apply plugin: 'checkstyle'
-apply plugin: 'org.dm.bundle'
+apply plugin: 'osgi'
+apply plugin: 'maven-publish'
 
+
+project.version = '2.4.4'
 repositories {
+    mavenLocal()
     mavenCentral()
 }
 
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'org.dm.gradle:gradle-bundle-plugin:0.6.2'
-    }
-}
-
 dependencies {
     compile 'org.slf4j:slf4j-api:1.7.5'
     testCompile 'junit:junit:4.11'
@@ -28,38 +22,57 @@ checkstyleMain {
     configFile = file("tools/csMain.xml")
 }
 checkstyleTest {
-    configFile = file("tools/csTest.xml")
-}
-findbugs {
-    toolVersion = "3.+"
-    effort = "max"
-    reportLevel = "high"
-}
-findbugsMain {
-    reports {
-        xml.enabled = false
-        html.enabled = true
-    }
-}
-findbugsTest {
-    reports {
-        xml.enabled = false
-        html.enabled = true
-    }
+    configFile = file("tools/csMain.xml")
 }
 
 // Workaround so that packageinfo files get included for OSGi package versions
 sourceSets {
     main {
         resources.srcDirs = java.srcDirs
-        output.resourcesDir = output.classesDir
+        output.resourcesDir = output.classesDirs.first()
     }
 }
 
-project.version = '2.2'
+task sourcesJar(type: Jar, dependsOn: classes) {
+  from sourceSets.main.allSource
+}
+javadoc {
+  failOnError = false
+}
+task javadocJar(type: Jar, dependsOn: javadoc) {
+  from javadoc.destinationDir
+}
 
-bundle {
-    instructions << [
+publishing {
+  publications {
+    "${project.name}Jar"(MavenPublication) {
+      from components.java
+      artifactId project.name
+      artifact sourcesJar {
+        classifier "sources"
+      }
+      artifact javadocJar {
+        classifier "javadoc"
+      }
+    }
+  }
+  if (project.hasProperty("maven_url")) {
+    repositories {
+      maven {
+        url maven_url
+        credentials(PasswordCredentials) {
+          username = maven_user
+          password = maven_password
+        }
+      }
+    }
+  }
+}
+
+
+jar {
+    manifest {
+      instructions << [
         'Bundle-Name'   : 'JEBML',
         'Bundle-Version': version,
         'Bundle-License': 'LGPLv2',
@@ -68,5 +81,6 @@ bundle {
         '-nodefaultversion': true,
         '-noee': true,
         'majorMinor' : 1
-    ]
+      ]
+    }
 }

pom.xml

@@ -0,0 +1,165 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.jitsi</groupId>
+    <artifactId>jebml</artifactId>
+    <version>2.4.4-SNAPSHOT</version>
+
+    <name>jebml</name>
+    <description>Matroska muxer/demuxer</description>
+    <url>https://github.com/jitsi/jebml</url>
+
+    <organization>
+        <name>jitsi.org</name>
+        <url>https://jitsi.org</url>
+    </organization>
+
+    <developers>
+        <developer>
+            <id>org.jitsi</id>
+            <name>Jitsi Team</name>
+            <email>[email protected]</email>
+        </developer>
+    </developers>
+
+    <scm>
+        <url>https://github.com/jitsi/jebml</url>
+        <connection>scm:git:https://github.com/jitsi/jebml.git</connection>
+        <developerConnection>scm:git:https://github.com/jitsi/jebml.git</developerConnection>
+    </scm>
+
+    <licenses>
+        <license>
+            <name>The GNU Lesser General Public License, Version 2.0</name>
+            <url>https://github.com/jitsi/jebml/blob/master/LGPL.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <dokka.version>1.9.10</dokka.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.5</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.11</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.10.1</version>
+                <configuration>
+                    <release>11</release>
+                    <compilerArgs>
+                        <arg>-Xlint:all</arg>
+                    </compilerArgs>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>3.0.0-M2</version>
+            </plugin>
+            <plugin>
+                <groupId>org.sonatype.plugins</groupId>
+                <artifactId>nexus-staging-maven-plugin</artifactId>
+                <version>1.6.13</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <serverId>ossrh</serverId>
+                    <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+                    <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>release</id>
+            <activation>
+                <property>
+                    <name>release</name>
+                    <value>true</value>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                        <version>3.2.1</version>
+                        <executions>
+                            <execution>
+                                <id>attach-sources</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>jar-no-fork</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.jetbrains.dokka</groupId>
+                        <artifactId>dokka-maven-plugin</artifactId>
+                        <version>${dokka.version}</version>
+                        <executions>
+                            <execution>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>javadocJar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>3.0.1</version>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <gpgArguments>
+                                <arg>--pinentry-mode</arg>
+                                <arg>loopback</arg>
+                            </gpgArguments>
+                        </configuration>
+                    </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>

src/main/java/org/ebml/BinaryElement.java

@@ -42,7 +42,8 @@ public class BinaryElement extends Element
    */
   public BinaryElement(final byte[] type)
   {
-    super(type);
+    super();
+    setType(type);
   }
 
   public BinaryElement()