Skip to content

Commit 99c434e

Browse files
committed
upload project to maven central repository
1 parent 2a19061 commit 99c434e

11 files changed

Lines changed: 97 additions & 104 deletions

File tree

assertlog-core/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
dependencies {
2+
implementation('org.opentest4j:opentest4j:1.2.0')
3+
}

src/main/java/org/assertlog/OriginalLogsPolicy.java renamed to assertlog-core/src/main/java/org/assertlog/OriginalLogsPolicy.java

File renamed without changes.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
dependencies {
2+
implementation project(':assertlog-core')
3+
implementation('org.opentest4j:opentest4j:1.2.0')
4+
implementation('junit:junit:4.13')
5+
implementation('log4j:log4j:1.2.17')
6+
testImplementation('org.slf4j:slf4j-log4j12:1.7.30')
7+
testImplementation('org.slf4j:jul-to-slf4j:1.7.30')
8+
}

src/main/java/org/assertlog/junit4/log4j/MockLogging.java renamed to assertlog-log4j-junit4/src/main/java/org/assertlog/junit4/log4j/MockLogging.java

File renamed without changes.

test-log4j-junit4/src/test/java/org/assertlog/PetClinicTest.java renamed to assertlog-log4j-junit4/src/test/java/org/assertlog/PetClinicTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import org.junit.After;
55
import org.junit.Rule;
66
import org.junit.Test;
7+
import org.petclinic.PetClinic;
78

89
import java.math.BigDecimal;
910

test-log4j-junit4/src/main/java/org/assertlog/PetClinic.java renamed to assertlog-log4j-junit4/src/test/java/org/petclinic/PetClinic.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.assertlog;
1+
package org.petclinic;
22

33
import org.slf4j.Logger;
44
import org.slf4j.LoggerFactory;

src/test/resources/log4j.xml renamed to assertlog-log4j-junit4/src/test/resources/log4j.xml

File renamed without changes.

