Merge pull request #35 from jku-isse/develop

Develop
jku-isse · Jan 24, 2020 · 6c30ce1 · 6c30ce1
2 parents c973b34 + 4de7580
commit 6c30ce1
Show file tree

Hide file tree

Showing 288 changed files with 5,345 additions and 27,186 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -0,0 +1,21 @@
+name: main
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+        with:
+          fetch-depth: 1
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 13
+      - run: |
+          ./gradlew build
+          ./gradlew combinedjavadoc
+          ./gradlew combinedWindowsZip
+          ./gradlew combinedLinuxZip
+          ./gradlew combinedrpm
+          ./gradlew combineddeb
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,56 @@
+name: main
+
+on:
+  release:
+    types:
+      - created
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+        with:
+          fetch-depth: 1
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 13
+      - run: |
+          ./gradlew build
+          ./gradlew combinedjavadoc
+          ./gradlew combinedWindowsZip
+          ./gradlew combinedLinuxZip
+          ./gradlew combinedrpm
+          ./gradlew combineddeb
+      - env:
+          GITHUB_TOKEN: ${{github.token}}
+          GITHUB_PACKAGES_URL: https://maven.pkg.github.com/${{github.repository}}
+        run: |
+          ./gradlew -Pversion=$(echo "${{github.ref}}" | cut -d "/" -f3) publishEccoMavenPublicationToGitHubPackagesRepository
+      - uses: actions/upload-artifact@v1
+        with:
+          name: javadoc
+          path: build/docs/javadoc
+      - uses: actions/upload-artifact@v1
+        with:
+          name: zip
+          path: build/distributions/zip
+      - uses: actions/upload-artifact@v1
+        with:
+          name: rpm
+          path: build/distributions/rpm
+      - uses: actions/upload-artifact@v1
+        with:
+          name: deb
+          path: build/distributions/deb
+      - run: |
+          cd build/docs
+          zip -r javadoc.zip javadoc
+      - uses: actions/[email protected]
+        env:
+          GITHUB_TOKEN: ${{github.token}}
+        with:
+          upload_url: ${{github.event.release.upload_url}}
+          asset_path: build/docs/javadoc.zip
+          asset_name: javadoc.zip
+          asset_content_type: application/zip
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -37,6 +37,8 @@ build:fedora:
     - ./gradlew combineddeb
     - ./gradlew html
     - ./gradlew page
+    - mkdir $ZIP_DIR/
+    - cp $DISTRIBUTION_DIR/*.zip $ZIP_DIR/
     - createrepo_c $RPM_DIR
     - ls -la $RPM_DIR/.
   only:
@@ -46,7 +48,12 @@ build:fedora:
   allow_failure: false
   artifacts:
     paths:
+      - $JAVADOC_DIR
+      - $MAVEN_DIR
+      - $ZIP_DIR
       - $RPM_DIR
+      - $PAGE_DIR
+      - $BUILD_DIR/downloads.html
 
 
 build:ubuntu:
@@ -71,15 +78,10 @@ build:ubuntu:
     - master
     - develop
   when: on_success
-  allow_failure: false
+  allow_failure: true
   artifacts:
     paths:
-      - $JAVADOC_DIR
-      - $MAVEN_DIR
-      - $ZIP_DIR
       - $DEB_DIR
-      - $PAGE_DIR
-      - $BUILD_DIR/downloads.html
 
 
 pages:
@@ -95,7 +97,7 @@ pages:
     - cp -r $MAVEN_DIR/. public/maven2/
     - cp -r $JAVADOC_DIR/. public/doc/
     - cp -r $RPM_DIR/. public/rpm/
-    - cp -r $DEB_DIR/. public/deb/
+#    - cp -r $DEB_DIR/. public/deb/
     - cp -r $ZIP_DIR/. public/
     - cp -r $PAGE_DIR/. public/
     - cp $BUILD_DIR/downloads.html public/
@@ -109,7 +111,7 @@ pages:
   allow_failure: false
   dependencies:
     - build:fedora
-    - build:ubuntu
+#    - build:ubuntu
   artifacts:
     paths:
       - public/

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,15 @@
 # ECCO CHANGELOG
 
 
+## 0.1.9
+  * upgrade to Java 13
+  * upgrade to Gradle 6
+  * added GitHub workflows
+
+
+## 0.1.8
+
+
 ## 0.1.7
   * major refactoring and cleanup
   * reimplementation of presence condition computation

diff --git a/README.md b/README.md
@@ -4,10 +4,10 @@
 Get the code: `git clone` or download zip file into `<working_dir>`.
 
 Requires:
-* JDK 8
+* JDK 13
 * [Gradle](http://gradle.org/ "Gradle") as build system.
 
-Run `gradle tasks` in `<working_dir>` for a list of tasks to execute.
+Run `gradle tasks` in `<working_dir>` for a list of supported tasks.
 
 Examples:
 * `gradle eclipse` builds eclipse projects.

diff --git a/adapter/challenge/build.gradle b/adapter/challenge/build.gradle
@@ -1,10 +1,8 @@
-
 ecco.adapter = true
 
 dependencies {
-	//compile 'com.github.javaparser:javaparser-core:3.14.1'
-	compile 'com.github.javaparser:javaparser-symbol-solver-core:3.5.15'
+	//implementation 'com.github.javaparser:javaparser-core:3.14.1'
+	implementation 'com.github.javaparser:javaparser-symbol-solver-core:3.5.15'
 
-	compile project(':ecco-base')
-	compile project(':ecco-service')
+	implementation project(':ecco-service')
 }