update settings

.github/workflows/codeql-analysis.yml

@@ -7,10 +7,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [develop]
+    branches: [ develop ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [develop]
+    branches: [ develop ]
 #  schedule:
 #    - cron: '0 14 * * 5'
 
@@ -24,47 +24,47 @@ jobs:
       matrix:
         # Override automatic language detection by changing the below list
         # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
-        language: ['java']
+        language: [ 'java' ]
         # Learn more...
         # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
 
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-      with:
-        # We must fetch at least the immediate parents so that if this is
-        # a pull request then we can checkout the head.
-        fetch-depth: 2
+      - name: Checkout repository
+        uses: actions/checkout@v2
+        with:
+          # We must fetch at least the immediate parents so that if this is
+          # a pull request then we can checkout the head.
+          fetch-depth: 2
 
-    # If this run was triggered by a pull request event, then checkout
-    # the head of the pull request instead of the merge commit.
-    - run: git checkout HEAD
-      if: ${{ github.event_name == 'pull_request' }}
+      # If this run was triggered by a pull request event, then checkout
+      # the head of the pull request instead of the merge commit.
+      - run: git checkout HEAD
+        if: ${{ github.event_name == 'pull_request' }}
 
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file. 
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v1
+        with:
+          languages: ${{ matrix.language }}
+          # If you wish to specify custom queries, you can do so here or in a config file.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
+          # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
+      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+      # If this step fails, then you should remove it and run the build manually (see below)
 
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 https://git.io/JvXDl
 
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
+      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+      #    and modify them (or add more) to build your code if your project
+      #    uses a compiled language
 
-    - name: Autobuild
-      run: |
-        brew install lame fluid-synth libvorbis
-        mvn -B install --file pom.xml
+      - name: Autobuild
+        run: |
+          brew install lame fluid-synth libvorbis
+          mvn -B install --file pom.xml
 
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v1

.github/workflows/maven-publish.yml

@@ -5,28 +5,28 @@ name: GitHub Packages
 
 on:
   release:
-    types: [created]
+    types: [ created ]
 
 jobs:
   build:
 
     runs-on: macos-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.8
-        server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
-        settings-path: ${{ github.workspace }} # location for the settings.xml file
+      - uses: actions/checkout@v2
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+          server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
+          settings-path: ${{ github.workspace }} # location for the settings.xml file
 
-    - name: Build with Maven
-      run: |
-        brew install lame fluid-synth libvorbis
-        mvn -B install --file pom.xml
+      - name: Build with Maven
+        run: |
+          brew install lame fluid-synth libvorbis
+          mvn -B install --file pom.xml
 
-    - name: Publish to GitHub Packages Apache Maven
-      run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml -Dmaven.test.skip=true
-      env:
-        GITHUB_TOKEN: ${{ github.token }}
+      - name: Publish to GitHub Packages Apache Maven
+        run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml -Dmaven.test.skip=true
+        env:
+          GITHUB_TOKEN: ${{ github.token }}

.github/workflows/maven.yml

@@ -1,19 +1,19 @@
 name: Java CI
 
-on: [push]
+on: [ push ]
 
 jobs:
   build:
 
     runs-on: macos-latest
 
     steps:
-    - uses: actions/checkout@v1
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.8
-    - name: Build with Maven
-      run: |
-        brew install lame fluid-synth libvorbis
-        mvn -B package --file pom.xml
+      - uses: actions/checkout@v1
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Build with Maven
+        run: |
+          brew install lame fluid-synth libvorbis
+          mvn -B package --file pom.xml

README.md

@@ -1,16 +1,17 @@
 [![GitHub Packages](https://github.com/umjammer/tritonus/actions/workflows/maven-publish.yml/badge.svg)](https://github.com/umjammer/tritonus/actions/workflows/maven-publish.yml)
 [![Java CI](https://github.com/umjammer/tritonus/actions/workflows/maven.yml/badge.svg)](https://github.com/umjammer/tritonus/actions)
-[![Parent](https://img.shields.io/badge/Parent-vavi--sound--sandbox-pink)](https://github.com/umjammer/vavi-sound-sandbox)
+[![CodeQL](https://github.com/umjammer/tritonus/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/umjammer/tritonus/actions/workflows/codeql-analysis.yml)
 ![Java](https://img.shields.io/badge/Java-8-b07219)
+[![Parent](https://img.shields.io/badge/Parent-vavi--sound--sandbox-pink)](https://github.com/umjammer/vavi-sound-sandbox)
 
 # tritonus
 
-This is mavenized Tritonus
+♪ This is mavenized Tritonus
 
-Tritonus is an implementation of the Java Sound API and several 
-Java Sound plugins ("service providers"). For pre-compiled
-versions of these components, see: 
-http://www.tritonus.org/plugins.html
+Tritonus is an implementation of the Java Sound API and several
+Java Sound plugins ("service providers"). For original
+versions of these components, see:
+http://www.tritonus.org/
 
 | module        | status | comment | library |
 |---------------|:------:|---------|---------|
@@ -35,11 +36,16 @@ http://www.tritonus.org/plugins.html
 | test          | 🚧    |         | |
 | timidity      | 🚧    |         | [libtimidity](https://github.com/sezero/libtimidity) |
 
+## Installation
+
+* https://github.com/umjammer/tritonus/packages
+* this project uses github packages. add a personal access token to `~/.m2/settings.xml`
+* see https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-apache-maven-registry
 
 ## License
 
 Tritonus is distributed under the terms of the Apache License,
-Version 2.0. See the file LICENSE for details.
+Version 2.0. See the file [LICENSE](LICENSE) for details.
 
 ### License Exceptions
 
@@ -48,11 +54,7 @@ Version 2.0. See the file LICENSE for details.
 - BladeMP3EncDLL.h for Windows is licensed under the GNU LGPL.
 - the pvorbis lib is licensed under a BSD style license
 
-## Installation
-
-https://github.com/umjammer/tritonus/packages
-
 ## TODO
 
- * ~~deploy to bintray via github actions~~
- * timidity
+* ~~deploy to bintray via github actions~~
+* timidity

doc/TODO-matthias.txt

@@ -180,7 +180,7 @@ grammar:
 
 Tests mit JSInfo, Converter Test
 ================================
-Es wird immer �ber die Funktion AudioSystem.isConversionPossible(AudioFormat, AudioFormat) getestet.
+Es wird immer über die Funktion AudioSystem.isConversionPossible(AudioFormat, AudioFormat) getestet.
 
 --------
 source format: PCM_SIGNED, 1 channel(s), 16 bit samples, 2 byte frames, 44100.0 Hz, 44100.0 frames/second, little endian

doc/compression.txt

@@ -1,4 +1,4 @@
-G.711: A-law, �-qaw, 64 kbps
+G.711: A-law, µ-qaw, 64 kbps
 G.721: ADPCM, 32 kbps
 G.722: 48/56/64 kbps
 G.723: ADPCM? 24/40 kbps

pom.xml

@@ -1,4 +1,5 @@
-<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">
+<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.tritonus</groupId>
@@ -56,7 +57,7 @@
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
-        <version>5.8.1</version>
+        <version>5.9.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

tritonus-alsa/pom.xml

@@ -1,11 +1,13 @@
-<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">
+<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>
 
   <parent>
     <groupId>org.tritonus</groupId>
     <artifactId>tritonus</artifactId>
     <version>0.3.11</version>
   </parent>
+
   <artifactId>tritonus-alsa</artifactId>
   <packaging>jar</packaging>
 
@@ -29,6 +31,7 @@
           <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>native-maven-plugin</artifactId>
+            <version>1.0-alpha-11</version>
             <extensions>true</extensions>
             <configuration>
               <javahClassNames>
@@ -95,9 +98,10 @@
               </sources>
               <linkerStartOptions>
                 <linkerStartOption>-dynamiclib
-                  -L/usr/local/lib -lasound</linkerStartOption>
+                  -L/usr/local/lib -lasound
+                </linkerStartOption>
               </linkerStartOptions>
-              <linkerFinalName></linkerFinalName>
+              <linkerFinalName/>
               <linkerEndOptions>
                 <linkerEndOption>-o ${project.build.directory}/libtritonusalsa.so</linkerEndOption>
               </linkerEndOptions>
@@ -118,7 +122,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
-            <version>2.22.0</version>
+            <version>3.0.0-M7</version>
             <configuration>
               <forkMode>once</forkMode>
               <argLine>-Djava.library.path=${project.build.directory}</argLine>
@@ -140,7 +144,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
-            <version>3.0.0-M5</version>
+            <version>3.0.0-M7</version>
             <configuration>
               <skipTests>true</skipTests>
             </configuration>
@@ -155,9 +159,11 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.10.1</version>
         <configuration>
           <source>1.8</source>
           <target>1.8</target>
+          <encoding>UTF-8</encoding>
         </configuration>
       </plugin>
     </plugins>
@@ -180,5 +186,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
 </project>

tritonus-aos/pom.xml

@@ -1,11 +1,13 @@
-<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">
+<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>
 
   <parent>
     <groupId>org.tritonus</groupId>
     <artifactId>tritonus</artifactId>
     <version>0.3.11</version>
   </parent>
+
   <artifactId>tritonus-aos</artifactId>
   <packaging>jar</packaging>
 
@@ -17,9 +19,11 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.10.1</version>
         <configuration>
           <source>1.8</source>
           <target>1.8</target>
+          <encoding>UTF-8</encoding>
           <includes>
             <include>org/tritonus/sampled/file/*AudioOutputStream.java</include>
             <include>org/tritonus/sampled/file/*Tool..java</include>
@@ -35,5 +39,4 @@
       <artifactId>tritonus-share</artifactId>
     </dependency>
   </dependencies>
-
 </project>