Merge pull request #42 from subclipse/actions

Update to build with GH Actions and publish
subclipse · Feb 11, 2021 · c1d5a27 · c1d5a27
2 parents fd5bd35 + ed7565a
commit c1d5a27
Show file tree

Hide file tree

Showing 11 changed files with 91 additions and 72 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,7 @@
+version: 2
+updates:
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,57 @@
+name: Build
+
+on:
+  pull_request:
+    branches: [ master ]
+
+  push:
+    branches: [ master ]
+
+  release:
+    types: [ created ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+
+      - name: Cache Maven packages
+        uses: actions/cache@v2.1.4
+        with:
+          path: ~/.m2
+          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2
+
+      - name: Write Maven Settings
+        uses: whelk-io/maven-settings-xml-action@v14
+        with:
+          servers: '[{ "id": "github", "username": "${{ github.actor }}", "password": "${{ secrets.GITHUB_TOKEN }}" }]'
+
+      - name: Build with Maven
+        run: |
+          mvn --batch-mode package
+
+      - name: Archive Build Output
+        uses: actions/upload-artifact@v2
+        with:
+          name: svnclientadapter
+          path: |
+            base/target/*.jar
+            !base/target/*-sources.jar
+            cmdline/target/*.jar
+            !cmdline/target/*-sources.jar
+            javahl/target/*.jar
+            !javahl/target/*-sources.jar
+            svnkit/target/*.jar
+            !svnkit/target/*-sources.jar
+
+      - name: Publish package
+        if: github.event_name == 'release'
+        run: mvn --batch-mode deploy
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -1,7 +1,6 @@
 # SVNClientAdapter
+[![Build Status](https://github.com/subclipse/svnclientadapter/workflows/Build/badge.svg)](https://github.com/subclipse/svnclientadapter/actions)
 
-[![Build Status](https://travis-ci.org/subclipse/svnclientadapter.svg?branch=master)](https://travis-ci.org/subclipse/svnclientadapter)
-[ ![Download](https://api.bintray.com/packages/subclipse/maven/svnclientadapter/images/download.svg) ](https://bintray.com/subclipse/maven/svnclientadapter/_latestVersion)  
 
 SVNClientAdapter is a high-level Java API for Subversion.  You can write your code to the SVNClientAdapter Java interfaces and then at runtime run it with any of the three adapter implementations:
 

diff --git a/base/pom.xml b/base/pom.xml
@@ -21,15 +21,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
-            </plugin>
 			<plugin>
 				<groupId>biz.aQute.bnd</groupId>
 				<artifactId>bnd-maven-plugin</artifactId>
@@ -52,6 +43,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
+                <version>3.2.0</version>
 				<configuration>
 					<archive>
 						<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>

diff --git a/cmdline/pom.xml b/cmdline/pom.xml
@@ -29,15 +29,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
-            </plugin>
 			<plugin>
 				<groupId>biz.aQute.bnd</groupId>
 				<artifactId>bnd-maven-plugin</artifactId>
@@ -60,6 +51,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
+                <version>3.2.0</version>
 				<configuration>
 					<archive>
 						<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>

diff --git a/javahl/pom.xml b/javahl/pom.xml
@@ -21,9 +21,9 @@
 
     <repositories>
         <repository>
-            <id>bintray-subclipse-maven</id>
-            <name>bintray</name>
-            <url>http://dl.bintray.com/subclipse/maven</url>
+          <id>github</id>
+          <name>JavaHL Apache Maven Packages</name>
+          <url>https://maven.pkg.github.com/subclipse/javahl</url>
         </repository>
     </repositories>
 
@@ -42,15 +42,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
-            </plugin>
 			<plugin>
 				<groupId>biz.aQute.bnd</groupId>
 				<artifactId>bnd-maven-plugin</artifactId>
@@ -73,6 +64,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
+                <version>3.2.0</version>
 				<configuration>
 					<archive>
 						<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>org.tigris.svnclientadapter</groupId>
     <artifactId>multi</artifactId>
     <version>1.14.0</version>
-    <name>svnClientAdapter</name>
+    <name>svnclientadapter</name>
     <url>https://github.com/subclipse/svnclientadapter</url>
     <packaging>pom</packaging>
 
@@ -23,15 +23,16 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
+                <version>3.8.1</version>
                 <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-source-plugin</artifactId>
+              <version>3.2.0</version>
               <executions>
                 <execution>
                   <id>attach-sources</id>
@@ -43,11 +44,13 @@
             </plugin>
         </plugins>
     </build>
+
     <distributionManagement>
-        <repository>
-            <id>bintray-subclipse-maven</id>
-            <name>subclipse-maven</name>
-            <url>https://api.bintray.com/maven/subclipse/maven/svnclientadapter/;publish=1</url>
-        </repository>
+    <repository>
+        <id>github</id>
+        <name>GitHub Packages</name>
+        <url>https://maven.pkg.github.com/subclipse/svnclientadapter</url>
+    </repository>
     </distributionManagement>
+
 </project>
diff --git a/samples/pom.xml b/samples/pom.xml
@@ -12,10 +12,10 @@
     </properties>
 
     <repositories>
-        <repository>
-            <id>bintray-subclipse-maven</id>
-            <name>bintray</name>
-            <url>http://dl.bintray.com/subclipse/maven</url>
+         <repository>
+          <id>github</id>
+          <name>svnClientAdapter Apache Maven Packages</name>
+          <url>https://maven.pkg.github.com/subclipse/svnclientadapter</url>
         </repository>
     </repositories>
 
@@ -39,10 +39,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
+                <version>3.8.1</version>
                 <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/settings.xml b/settings.xml
diff --git a/svnkit/pom.xml b/svnkit/pom.xml
@@ -44,15 +44,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
-            </plugin>
 			<plugin>
 				<groupId>biz.aQute.bnd</groupId>
 				<artifactId>bnd-maven-plugin</artifactId>
@@ -75,6 +66,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
+                <version>3.2.0</version>
 				<configuration>
 					<archive>
 						<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>