build.gradle

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
1-
plugins {
2-
id 'java'
3-
}
4-
5-
group 'com.codeborne.assertlog'
6-
version '1.0-SNAPSHOT'
7-
8-
allprojects {
1+
subprojects {
92
apply plugin: 'java'
103
apply plugin: 'maven'
114

5+
group 'com.codeborne.assertlog'
6+
version '0.1'
7+
128
sourceCompatibility = 1.8
139
targetCompatibility = 1.8
1410

@@ -33,18 +29,6 @@ allprojects {
3329
}
3430
}
3531

36-
subprojects {
37-
dependencies {
38-
implementation parent
39-
}
40-
}
41-
42-
dependencies {
43-
implementation('junit:junit:4.13')
44-
implementation('log4j:log4j:1.2.17')
45-
implementation('org.opentest4j:opentest4j:1.2.0')
46-
}
47-
4832
defaultTasks 'clean', 'test'
4933

5034
apply from: rootProject.file('gradle/deploy.gradle')

gradle/deploy.gradle

Lines changed: 79 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,95 +1,97 @@
1-
jar {
2-
from sourceSets.main.allSource
3-
4-
manifest {
5-
attributes(
6-
"Automatic-Module-Name": project.group + '.' + project.name,
7-
"Implementation-Title": project.group + '.' + project.name,
8-
"Implementation-Version": archiveVersion,
9-
"Implementation-Vendor": "Codeborne")
1+
subprojects {
2+
jar {
3+
from sourceSets.main.allSource
4+
5+
manifest {
6+
attributes(
7+
"Automatic-Module-Name": project.group + '.' + project.name,
8+
"Implementation-Title": project.group + '.' + project.name,
9+
"Implementation-Version": archiveVersion,
10+
"Implementation-Vendor": "Codeborne")
11+
}
1012
}
11-
}
12-
13-
task sourcesJar(type: Jar, dependsOn: classes) {
14-
classifier = 'sources'
15-
from sourceSets.main.allSource
16-
}
17-
18-
javadoc {
19-
// failOnError = false
20-
source = sourceSets.main.allJava
21-
}
22-
23-
task javadocJar(type: Jar, dependsOn: javadoc) {
24-
classifier = 'javadoc'
25-
from javadoc.destinationDir
26-
}
27-
28-
artifacts {
29-
archives jar
30-
archives sourcesJar
31-
archives javadocJar
32-
}
33-
34-
if (project.hasProperty("signing.keyId")) {
35-
apply plugin: 'signing'
36-
37-
signing {
38-
sign configurations.archives
13+
14+
task sourcesJar(type: Jar, dependsOn: classes) {
15+
classifier = 'sources'
16+
from sourceSets.main.allSource
3917
}
4018

41-
uploadArchives {
42-
repositories {
43-
mavenDeployer {
44-
beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
19+
javadoc {
20+
// failOnError = false
21+
source = sourceSets.main.allJava
22+
}
4523

46-
repository(url: project.version.endsWith("-SNAPSHOT") ?
47-
'https://oss.sonatype.org/content/repositories/snapshots/' :
48-
'https://oss.sonatype.org/service/local/staging/deploy/maven2/') {
49-
authentication(userName: "$sonatypeUsername", password: "$sonatypePassword")
50-
}
24+
task javadocJar(type: Jar, dependsOn: javadoc) {
25+
classifier = 'javadoc'
26+
from javadoc.destinationDir
27+
}
28+
29+
artifacts {
30+
archives jar
31+
archives sourcesJar
32+
archives javadocJar
33+
}
34+
35+
if (project.hasProperty("signing.keyId")) {
36+
apply plugin: 'signing'
5137

52-
pom.project {
53-
name archivesBaseName
54-
packaging 'jar'
55-
description 'AssertLog: Unit-tests for your logging'
56-
url 'https://github.com/codeborne/assertlog'
38+
signing {
39+
sign configurations.archives
40+
}
41+
42+
uploadArchives {
43+
repositories {
44+
mavenDeployer {
45+
beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
5746

58-
scm {
59-
url 'scm:git@github.com:codeborne/assertlog.git'
60-
connection 'scm:git@github.com:codeborne/assertlog.git'
61-
developerConnection 'scm:git@github.com:codeborne/assertlog.git'
47+
repository(url: project.version.endsWith("-SNAPSHOT") ?
48+
'https://oss.sonatype.org/content/repositories/snapshots/' :
49+
'https://oss.sonatype.org/service/local/staging/deploy/maven2/') {
50+
authentication(userName: "$sonatypeUsername", password: "$sonatypePassword")
6251
}
6352

64-
licenses {
65-
license {
66-
name 'MIT'
67-
url 'https://opensource.org/licenses/MIT'
68-
distribution 'repo'
53+
pom.project {
54+
name archivesBaseName
55+
packaging 'jar'
56+
description 'AssertLog: Unit-tests for your logging'
57+
url 'https://github.com/codeborne/assertlog'
58+
59+
scm {
60+
url 'scm:git@github.com:codeborne/assertlog.git'
61+
connection 'scm:git@github.com:codeborne/assertlog.git'
62+
developerConnection 'scm:git@github.com:codeborne/assertlog.git'
6963
}
70-
}
7164

72-
developers {
73-
developer {
74-
id 'asolntsev'
75-
name 'Andrei Solntsev'
65+
licenses {
66+
license {
67+
name 'MIT'
68+
url 'https://opensource.org/licenses/MIT'
69+
distribution 'repo'
70+
}
71+
}
72+
73+
developers {
74+
developer {
75+
id 'asolntsev'
76+
name 'Andrei Solntsev'
77+
}
7678
}
7779
}
78-
}
7980

80-
//mess with the generated pom to set the 'packaging' tag
81-
pom.withXml { XmlProvider xmlProvider ->
82-
def xml = xmlProvider.asString()
83-
def pomXml = new XmlParser().parse(new ByteArrayInputStream(xml.toString().bytes))
81+
//mess with the generated pom to set the 'packaging' tag
82+
pom.withXml { XmlProvider xmlProvider ->
83+
def xml = xmlProvider.asString()
84+
def pomXml = new XmlParser().parse(new ByteArrayInputStream(xml.toString().bytes))
8485

85-
pomXml.version[0] + { packaging('jar') }
86+
pomXml.version[0] + { packaging('jar') }
8687

87-
def newXml = new StringWriter()
88-
def printer = new XmlNodePrinter(new PrintWriter(newXml))
89-
printer.preserveWhitespace = true
90-
printer.print(pomXml)
91-
xml.setLength(0)
92-
xml.append(newXml.toString())
88+
def newXml = new StringWriter()
89+
def printer = new XmlNodePrinter(new PrintWriter(newXml))
90+
printer.preserveWhitespace = true
91+
printer.print(pomXml)
92+
xml.setLength(0)
93+
xml.append(newXml.toString())
94+
}
9395
}
9496
}
9597
}

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
rootProject.name = 'assertlog'
22

3-
include 'test-log4j-junit4'
3+
include 'assertlog-core', 'assertlog-log4j-junit4'

0 commit comments

Comments
 (0)