Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Shipkit pom customizations #831

Merged
merged 17 commits into from Aug 26, 2017
Merged

Shipkit pom customizations #831

merged 17 commits into from Aug 26, 2017

Conversation

wwilk
Copy link
Contributor

@wwilk wwilk commented Aug 9, 2017

I will make further pom customizations, to keep the same format as it was before introducing shipkit.
I'm travelling right now so these will be probably small changes, you can wait with merging this PR before all is done.

Starting with . Before you had sth like that:

    <developer>
      <id>johanhaleby</id>
      <name>Johan Haleby</name>
      <email>johan.haleby at jayway.com</email>
    </developer>

Shipkit currently supports format:

    <developer>
      <id>johanhaleby</id>
      <name>Johan Haleby</name>
      <roles>
        <role>Core developer</role>
      </roles>
      <url>https://github.com/johanhaleby</url>
    </developer>

@thekingnothing What do you think about it? Is it acceptable or you would like to keep this email for developers? We may think of supporting it in shipkit or customize it here. As you can see I removed code that modified from powermock code.

Additionally shipkit generates section, that looks like that:

    <contributor>
      <name>René Scheibe</name>
      <url>https://github.com/darxriggs</url>
    </contributor>

I hope you are ok with that.

@wwilk
Copy link
Contributor Author

wwilk commented Aug 9, 2017

Scm section currently:

  <scm>
    <url>http://github.com/mockito/mockito</url>
    <connection>scm:git:git://github.com/powermock/powermock</connection>
    <developerConnection>scm:git:git://github.com/powermock/powermock</developerConnection>
  </scm>

With shipkit:

  <scm>
    <url>https://github.com/powermock/powermock.git</url>
  </scm>

Do we need these additional properties?

@wwilk
Copy link
Contributor Author

wwilk commented Aug 9, 2017

BTW why is http://github.com/mockito/mockito ?

@wwilk
Copy link
Contributor Author

wwilk commented Aug 9, 2017

There is a really subtle difference about ( is "GitHub issues" instead of "GitHub") so I'm removing this section from "publish-maven.gradle".

@mockitoguy
Copy link

Hey guys. If needed I think we can keep the existing withXml() section in powermock's build.gradle file. withXml() can be used to register multiple actions, each action will manipulate the xml. If shipikit .gradle does not have developers, it does not add this section to the xml at all. So the withXml() from powermockito can simply fill it out.

@wwilk
Copy link
Contributor Author

wwilk commented Aug 10, 2017

Yes, of course we can do it, I only wanted to show @thekingnothing what the difference would be if he used it the shipkit way.

@thekingn0thing
Copy link
Member

@szczepiq thank you for your comments.

@wwilk, I prefer keeping emails in pom.xml instead Github links, because Github only one of possible services. PowerMock had migration experience from GoogleCode to GitHub. Email it is a general coordinate and a developer could be reached out in easy way.

@thekingn0thing
Copy link
Member

By the way why is http://github.com/mockito/mockito
A good catch. It's an artifact of the copy-past development style :)

@thekingn0thing
Copy link
Member

I'm oaky with

  <scm>
    <url>https://github.com/powermock/powermock.git</url>
  </scm>

@thekingn0thing
Copy link
Member

@wwilk could you check last changes. After them build have started fail with compile error:

:powermock-core:compileTestJava/home/travis/build/powermock/powermock/powermock-core/src/test/java/org/powermock/configuration/ConfigurationFactoryImplTest.java:24: error: package org.powermock.api.mockito does not exist
import org.powermock.api.mockito.ConfigurationTestUtils;

@thekingn0thing thekingn0thing merged commit 8349d03 into powermock:dev/1.x Aug 26, 2017
thekingn0thing pushed a commit that referenced this pull request Aug 27, 2017
Fixes #826
* Initial configuration of Shipkit
* Introduced shipkit format of developers section in pom #826
* Issues section removed from publish-maven.gradle #826
* Removed redundant packaging and description #826
* Shipkit version bumped and prefix 'powermock-' used instead of 'v' #826
* Disabled redundant tasks for unpublishable modules #826
* MIT licence replaced with Apache one #826
* Publishing separately fullJars/zips and jars #826
* Compilation fixed #826
* Finished pom configuration #826
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants