Revert "Upstream mixin"

Merge pull request #241 from FatSaw/ver/1.12.2
Upstream mixin
2023-03-05 16:21:07 -07:00 · 2023-03-05 16:16:59 -07:00 · 2023-03-05 15:13:23 +02:00 · 2023-03-05 15:01:30 +02:00 · 2023-03-05 13:55:22 +02:00 · 2023-03-05 13:51:28 +02:00
2 changed files with 4 additions and 3 deletions
--- a/3
+++ b/3
@@ -9,8 +9,9 @@ pipeline {
    
    stage('Build') {
      steps {
+	    sh 'update-alternatives --set java /usr/lib/jvm/zulu8/jre/bin/java'
 	    sh 'chmod +x scripts/inst.sh'
-        sh './scripts/inst.sh --setup --fast --remote'
+            sh './scripts/inst.sh --setup --fast --remote'
      }
    }

--- a/sources/pom.xml
+++ b/sources/pom.xml
@@ -125,7 +125,7 @@
        <dependency>
            <groupId>junit</groupId>
            <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <version>4.13.1</version>
            <scope>test</scope>
        </dependency>
        <dependency>
@@ -177,7 +177,7 @@
        </repository>
        <repository>
            <id>josephworks</id>
-            <url>http://repo.josephworks.net/repository/maven-public/</url>
+            <url>https://repo.josephworks.net/repository/maven-public/</url>
        </repository>
        <repository>
            <id>sonatype-nexusg</id>
Author	SHA1	Message	Date
josephworks	9815736d8c	Revert "Upstream mixin"	2023-03-05 16:21:07 -07:00
josephworks	c52b1a2464	Merge pull request #241 from FatSaw/ver/1.12.2 Upstream mixin	2023-03-05 16:16:59 -07:00
FatSaw	8b617ed169	Merge branch 'Akarin-project:ver/1.12.2' into ver/1.12.2	2023-03-05 15:13:23 +02:00
FatSaw	b6d360e399	Update pom.xml	2023-03-05 15:01:30 +02:00
FatSaw	ea47663e3c	Revert "Update pom.xml" This reverts commit `baf64bb7a0`.	2023-03-05 13:55:22 +02:00
FatSaw	baf64bb7a0	Update pom.xml	2023-03-05 13:51:28 +02:00
FatSaw	13b6dd77c8	Update pom.xml	2023-03-05 13:20:57 +02:00
josephworks	8e0d49c722	Update Jenkinsfile	2023-03-05 03:22:08 -07:00
josephworks	88f3d2bb91	Update Jenkinsfile	2023-03-05 03:18:49 -07:00
josephworks	561b80c7fa	Merge pull request #233 from Akarin-project/dependabot/maven/sources/junit-junit-4.13.1 Bump junit from 4.12 to 4.13.1 in /sources	2023-03-05 03:11:22 -07:00
FatSaw	752fc2981a	Update pom.xml	2023-03-05 07:05:42 +02:00
josephworks	b66854b35a	Update pom.xml	2023-03-04 14:54:52 -07:00
FatSaw	d6400a0a68	Move collide changes to mixin	2023-02-20 01:34:06 +02:00
FatSaw	9680395435	Move some changes to mixins	2023-02-20 01:31:48 +02:00
FatSaw	9e71f569dc	Move some changes to mixins	2023-02-20 01:02:40 +02:00
dependabot[bot]	490ae739a4	Bump junit from 4.12 to 4.13.1 in /sources Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1) --- updated-dependencies: - dependency-name: junit:junit dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com>	2022-08-28 06:20:26 +00:00