فهرست منبع

unfuck log4j fuckup

Tom Görner 3 سال پیش
والد
کامیت
41d668bb36

+ 1 - 1
F3Enabler/settings.gradle

@@ -1,6 +1,6 @@
 pluginManagement {
     repositories {
-        jcenter()
+        mavenCentral()
         maven {
             name = 'Fabric'
             url = 'https://maven.fabricmc.net/'

+ 1 - 1
IZPL-A/IZPL/app/build.gradle

@@ -29,6 +29,6 @@ dependencies {
     compile files('libs/izpl-shared.jar')
     compile 'com.android.support:appcompat-v7:22.1.1'
     compile project(':filechooser')
-    compile 'org.apache.logging.log4j:log4j-api:2.1'
+    compile 'org.apache.logging.log4j:log4j-api:2.+'
     compile project(':exoplayer')
 }

+ 2 - 2
IZPL-A/IZPL/build.gradle

@@ -2,7 +2,7 @@
 
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:1.0.0-rc1'
@@ -14,6 +14,6 @@ buildscript {
 
 allprojects {
     repositories {
-        jcenter()
+        mavenCentral()
     }
 }

+ 3 - 3
IZSetup/build.gradle

@@ -83,9 +83,9 @@ dependencies{
 	compile 'org.apache.commons:commons-exec:1.3'
 	compile "org.yaml:snakeyaml:1.14"
 	compile "commons-net:commons-net:3.3"
-    compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.1'
-	compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.1'
-	compile group: 'org.apache.logging.log4j', name: 'log4j-iostreams', version: '2.1'
+    compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.+'
+	compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.+'
+	compile group: 'org.apache.logging.log4j', name: 'log4j-iostreams', version: '2.+'
 	 compile	'org.xerial:sqlite-jdbc:3.8.7'
 			compile(project(':ToolKit')) {
         transitive = false

+ 0 - 1
LogBlockHeatMapper/build.gradle

@@ -20,7 +20,6 @@ jar{
 
 repositories{
 	mavenCentral()
-	jcenter()
 }
 
 dependencies{

+ 1 - 1
MazeViewer/build.gradle

@@ -19,7 +19,7 @@ jar{
 }
 
 repositories{
-	jcenter()
+	mavenCentral()
 }
 
 

+ 1 - 1
TWPUtil/build.gradle

@@ -19,7 +19,7 @@ jar{
 }
 
 repositories{
-	jcenter()
+	mavenCentral()
 }
 
 

+ 5 - 4
ToolKit/build.gradle

@@ -6,6 +6,7 @@ sourceCompatibility = 1.8
 version = 'SNAPSHOT'
 
 
+
 task distZip(dependsOn: 'jar') {
 	//NO-OPtask als redirect
 }
@@ -17,7 +18,7 @@ distZip.outputs.file file(tasks.jar.archivePath)
 dependencies{
 	
 	compile fileTree(dir: 'lib', include: '*.jar')
-	compile "net.rubygrapefruit:native-platform:0.10"
+	//compile "net.rubygrapefruit:native-platform:0.10"
 	compile "commons-io:commons-io:2.+"
 	compile 'org.apache.commons:commons-exec:1.3'
 	compile "org.yaml:snakeyaml:1.14"
@@ -28,9 +29,9 @@ dependencies{
     compile 'net.java.dev.jna:jna-platform:4.1.0'
 	//compile 'uk.co.caprica:vlcj:3.0.1' //HACK! bezüglich JNA
     compile	'org.xerial:sqlite-jdbc:3.8.7'
-    compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.1'
-	compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.1'
-	compile group: 'org.apache.logging.log4j', name: 'log4j-iostreams', version: '2.1'
+    compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.+'
+	compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.+'
+	compile group: 'org.apache.logging.log4j', name: 'log4j-iostreams', version: '2.+'
 	compile 'mysql:mysql-connector-java:5.1.6'
 
 }

+ 4 - 4
UpidTK/build.gradle

@@ -19,7 +19,7 @@ jar{
 }
 
 repositories{
-	jcenter()
+	mavenCentral()
 }
 
 compileJava {
@@ -36,9 +36,9 @@ dependencies{
 	compile 'org.apache.commons:commons-exec:1.3'
     compile	'org.xerial:sqlite-jdbc:3.8.7'
 	compile 'mysql:mysql-connector-java:5.1.6'
-    compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.1'
-	compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.1'
-	compile group: 'org.apache.logging.log4j', name: 'log4j-iostreams', version: '2.1'
+    compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.+'
+	compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.+'
+	compile group: 'org.apache.logging.log4j', name: 'log4j-iostreams', version: '2.+'
 	compile(project(':ToolKit')) {
         transitive = false
     }

+ 5 - 5
WPCMGr/build.gradle

@@ -19,7 +19,7 @@ jar{
 }
 
 repositories{
-	jcenter()
+	mavenCentral()
 }
 
 compileJava {
@@ -63,15 +63,15 @@ distZip {
 
 dependencies{
 	compile fileTree(dir: 'lib', include: '*.jar')
-        compile "net.rubygrapefruit:native-platform:0.9"
+        //compile "net.rubygrapefruit:native-platform:0.9"
 	compile "commons-io:commons-io:2.+"
 	compile 'org.apache.commons:commons-exec:1.3'
 	compile "org.yaml:snakeyaml:+"
 	compile 'org.ini4j:ini4j:0.5.2'
 	compile 'mysql:mysql-connector-java:5.1.6'
-    compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.1'
-	compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.1'
-	compile group: 'org.apache.logging.log4j', name: 'log4j-iostreams', version: '2.1'
+    compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.+'
+	compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.+'
+	compile group: 'org.apache.logging.log4j', name: 'log4j-iostreams', version: '2.+'
     compile 'org.fusesource.jansi:jansi:1.11'
     compile 'commons-cli:commons-cli:1.3'
 	compile(project(':ToolKit')) {

+ 12 - 6
build.gradle

@@ -1,14 +1,20 @@
 defaultTasks 'distZip',':izsetup:izsetupDist'
 buildscript {
-  repositories { jcenter() }
+  repositories {
+		maven {
+			url "https://plugins.gradle.org/m2/"
+		}
+  
+		mavenCentral()
+	}
   dependencies {
-    classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.0'
+    classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.+'
   }
 }
 
 allprojects {
 	repositories{
-		jcenter()
+		mavenCentral()
 
 		maven {
 			url "https://repository.apache.org/content/repositories/snapshots"
@@ -19,11 +25,11 @@ allprojects {
 		
         maven { url "https://hub.spigotmc.org/nexus/content/repositories/snapshots"}
         
-		maven { url "http://repo.gradle.org/gradle/libs-releases-local" }
+		// maven { url "http://repo.gradle.org/gradle/libs-releases-local" }
 		
-		maven {
+		/*maven {
 			url "https://dl.bintray.com/ijabz/maven"
-		}
+		}*/
         
         maven { url = 'https://oss.sonatype.org/content/repositories/snapshots' }
         

+ 1 - 1
build.gradle.template

@@ -19,7 +19,7 @@ jar{
 }
 
 repositories{
-	jcenter()
+	mavenCentral()
 }
 
 compileJava {

+ 1 - 1
iZStreamer/build.gradle

@@ -9,7 +9,7 @@ version = 'SNAPSHOT'
 mainClassName = 'de.nplusc.izc.streamer.iZstreamer'
 
 repositories{
-	jcenter()
+	mavenCentral()
 }
 
 dependencies{

+ 1 - 1
iZlaunch/build.gradle

@@ -9,7 +9,7 @@ version = 'SNAPSHOT'
 mainClassName = 'de.nplusc.izc.iZtools.launcher.iZlaunchCore.java'
 
 repositories{
-	jcenter()
+	mavenCentral()
 }
 
 compileJava {

+ 1 - 1
iZpaqSFX/build.gradle

@@ -21,6 +21,6 @@ jar{
 }
 
 repositories{
-	jcenter()
+	mavenCentral()
 }
 

+ 7 - 7
iZpl/build.gradle

@@ -123,20 +123,20 @@ sourceSets{
 }
 dependencies{
     compile fileTree(dir: 'lib', include: '*.jar')
-    compile "net.rubygrapefruit:native-platform:0.9"
+    //compile "net.rubygrapefruit:native-platform:0.9"
     compile "commons-io:commons-io:2.+"
     compile 'org.apache.commons:commons-exec:1.3'
     compile "org.yaml:snakeyaml:1.14"
     compile "commons-net:commons-net:3.3"
-    compile 'uk.co.caprica:vlcj:4+'
+    compile 'uk.co.caprica:vlcj:4.+'
     compile 'com.googlecode.mp4parser:isoparser:1.0-RC-1'
     compile 'net.java.truevfs:truevfs-profile-default_2.11:0.12.0'
     compile 'commons-cli:commons-cli:1.3'
-	compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.1'
-	compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.1'
-	compile group: 'org.apache.logging.log4j', name: 'log4j-iostreams', version: '2.11.1'
-    compile group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.11.1'
-    compile group: 'org.apache.logging.log4j', name: 'log4j-jul', version: '2.11.1'
+	compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.+'
+	compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.+'
+	compile group: 'org.apache.logging.log4j', name: 'log4j-iostreams', version: '2.+'
+    compile group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.+'
+    compile group: 'org.apache.logging.log4j', name: 'log4j-jul', version: '2.+'
     compile 'org.fusesource.jansi:jansi:1.11'
     compile 'org.jgrapht:jgrapht-core:0.9.0'
     compile(project(':external:java-progressbar'))

+ 5 - 5
iZplPlugins/JukeBox/build.gradle

@@ -100,11 +100,11 @@ dependencies
         transitive = false
     }
     
-    compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.1'
-	compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.1'
-	compile group: 'org.apache.logging.log4j', name: 'log4j-iostreams', version: '2.11.1'
-    compile group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.11.1'
-    compile group: 'org.apache.logging.log4j', name: 'log4j-jul', version: '2.11.1'
+    compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.+'
+	compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.+'
+	compile group: 'org.apache.logging.log4j', name: 'log4j-iostreams', version: '2.+'
+    compile group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.+'
+    compile group: 'org.apache.logging.log4j', name: 'log4j-jul', version: '2.+'
     compile "org.yaml:snakeyaml:1.14"
 }
 

+ 4 - 4
izpl-shared/build.gradle

@@ -5,9 +5,9 @@ targetCompatibility = 1.7
 dependencies{
     compile fileTree(dir: 'lib', include: '*.jar')
     compile "org.yaml:snakeyaml:1.14"
-	compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.1'
-	compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.1'
-	compile group: 'org.apache.logging.log4j', name: 'log4j-iostreams', version: '2.1'
-    compile group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.1'
+	compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.+'
+	compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.+'
+	compile group: 'org.apache.logging.log4j', name: 'log4j-iostreams', version: '2.+'
+    compile group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.+'
 	compile "net.jthink:jaudiotagger:2+"
 }