remove double saxon version and update actions refs Edirom/MEIGarage#16

Edirom/MEIGarage#59
TEIC · Nov 9, 2022 · 41a6c8f · 41a6c8f
1 parent 9d477ef
commit 41a6c8f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -15,22 +15,22 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up JDK 11
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         java-version: '11'
         distribution: 'adopt'
     - name: maven-settings
-      uses: s4u/maven-settings-action@v2
+      uses: s4u/maven-settings-action@v2.7.0
       with:
         servers: '[{"id": "edirom", "username": "vifebot", "password": "${GITHUB_TOKEN}"},{"id": "teic", "username": "vifebot", "password": "${GITHUB_TOKEN}"}]'
     - name: Build with Maven
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: mvn -B package --file pom.xml
     - name: Upload Maven build artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
-        name: tei-javalib-0.5.jar
-        path: /home/runner/work/tei-javalib/tei-javalib/target/tei-javalib-0.5.jar
+        name: artifact
+        path: /home/runner/work/tei-javalib/tei-javalib/target/tei-javalib-*.jar
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.tei</groupId>
   <artifactId>tei-javalib</artifactId>
-  <version>0.6</version>
+  <version>0.6.1</version>
   <name>TEI Javalib utilities</name>
   <properties>
 
@@ -83,7 +83,7 @@
     </plugins>
   </reporting>-->
   <dependencies>
-    <dependency>
+  <!--  <dependency>
       <groupId>pl.psnc.dl.ege</groupId>
       <artifactId>ege-api</artifactId>
       <version>0.4.0</version>
@@ -94,7 +94,7 @@
       <artifactId>ege-framework</artifactId>
       <version>0.5</version>
       <scope>compile</scope>
-    </dependency>
+    </dependency> -->
     <dependency>
       <groupId>net.sf.saxon</groupId>
       <artifactId>Saxon-HE</artifactId>
@@ -104,6 +104,12 @@
 	<groupId>com.thaiopensource</groupId>
 	<artifactId>trang</artifactId>
 	<version>20091111</version>
+    <exclusions>
+        <exclusion>
+          <groupId>net.sf.saxon</groupId>
+          <artifactId>saxon</artifactId>
+        </exclusion>
+    </exclusions>
     </dependency>
   </dependencies>
    <repositories>
@@ -120,7 +126,7 @@
 	</repositories>   
 <distributionManagement>
    <repository>
-     <id>github</id>
+     <id>githubtei</id>
      <name>GitHub TEIC Apache Maven Packages</name>
      <url>https://maven.pkg.github.com/TEIC/tei-javalib</url>
    </repository>